Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main #4

Merged
merged 3 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified README.md
Binary file not shown.
345 changes: 208 additions & 137 deletions build.gradle

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ dependencies {
compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.1.11:dev")
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.3.46-GTNH:dev")
compileOnly("com.github.GTNewHorizons:CraftTweaker:3.2.11:dev")

}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 6 additions & 6 deletions src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.api.internal.IGuiLexiconEntry;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.lexicon.page.PageRecipe;
import ab.api.AdvancedBotanyAPI;
import ab.api.recipe.RecipeAdvancedPlate;
import ab.client.core.ClientHelper;
import ab.common.lib.register.BlockListAB;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vazkii.botania.api.internal.IGuiLexiconEntry;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.lexicon.page.PageRecipe;

public class AdvancedPlateCraftPage extends PageRecipe {

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/ab/api/recipe/lexicon/AlphirineCraftPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.api.internal.IGuiLexiconEntry;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lexicon.page.PageRecipe;
import ab.api.AdvancedBotanyAPI;
import ab.api.recipe.RecipeAncientAlphirine;
import ab.client.core.ClientHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vazkii.botania.api.internal.IGuiLexiconEntry;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lexicon.page.PageRecipe;

public class AlphirineCraftPage extends PageRecipe {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ab/client/core/handler/BoundRenderHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@

import org.lwjgl.opengl.GL11;

import ab.api.IBoundRender;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import vazkii.botania.api.wand.ICoordBoundItem;
import vazkii.botania.api.wand.IWireframeAABBProvider;
import vazkii.botania.client.core.handler.ClientTickHandler;
import ab.api.IBoundRender;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;

public class BoundRenderHandler {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ab/client/core/handler/ClientHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;

import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.common.lib.LibObfuscation;
import ab.api.IRankItem;
import ab.client.core.handler.PlayerItemUsingSound.ClientSoundHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.relauncher.ReflectionHelper;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.common.lib.LibObfuscation;

public class ClientHandler {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ab/client/core/handler/HudRenderHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
import net.minecraft.util.MovingObjectPosition;
import net.minecraftforge.client.event.RenderGameOverlayEvent;

import vazkii.botania.common.item.ItemLexicon;
import vazkii.botania.common.item.ItemTwigWand;
import ab.api.IRenderHud;
import ab.common.item.equipment.ItemBlackHalo;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import vazkii.botania.common.item.ItemLexicon;
import vazkii.botania.common.item.ItemTwigWand;

public class HudRenderHandler {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.api.item.IPhantomInkable;
import vazkii.botania.client.core.handler.ClientTickHandler;
import ab.client.core.ClientHelper;
import ab.common.item.equipment.armor.ItemNebulaArmor;
import ab.common.item.equipment.armor.ItemNebulaHelm;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import vazkii.botania.api.item.IPhantomInkable;
import vazkii.botania.client.core.handler.ClientTickHandler;

public class PlayerRendererHandler {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ab/client/core/proxy/ClientProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.MinecraftForge;

import vazkii.botania.common.Botania;
import ab.client.core.handler.BoundRenderHandler;
import ab.client.core.handler.ClientHandler;
import ab.client.core.handler.HudRenderHandler;
Expand All @@ -25,6 +24,7 @@
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import vazkii.botania.common.Botania;

public class ClientProxy extends CommonProxy {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ab/client/gui/ContainerItemChest.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;

import vazkii.botania.client.gui.SlotLocked;
import ab.common.item.relic.ItemTalismanHiddenRiches;
import vazkii.botania.client.gui.SlotLocked;

public class ContainerItemChest extends Container {

Expand Down
74 changes: 26 additions & 48 deletions src/main/java/ab/client/model/ModelFountainMana.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,66 +4,44 @@
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;

public class ModelFountainMana<PoseStack, VertexConsumer> extends ModelBase {
public class ModelFountainMana extends ModelBase {

private final ModelRenderer bone;
private final ModelRenderer bb_main;
private final ModelRenderer bottomAnvil;
private final ModelRenderer topAnvil;

public ModelFountainMana() {
textureWidth = 16;
textureHeight = 16;

bone = new ModelRenderer(this);
bone.setRotationPoint(0.0F, 24.0F, 0.0F);
bone.cubeList.add(new ModelBox(bone, 0, 0, -1.0F, -11.0F, 2.0F, 2, 1, 1, 0.0F));
bone.cubeList.add(new ModelBox(bone, 0, 0, -1.0F, -11.0F, -3.0F, 2, 1, 1, 0.0F));
bone.cubeList.add(new ModelBox(bone, 0, 0, 2.0F, -11.0F, -1.0F, 1, 1, 2, 0.0F));
bone.cubeList.add(new ModelBox(bone, 0, 0, -3.0F, -11.0F, -1.0F, 1, 1, 2, 0.0F));
bone.cubeList.add(new ModelBox(bone, 0, 0, 1.0F, -12.0F, 1.0F, 1, 2, 2, 0.0F));
bone.cubeList.add(new ModelBox(bone, 0, 0, 2.0F, -12.0F, 1.0F, 1, 2, 1, 0.0F));
bone.cubeList.add(new ModelBox(bone, 0, 0, -2.0F, -12.0F, 1.0F, 1, 2, 2, 0.0F));
bone.cubeList.add(new ModelBox(bone, 0, 0, -2.0F, -12.0F, -3.0F, 1, 2, 2, 0.0F));
bone.cubeList.add(new ModelBox(bone, 0, 0, 1.0F, -12.0F, -3.0F, 1, 2, 2, 0.0F));
bone.cubeList.add(new ModelBox(bone, 0, 0, 2.0F, -12.0F, -2.0F, 1, 2, 1, 0.0F));
bone.cubeList.add(new ModelBox(bone, 0, 0, -3.0F, -12.0F, 1.0F, 1, 2, 1, 0.0F));
bone.cubeList.add(new ModelBox(bone, 0, 0, -3.0F, -12.0F, -2.0F, 1, 2, 1, 0.0F));
bone.cubeList.add(new ModelBox(bone, 0, 0, 2.0F, -11.0F, -2.0F, 4, 3, 4, 0.0F));
// PartPose.offset(0.0F, 24.0F, 0.0F);

bb_main = new ModelRenderer(this);
bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
bb_main.cubeList.add(new ModelBox(bb_main, 0, 3, -7.0F, -1.0F, -6.0F, 14, 1, 12, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, -10, -11, -8.0F, -5.0F, -6.0F, 1, 5, 12, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, -11, -11, 7.0F, -5.0F, -6.0F, 1, 5, 12, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -6.0F, -5.0F, -8.0F, 12, 5, 1, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -6.0F, -5.0F, 7.0F, 12, 5, 1, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, 6.0F, -5.0F, -7.0F, 1, 5, 1, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, 6.0F, -5.0F, 6.0F, 1, 5, 1, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -7.0F, -5.0F, 6.0F, 1, 5, 1, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -7.0F, -5.0F, -7.0F, 1, 5, 1, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -6.0F, -1.0F, 6.0F, 12, 1, 1, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -6.0F, -1.0F, -7.0F, 12, 1, 1, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -2.0F, -8.0F, -2.0F, 4, 7, 4, 0.0F));

textureWidth = 48;
textureHeight = 48;

bottomAnvil = new ModelRenderer(this);
bottomAnvil.setRotationPoint(0.0F, 24.0F, 0.0F);
bottomAnvil.cubeList.add(new ModelBox(bottomAnvil, 32, 26, -3.0F, -1.0F, -4.0F, 6, 1, 1, 0.0F));
bottomAnvil.cubeList.add(new ModelBox(bottomAnvil, 0, 31, -5.0F, -1.0F, -3.0F, 12, 1, 6, 0.0F));
bottomAnvil.cubeList.add(new ModelBox(bottomAnvil, 32, 17, -2.0F, -3.0F, -2.0F, 4, 1, 4, 0.0F));
bottomAnvil.cubeList.add(new ModelBox(bottomAnvil, 0, 8, -4.0F, -2.0F, -3.0F, 8, 1, 6, 0.0F));
bottomAnvil.cubeList.add(new ModelBox(bottomAnvil, 32, 23, -3.0F, -1.0F, 3.0F, 6, 1, 1, 0.0F));

topAnvil = new ModelRenderer(this);
topAnvil.setRotationPoint(0.0F, 26.0F, 0.0F);
topAnvil.cubeList.add(new ModelBox(topAnvil, 0, 23, -6.5F, -11.0F, -3.0F, 12, 2, 6, 0.0F));
topAnvil.cubeList.add(new ModelBox(topAnvil, 0, 38, -5.5F, -12.0F, -4.0F, 13, 2, 8, 0.0F));
topAnvil.cubeList.add(new ModelBox(topAnvil, 0, 15, -5.5F, -9.0F, -3.0F, 9, 2, 6, 0.0F));
topAnvil.cubeList.add(new ModelBox(topAnvil, 17, 0, -4.5F, -11.0F, 2.5F, 7, 3, 1, 0.0F));
topAnvil.cubeList.add(new ModelBox(topAnvil, 0, 0, -4.5F, -11.0F, -3.5F, 7, 3, 1, 0.0F));
topAnvil.cubeList.add(new ModelBox(topAnvil, 30, 12, -2.5F, -7.0F, -2.0F, 5, 1, 4, 0.0F));
}

public void renderTop() {
bone.render(0.0625f);
public void renderBottom() {
bottomAnvil.render(0.0625f);
}

public void renderBottom() {
bb_main.render(0.0625f);
public void renderTop() {
topAnvil.render(0.0625f);
}

public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}

public void renderToBuffer(PoseStack poseStack, VertexConsumer vertexConsumer, int packedLight, int packedOverlay,
float red, float green, float blue, float alpha) {
bone.render(packedLight);
bb_main.render(packedLight);
}
}
4 changes: 2 additions & 2 deletions src/main/java/ab/client/model/ModelManaCharger.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.client.core.handler.LightningHandler;
import vazkii.botania.common.core.helper.Vector3;
import ab.client.render.tile.RenderTileManaCharger;
import ab.common.block.tile.TileManaCharger;
import vazkii.botania.client.core.handler.LightningHandler;
import vazkii.botania.common.core.helper.Vector3;

public class ModelManaCharger extends ModelBase {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ab/client/nei/RecipeHandlerAlphirine.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import ab.api.AdvancedBotanyAPI;
import ab.api.recipe.RecipeAncientAlphirine;
import ab.client.core.ClientHelper;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.TemplateRecipeHandler;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;

public class RecipeHandlerAlphirine extends TemplateRecipeHandler {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import net.minecraft.util.IIcon;

import vazkii.botania.client.render.entity.RenderSparkBase;
import vazkii.botania.common.item.ItemSparkUpgrade;
import ab.common.entity.EntityAdvancedSpark;
import ab.common.item.ItemAdvancedSpark;
import vazkii.botania.client.render.entity.RenderSparkBase;
import vazkii.botania.common.item.ItemSparkUpgrade;

public class RenderEntityAdvancedSpark extends RenderSparkBase<EntityAdvancedSpark> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.client.core.handler.ClientTickHandler;
import ab.client.core.ClientHelper;
import ab.common.block.BlockLebethronWood;
import vazkii.botania.client.core.handler.ClientTickHandler;

public class RenderEntityAlphirinePortal extends Render {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.common.core.helper.ItemNBTHelper;
import ab.common.item.ItemAntigravityCharm;
import vazkii.botania.common.core.helper.ItemNBTHelper;

public class RenderItemAntigravityCharm implements IItemRenderer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

import org.lwjgl.opengl.GL11;

import ab.common.block.tile.TileABSpreader;
import vazkii.botania.api.mana.ILens;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.core.proxy.ClientProxy;
import vazkii.botania.client.model.ModelSpreader;
import vazkii.botania.client.render.item.RenderLens;
import ab.common.block.tile.TileABSpreader;

public class RenderTileABSpreader extends TileEntitySpecialRenderer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.client.core.handler.ClientTickHandler;
import ab.client.model.ModelDiceFate;
import ab.common.block.tile.TileBoardFate;
import vazkii.botania.client.core.handler.ClientTickHandler;

public class RenderTileBoardFate extends TileEntitySpecialRenderer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.client.core.handler.ClientTickHandler;
import ab.client.model.ModelEngineerHopper;
import vazkii.botania.client.core.handler.ClientTickHandler;

public class RenderTileEngineerHopper extends TileEntitySpecialRenderer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.client.core.handler.ClientTickHandler;
import ab.client.model.ModelFountainAlchemy;
import ab.common.block.tile.TileFountainAlchemy;
import vazkii.botania.client.core.handler.ClientTickHandler;

public class RenderTileFountainAlchemy extends TileEntitySpecialRenderer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.client.core.handler.ClientTickHandler;
import ab.client.model.ModelFountainConjuration;
import ab.common.block.tile.TileFountainConjuration;
import vazkii.botania.client.core.handler.ClientTickHandler;

public class RenderTileFountainConjuration extends TileEntitySpecialRenderer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.client.core.handler.ClientTickHandler;
import ab.client.model.ModelFountainMana;
import ab.common.block.tile.TileFountainMana;
import vazkii.botania.client.core.handler.ClientTickHandler;

public class RenderTileFountainMana extends TileEntitySpecialRenderer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.client.core.handler.ClientTickHandler;
import ab.client.model.ModelDiceFate;
import ab.common.block.tile.TileGameBoard;
import vazkii.botania.client.core.handler.ClientTickHandler;

public class RenderTileGameBoard extends TileEntitySpecialRenderer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

import org.lwjgl.opengl.GL11;

import vazkii.botania.client.core.handler.ClientTickHandler;
import ab.common.block.BlockMagicCraftCrate;
import ab.common.block.tile.TileMagicCraftCrate;
import ab.common.lib.register.BlockListAB;
import vazkii.botania.client.core.handler.ClientTickHandler;

public class RenderTileMagicCraftingCrate extends TileEntitySpecialRenderer {

Expand Down
Loading
Loading