diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java index 550d583f3..f38a6183a 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java @@ -25,7 +25,12 @@ public class RecipeMiniFlower extends RecipeManaInfusion { @Override public boolean matches(ItemStack stack) { ResourceLocation key = BotaniaAPI.internalHandler.getStackSubTileKey(stack); - ResourceLocation input = BotaniaAPI.internalHandler.getStackSubTileKey(getInput().getMatchingStacks()[0]); + ItemStack[] matching = getInput().getMatchingStacks(); + if(matching.length == 0) + return false; + + + ResourceLocation input = BotaniaAPI.internalHandler.getStackSubTileKey(matching[0]); return key != null && key.equals(input); } diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 75a241760..115950af3 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.model.ModelBiped; -import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.settings.KeyBinding; @@ -167,8 +166,6 @@ public class ClientProxy implements IProxy { dootDoot = true; } - TileEntityItemStackRenderer.instance = new RenderTilePylon.ForwardingTEISR(TileEntityItemStackRenderer.instance); - DeferredWorkQueue.runLater(() -> { CORPOREA_REQUEST = new KeyBinding("nei.options.keys.gui.botania_corporea_request", KeyConflictContext.GUI, InputMappings.getInputByCode(GLFW.GLFW_KEY_C, 0), LibMisc.MOD_NAME); ClientRegistry.registerKeyBinding(ClientProxy.CORPOREA_REQUEST); diff --git a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java index 9cae64a23..2c83d6dec 100644 --- a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java @@ -12,6 +12,7 @@ import net.minecraft.util.EnumFacing; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.render.tile.RenderTileGaiaHead; import vazkii.botania.common.block.BlockGaiaHead; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; @@ -31,7 +32,7 @@ public class LayerGaiaHead implements LayerRenderer { public void render(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { ItemStack itemstack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); - if (!itemstack.isEmpty() && itemstack.getItem() == ModItems.gaiaHead) // Botania - check for head + if (!itemstack.isEmpty() && itemstack.getItem() == ModBlocks.gaiaHead.asItem()) // Botania - check for head { GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index 9bc0ba308..476dd6070 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -15,7 +15,9 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 40b3bb6b1..97e775212 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -28,16 +28,6 @@ import vazkii.botania.common.block.tile.TileBrewery; import javax.annotation.Nullable; public class RenderTileBrewery extends TileEntityRenderer { - public static class TEISR extends TileEntityItemStackRenderer { - @Override - public void renderByItem(ItemStack stack) { - if(stack.getItem() == ModBlocks.brewery.asItem()) { - TileEntityRendererDispatcher.instance.getRenderer(TileBrewery.class) - .render(null, 0, 0, 0, 0, -1); - } - } - } - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY); final ModelBrewery model = new ModelBrewery(); public TileBrewery brewery; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index 847735c7b..e0b4c585e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -47,16 +47,6 @@ import javax.annotation.Nullable; // TODO 1.13 move this back to a normal tesr. Byebye animation API public class RenderTileCorporeaCrystalCube extends TileEntityRenderer { - public static class TEISR extends TileEntityItemStackRenderer { - @Override - public void renderByItem(ItemStack stack) { - if(stack.getItem() == ModBlocks.corporeaCrystalCube.asItem()) { - TileEntityRendererDispatcher.instance.getRenderer(TileCorporeaCrystalCube.class) - .render(null, 0, 0, 0, 0, -1); - } - } - } - private EntityItem entity = null; private RenderEntityItem itemRenderer = null; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index c2ca2a3b4..b6edc142f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -26,16 +26,6 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import javax.annotation.Nullable; public class RenderTileCorporeaIndex extends TileEntityRenderer { - public static class TEISR extends TileEntityItemStackRenderer { - @Override - public void renderByItem(ItemStack stack) { - if(stack.getItem() == ModBlocks.corporeaIndex.asItem()) { - TileEntityRendererDispatcher.instance.getRenderer(TileCorporeaIndex.class) - .render(null, 0, 0, 0, 0, -1); - } - } - } - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX); private final ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false); public static boolean move = true; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java index 48541a477..1fb2c2db2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java @@ -33,8 +33,8 @@ import net.minecraft.util.EnumFacing; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.render.entity.RenderDoppleganger; import vazkii.botania.common.block.BlockGaiaHead; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileGaiaHead; -import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -43,13 +43,12 @@ public class RenderTileGaiaHead extends TileEntitySkullRenderer { public static class TEISR extends TileEntityItemStackRenderer { @Override public void renderByItem(ItemStack stack) { - if(stack.getItem() == ModItems.gaiaHead) { - TileEntityRenderer ter = TileEntityRendererDispatcher.instance.getRenderer(TileGaiaHead.class); - ((RenderTileGaiaHead) ter).render(0.0F, 0.0F, 0.0F, null, 180.0F, BlockGaiaHead.GAIA_TYPE, null, -1, 0.0F); + if(stack.getItem() == ModBlocks.gaiaHead.asItem()) { + TileEntityRenderer r = TileEntityRendererDispatcher.instance.getRenderer(TileGaiaHead.class); + ((RenderTileGaiaHead) r).render(0, 0, 0, null, 180, BlockGaiaHead.GAIA_TYPE, null, -1, 0); } } } - @Override public void setRendererDispatcher(@Nonnull TileEntityRendererDispatcher dispatcher) { rendererDispatcher = dispatcher; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index 45a99c4fd..5073a6864 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile; import java.util.Random; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.minecraft.block.Block; import org.lwjgl.opengl.GL11; @@ -58,16 +59,14 @@ public class RenderTilePylon extends TileEntityRenderer implements IM @Override public void render(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress) { - boolean renderingItem = pylon == ForwardingTEISR.DUMMY; - - if(!renderingItem && (!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || !(pylon.getBlockState().getBlock() instanceof BlockPylon))) + if(!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || !(pylon.getBlockState().getBlock() instanceof BlockPylon)) return; - renderPylon(pylon, d0, d1, d2, pticks, renderingItem); + renderPylon(pylon, d0, d1, d2, pticks); } - private void renderPylon(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, boolean renderingItem) { - BlockPylon.Variant type = renderingItem ? forceVariant : ((BlockPylon) pylon.getBlockState().getBlock()).variant; + private void renderPylon(@Nullable TilePylon pylon, double d0, double d1, double d2, float pticks) { + BlockPylon.Variant type = pylon == null ? forceVariant : ((BlockPylon) pylon.getBlockState().getBlock()).variant; IPylonModel model; switch(type) { default: @@ -97,36 +96,36 @@ public class RenderTilePylon extends TileEntityRenderer implements IM double worldTime = (double) (ClientTickHandler.ticksInGame + pticks); - worldTime += renderingItem ? 0 : new Random(pylon.getPos().hashCode()).nextInt(360); + worldTime += pylon == null ? 0 : new Random(pylon.getPos().hashCode()).nextInt(360); - GlStateManager.translated(d0, d1 + (renderingItem ? 1.35 : 1.5), d2); + GlStateManager.translated(d0, d1 + (pylon == null ? 1.35 : 1.5), d2); GlStateManager.scalef(1.0F, -1.0F, -1.0F); GlStateManager.pushMatrix(); GlStateManager.translatef(0.5F, 0F, -0.5F); - if(!renderingItem) + if(pylon != null) GlStateManager.rotatef((float) worldTime * 1.5F, 0F, 1F, 0F); model.renderRing(); - if(!renderingItem) + if(pylon != null) GlStateManager.translated(0D, Math.sin(worldTime / 20D) / 20 - 0.025, 0D); GlStateManager.popMatrix(); GlStateManager.pushMatrix(); - if(!renderingItem) + if(pylon != null) GlStateManager.translated(0D, Math.sin(worldTime / 20D) / 17.5, 0D); GlStateManager.translatef(0.5F, 0F, -0.5F); - if(!renderingItem) + if(pylon != null) GlStateManager.rotatef((float) -worldTime, 0F, 1F, 0F); GlStateManager.disableCull(); GlStateManager.disableAlphaTest(); - if(!renderingItem) + if(pylon != null) ShaderHelper.useShader(ShaderHelper.pylonGlow); model.renderCrystal(); - if(!renderingItem) + if(pylon != null) ShaderHelper.releaseShader(); GlStateManager.enableAlphaTest(); @@ -138,23 +137,13 @@ public class RenderTilePylon extends TileEntityRenderer implements IM GlStateManager.popMatrix(); } - // Dirty hack to make the TESR know which variant of pylon it's rendering - public static class ForwardingTEISR extends TileEntityItemStackRenderer { - private static final TilePylon DUMMY = new TilePylon(); - - private final TileEntityItemStackRenderer compose; - - public ForwardingTEISR(TileEntityItemStackRenderer compose) { - this.compose = compose; - } - + public static class TEISR extends TileEntityItemStackRenderer { @Override public void renderByItem(ItemStack stack) { if(Block.getBlockFromItem(stack.getItem()) instanceof BlockPylon) { RenderTilePylon.forceVariant = ((BlockPylon) Block.getBlockFromItem(stack.getItem())).variant; - TileEntityRendererDispatcher.instance.render(DUMMY, 0, 0, 0, 0); - } else { - compose.renderByItem(stack); + TileEntityRenderer r = TileEntityRendererDispatcher.instance.getRenderer(TilePylon.class); + ((RenderTilePylon) r).renderPylon(null, 0, 0, 0, 0); } } } @@ -163,7 +152,7 @@ public class RenderTilePylon extends TileEntityRenderer implements IM public void renderBlockForMultiblock(IBlockReader world, Multiblock mb, IBlockState state, MultiblockComponent comp) { forceVariant = ((BlockPylon) state.getBlock()).variant; GlStateManager.translatef(-0.5F, -0.25F, -0.5F); - renderPylon((TilePylon) comp.getTileEntity(), 0, 0, 0, 0, true); + renderPylon(null, 0, 0, 0, 0); forceVariant = BlockPylon.Variant.MANA; } diff --git a/src/main/java/vazkii/botania/client/render/tile/TEISR.java b/src/main/java/vazkii/botania/client/render/tile/TEISR.java new file mode 100644 index 000000000..1f93cb6aa --- /dev/null +++ b/src/main/java/vazkii/botania/client/render/tile/TEISR.java @@ -0,0 +1,26 @@ +package vazkii.botania.client.render.tile; + +import com.google.common.base.Preconditions; +import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IItemProvider; + +public class TEISR extends TileEntityItemStackRenderer { + private final IItemProvider item; + private final Class clazz; + + public TEISR(IItemProvider item, Class clazz) { + this.item = Preconditions.checkNotNull(item); + this.clazz = clazz; + } + + @Override + public void renderByItem(ItemStack stack) { + if(stack.getItem() == item.asItem()) { + TileEntityRendererDispatcher.instance.getRenderer(clazz) + .render(null, 0,0, 0, 0, -1); + } + } +} diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 1d25be9e8..3d0f11285 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -33,6 +33,8 @@ import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.client.render.tile.RenderTileBrewery; import vazkii.botania.client.render.tile.RenderTileCorporeaCrystalCube; import vazkii.botania.client.render.tile.RenderTileCorporeaIndex; +import vazkii.botania.client.render.tile.RenderTilePylon; +import vazkii.botania.client.render.tile.TEISR; import vazkii.botania.common.block.corporea.BlockCorporeaCrystalCube; import vazkii.botania.common.block.corporea.BlockCorporeaFunnel; import vazkii.botania.common.block.corporea.BlockCorporeaIndex; @@ -647,9 +649,10 @@ public final class ModBlocks { r.register(new ItemBlockPool(dilutedPool, props).setRegistryName(dilutedPool.getRegistryName())); r.register(new ItemBlockPool(fabulousPool, props).setRegistryName(fabulousPool.getRegistryName())); r.register(new ItemBlockMod(runeAltar, props).setRegistryName(runeAltar.getRegistryName())); - r.register(new ItemBlockMod(manaPylon, props).setRegistryName(manaPylon.getRegistryName())); - r.register(new ItemBlockMod(naturaPylon, props).setRegistryName(naturaPylon.getRegistryName())); - r.register(new ItemBlockMod(gaiaPylon, props).setRegistryName(gaiaPylon.getRegistryName())); + Item.Properties pylonProps = ModItems.defaultBuilder().setTEISR(() -> RenderTilePylon.TEISR::new); + r.register(new ItemBlockMod(manaPylon, pylonProps).setRegistryName(manaPylon.getRegistryName())); + r.register(new ItemBlockMod(naturaPylon, pylonProps).setRegistryName(naturaPylon.getRegistryName())); + r.register(new ItemBlockMod(gaiaPylon, pylonProps).setRegistryName(gaiaPylon.getRegistryName())); r.register(new ItemBlockMod(pistonRelay, props).setRegistryName(pistonRelay.getRegistryName())); r.register(new ItemBlockMod(distributor, props).setRegistryName(distributor.getRegistryName())); r.register(new ItemBlockMod(manaVoid, props).setRegistryName(manaVoid.getRegistryName())); @@ -730,7 +733,7 @@ public final class ModBlocks { r.register(new ItemBlockMod(starfield, props).setRegistryName(starfield.getRegistryName())); r.register(new ItemBlockMod(rfGenerator, props).setRegistryName(rfGenerator.getRegistryName())); r.register(new ItemBlockElven(elfGlass, props).setRegistryName(elfGlass.getRegistryName())); - r.register(new ItemBlockMod(brewery, ModItems.defaultBuilder().setTEISR(() -> RenderTileBrewery.TEISR::new)).setRegistryName(brewery.getRegistryName())); + r.register(new ItemBlockMod(brewery, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.brewery, TileBrewery.class))).setRegistryName(brewery.getRegistryName())); r.register(new ItemBlockMod(manaGlass, props).setRegistryName(manaGlass.getRegistryName())); r.register(new ItemBlockMod(terraPlate, props).setRegistryName(terraPlate.getRegistryName())); r.register(new ItemBlockMod(redStringContainer, props).setRegistryName(redStringContainer.getRegistryName())); @@ -757,7 +760,7 @@ public final class ModBlocks { r.register(new ItemBlockMod(petalBlockGreen, props).setRegistryName(petalBlockGreen.getRegistryName())); r.register(new ItemBlockMod(petalBlockRed, props).setRegistryName(petalBlockRed.getRegistryName())); r.register(new ItemBlockMod(petalBlockBlack, props).setRegistryName(petalBlockBlack.getRegistryName())); - r.register(new ItemBlockMod(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> RenderTileCorporeaIndex.TEISR::new)).setRegistryName(corporeaIndex.getRegistryName())); + r.register(new ItemBlockMod(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaIndex, TileCorporeaIndex.class))).setRegistryName(corporeaIndex.getRegistryName())); r.register(new ItemBlockMod(corporeaFunnel, props).setRegistryName(corporeaFunnel.getRegistryName())); r.register(new ItemBlockMod(whiteMushroom, props).setRegistryName(whiteMushroom.getRegistryName())); r.register(new ItemBlockMod(orangeMushroom, props).setRegistryName(orangeMushroom.getRegistryName())); @@ -794,9 +797,9 @@ public final class ModBlocks { r.register(new ItemBlockMod(doubleFlowerBlack, props).setRegistryName(doubleFlowerBlack.getRegistryName())); r.register(new ItemBlockBlaze(blazeBlock, props).setRegistryName(blazeBlock.getRegistryName())); r.register(new ItemBlockMod(corporeaInterceptor, props).setRegistryName(corporeaInterceptor.getRegistryName())); - r.register(new ItemBlockMod(corporeaCrystalCube, ModItems.defaultBuilder().setTEISR(() -> RenderTileCorporeaCrystalCube.TEISR::new)).setRegistryName(corporeaCrystalCube.getRegistryName())); + r.register(new ItemBlockMod(corporeaCrystalCube, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaCrystalCube, TileCorporeaCrystalCube.class))).setRegistryName(corporeaCrystalCube.getRegistryName())); r.register(new ItemBlockMod(incensePlate, props).setRegistryName(incensePlate.getRegistryName())); - r.register(new ItemBlockMod(hourglass, props).setRegistryName(hourglass.getRegistryName())); + r.register(new ItemBlockMod(hourglass, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.hourglass, TileHourglass.class))).setRegistryName(hourglass.getRegistryName())); r.register(new ItemBlockMod(ghostRail, props).setRegistryName(ghostRail.getRegistryName())); r.register(new ItemBlockMod(sparkChanger, props).setRegistryName(sparkChanger.getRegistryName())); r.register(new ItemBlockMod(root, props).setRegistryName(root.getRegistryName())); @@ -808,15 +811,15 @@ public final class ModBlocks { r.register(new ItemBlockMod(lightLauncher, props).setRegistryName(lightLauncher.getRegistryName())); r.register(new ItemBlockMod(manaBomb, props).setRegistryName(manaBomb.getRegistryName())); r.register(new ItemBlockMod(cacophonium, props).setRegistryName(cacophonium.getRegistryName())); - r.register(new ItemBlockMod(bellows, props).setRegistryName(bellows.getRegistryName())); + r.register(new ItemBlockMod(bellows, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.bellows, TileBellows.class))).setRegistryName(bellows.getRegistryName())); r.register(new ItemBlockMod(bifrostPerm, props).setRegistryName(bifrostPerm.getRegistryName())); r.register(new ItemBlockMod(cellBlock, props).setRegistryName(cellBlock.getRegistryName())); r.register(new ItemBlockMod(redStringInterceptor, props).setRegistryName(redStringInterceptor.getRegistryName())); r.register(new ItemBlockMod(corporeaRetainer, props).setRegistryName(corporeaRetainer.getRegistryName())); - r.register(new ItemBlockMod(teruTeruBozu, props).setRegistryName(teruTeruBozu.getRegistryName())); + r.register(new ItemBlockMod(teruTeruBozu, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.teruTeruBozu, TileTeruTeruBozu.class))).setRegistryName(teruTeruBozu.getRegistryName())); r.register(new ItemBlockMod(shimmerrock, props).setRegistryName(shimmerrock.getRegistryName())); r.register(new ItemBlockMod(shimmerwoodPlanks, props).setRegistryName(shimmerwoodPlanks.getRegistryName())); - r.register(new ItemBlockMod(avatar, props).setRegistryName(avatar.getRegistryName())); + r.register(new ItemBlockMod(avatar, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.avatar, TileAvatar.class))).setRegistryName(avatar.getRegistryName())); r.register(new ItemBlockMod(dryGrass, props).setRegistryName(dryGrass.getRegistryName())); r.register(new ItemBlockMod(goldenGrass, props).setRegistryName(goldenGrass.getRegistryName())); r.register(new ItemBlockMod(vividGrass, props).setRegistryName(vividGrass.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 35006832f..b9dcbfde6 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -303,7 +303,7 @@ public final class BotaniaCreativeTab extends ItemGroup { addItem(ModItems.ancientWillVerac); addItem(ModItems.ancientWillKaril); addItem(ModItems.pinkinator); - addItem(ModItems.gaiaHead); + addItem(ModBlocks.gaiaHead); if(ConfigHandler.COMMON.relicsEnabled.get()) { addItem(ModItems.dice); addItem(ModItems.infiniteFruit); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 1de0e749a..18bd3dd41 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -25,7 +25,9 @@ import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.client.render.tile.RenderTileGaiaHead; +import vazkii.botania.client.render.tile.TEISR; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.item.brew.*; @@ -384,7 +386,6 @@ public final class ModItems { public static final Item manaweaveLegs = new ItemManaweaveArmor(EntityEquipmentSlot.LEGS, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_LEGS); public static final Item manaweaveBoots = new ItemManaweaveArmor(EntityEquipmentSlot.FEET, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_BOOTS); public static final Item autocraftingHalo = new ItemAutocraftingHalo(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.AUTOCRAFTING_HALO); - @ObjectHolder("botania:" + LibBlockNames.GAIA_HEAD) public static Item gaiaHead; public static final Item sextant = new ItemSextant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SEXTANT); public static final Item speedUpBelt = new ItemSpeedUpBelt(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPEED_UP_BELT); public static final Item baubleBox = new ItemBaubleBox(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.BAUBLE_BOX); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java index b4f44f710..f8473d1a8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java @@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ModItems; @@ -49,7 +50,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe { ItemNBTHelper.setString(stack, "SkullOwner", ((EntityPlayer) event.getEntityLiving()).getGameProfile().getName()); addDrop(event, stack); } else if(event.getEntityLiving() instanceof EntityDoppleganger && rand.nextInt(13) < 1 + looting) - addDrop(event, new ItemStack(ModItems.gaiaHead)); + addDrop(event, new ItemStack(ModBlocks.gaiaHead)); } } } diff --git a/src/main/resources/assets/botania/blockstates/animated_torch.json b/src/main/resources/assets/botania/blockstates/animated_torch.json new file mode 100644 index 000000000..6f8e2e549 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/animated_torch.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/animated_torch" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/animatedtorch.json b/src/main/resources/assets/botania/blockstates/animatedtorch.json deleted file mode 100644 index 36d9994a0..000000000 --- a/src/main/resources/assets/botania/blockstates/animatedtorch.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania:block/dummy", - "textures": { - "particle": "minecraft:blocks/redstone_torch_on" - } - }, - "variants": { - "": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bellows.json b/src/main/resources/assets/botania/blockstates/bellows.json index cc89b20bf..11611c5c8 100644 --- a/src/main/resources/assets/botania/blockstates/bellows.json +++ b/src/main/resources/assets/botania/blockstates/bellows.json @@ -1,12 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:block/dummy", - "textures": { - "particle": "botania:blocks/livingwood0" - } - }, "variants": { - "": [{}] + "": { "model": "botania:block/bellows" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/black_buried_petals.json b/src/main/resources/assets/botania/blockstates/black_buried_petals.json new file mode 100644 index 000000000..93d0ea781 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/black_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/black_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/blazeblock.json b/src/main/resources/assets/botania/blockstates/blaze_block.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/blazeblock.json rename to src/main/resources/assets/botania/blockstates/blaze_block.json diff --git a/src/main/resources/assets/botania/blockstates/blue_buried_petals.json b/src/main/resources/assets/botania/blockstates/blue_buried_petals.json new file mode 100644 index 000000000..2056cfd1e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/blue_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/blue_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/brewery.json b/src/main/resources/assets/botania/blockstates/brewery.json index 9a5e84584..37b4854b4 100644 --- a/src/main/resources/assets/botania/blockstates/brewery.json +++ b/src/main/resources/assets/botania/blockstates/brewery.json @@ -1,12 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:block/dummy", - "textures": { - "particle": "botania:blocks/livingrock0" - } - }, "variants": { - "": [{}] + "": { "model": "botania:block/brewery" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/brown_buried_petals.json b/src/main/resources/assets/botania/blockstates/brown_buried_petals.json new file mode 100644 index 000000000..3187a2b92 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/brown_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/brown_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/buriedpetals.json b/src/main/resources/assets/botania/blockstates/buriedpetals.json deleted file mode 100644 index 9d5dbaa62..000000000 --- a/src/main/resources/assets/botania/blockstates/buriedpetals.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania:block/dummy" - }, - "variants": { - "color": { - "white": { "textures": { "particle": "minecraft:blocks/wool_colored_white" }}, - "orange": { "textures": { "particle": "minecraft:blocks/wool_colored_orange" }}, - "magenta": { "textures": { "particle": "minecraft:blocks/wool_colored_magenta" }}, - "light_blue": { "textures": { "particle": "minecraft:blocks/wool_colored_light_blue" }}, - "yellow": { "textures": { "particle": "minecraft:blocks/wool_colored_yellow" }}, - "lime": { "textures": { "particle": "minecraft:blocks/wool_colored_lime" }}, - "pink": { "textures": { "particle": "minecraft:blocks/wool_colored_pink" }}, - "gray": { "textures": { "particle": "minecraft:blocks/wool_colored_gray" }}, - "silver": { "textures": { "particle": "minecraft:blocks/wool_colored_silver" }}, - "cyan": { "textures": { "particle": "minecraft:blocks/wool_colored_cyan" }}, - "purple": { "textures": { "particle": "minecraft:blocks/wool_colored_purple" }}, - "blue": { "textures": { "particle": "minecraft:blocks/wool_colored_blue" }}, - "brown": { "textures": { "particle": "minecraft:blocks/wool_colored_brown" }}, - "green": { "textures": { "particle": "minecraft:blocks/wool_colored_green" }}, - "red": { "textures": { "particle": "minecraft:blocks/wool_colored_red" }}, - "black": { "textures": { "particle": "minecraft:blocks/wool_colored_black" }} - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/chiseled_livingrock_brick.json b/src/main/resources/assets/botania/blockstates/chiseled_livingrock_brick.json new file mode 100644 index 000000000..ac75a929e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/chiseled_livingrock_brick.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/livingrock_chiseled_brick" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/conjurationcatalyst.json b/src/main/resources/assets/botania/blockstates/conjuration_catalyst.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/conjurationcatalyst.json rename to src/main/resources/assets/botania/blockstates/conjuration_catalyst.json diff --git a/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json b/src/main/resources/assets/botania/blockstates/corporea_crystal_cube.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/corporeacrystalcube.json rename to src/main/resources/assets/botania/blockstates/corporea_crystal_cube.json diff --git a/src/main/resources/assets/botania/blockstates/corporeafunnel.json b/src/main/resources/assets/botania/blockstates/corporea_funnel.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/corporeafunnel.json rename to src/main/resources/assets/botania/blockstates/corporea_funnel.json diff --git a/src/main/resources/assets/botania/blockstates/corporea_index.json b/src/main/resources/assets/botania/blockstates/corporea_index.json new file mode 100644 index 000000000..4808c5457 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/corporea_index.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/corporea_index" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeainterceptor.json b/src/main/resources/assets/botania/blockstates/corporea_interceptor.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/corporeainterceptor.json rename to src/main/resources/assets/botania/blockstates/corporea_interceptor.json diff --git a/src/main/resources/assets/botania/blockstates/corporearetainer.json b/src/main/resources/assets/botania/blockstates/corporea_retainer.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/corporearetainer.json rename to src/main/resources/assets/botania/blockstates/corporea_retainer.json diff --git a/src/main/resources/assets/botania/blockstates/corporeaindex.json b/src/main/resources/assets/botania/blockstates/corporeaindex.json deleted file mode 100644 index 6519ae24c..000000000 --- a/src/main/resources/assets/botania/blockstates/corporeaindex.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania:block/dummy", - "textures": { - "particle": "botania:blocks/storage2" - } - }, - "variants": { - "": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/cracked_livingrock_brick.json b/src/main/resources/assets/botania/blockstates/cracked_livingrock_brick.json new file mode 100644 index 000000000..80a853551 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/cracked_livingrock_brick.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/livingrock_cracked_brick" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pool_creative.json b/src/main/resources/assets/botania/blockstates/creative_pool.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pool_creative.json rename to src/main/resources/assets/botania/blockstates/creative_pool.json diff --git a/src/main/resources/assets/botania/blockstates/cyan_buried_petals.json b/src/main/resources/assets/botania/blockstates/cyan_buried_petals.json new file mode 100644 index 000000000..eb368e0e4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/cyan_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/cyan_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pool_diluted.json b/src/main/resources/assets/botania/blockstates/diluted_pool.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pool_diluted.json rename to src/main/resources/assets/botania/blockstates/diluted_pool.json diff --git a/src/main/resources/assets/botania/blockstates/pool_fabulous.json b/src/main/resources/assets/botania/blockstates/fabulous_pool.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pool_fabulous.json rename to src/main/resources/assets/botania/blockstates/fabulous_pool.json diff --git a/src/main/resources/assets/botania/blockstates/gaia_head.json b/src/main/resources/assets/botania/blockstates/gaia_head.json index 75ca93c9c..b903e1791 100644 --- a/src/main/resources/assets/botania/blockstates/gaia_head.json +++ b/src/main/resources/assets/botania/blockstates/gaia_head.json @@ -1,12 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:block/dummy", - "textures": { - "particle": "minecraft:blocks/soul_sand" - } - }, "variants": { - "": [{}] + "": { "model": "botania:block/gaia_head" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/gaia_wall_head.json b/src/main/resources/assets/botania/blockstates/gaia_wall_head.json new file mode 100644 index 000000000..b903e1791 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/gaia_wall_head.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/gaia_head" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/gray_buried_petals.json b/src/main/resources/assets/botania/blockstates/gray_buried_petals.json new file mode 100644 index 000000000..b59d1b395 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/gray_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/gray_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/green_buried_petals.json b/src/main/resources/assets/botania/blockstates/green_buried_petals.json new file mode 100644 index 000000000..fabc201c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/green_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/green_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hourglass.json b/src/main/resources/assets/botania/blockstates/hourglass.json index 6b774dfe3..fb32cf693 100644 --- a/src/main/resources/assets/botania/blockstates/hourglass.json +++ b/src/main/resources/assets/botania/blockstates/hourglass.json @@ -1,12 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:block/dummy", - "textures": { - "particle": "botania:blocks/mana_glass" - } - }, "variants": { - "": [{}] + "": { "model": "botania:block/hourglass" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/incenseplate.json b/src/main/resources/assets/botania/blockstates/incense_plate.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/incenseplate.json rename to src/main/resources/assets/botania/blockstates/incense_plate.json diff --git a/src/main/resources/assets/botania/blockstates/light_blue_buried_petals.json b/src/main/resources/assets/botania/blockstates/light_blue_buried_petals.json new file mode 100644 index 000000000..84323065a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/light_blue_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/light_blue_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/light_gray_buried_petals.json b/src/main/resources/assets/botania/blockstates/light_gray_buried_petals.json new file mode 100644 index 000000000..01b8b7ce1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/light_gray_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/light_gray_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/lime_buried_petals.json b/src/main/resources/assets/botania/blockstates/lime_buried_petals.json new file mode 100644 index 000000000..f1a84d1e0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/lime_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/lime_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock.json b/src/main/resources/assets/botania/blockstates/livingrock.json index bb5f6a101..baa963a76 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock.json +++ b/src/main/resources/assets/botania/blockstates/livingrock.json @@ -1,9 +1,5 @@ { "variants": { - "variant=default": { "model": "botania:block/livingrock" }, - "variant=brick": { "model": "botania:block/livingrock_brick" }, - "variant=mossy_brick": { "model": "botania:block/livingrock_mossy_brick" }, - "variant=cracked_brick": { "model": "botania:block/livingrock_cracked_brick" }, - "variant=chiseled_brick": { "model": "botania:block/livingrock_chiseled_brick" } + "": { "model": "botania:block/livingrock" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock_brick.json b/src/main/resources/assets/botania/blockstates/livingrock_brick.json new file mode 100644 index 000000000..8401cc9d1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock_brick.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/livingrock_brick" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/magenta_buried_petals.json b/src/main/resources/assets/botania/blockstates/magenta_buried_petals.json new file mode 100644 index 000000000..327ce76d0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/magenta_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/magenta_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mana_flame.json b/src/main/resources/assets/botania/blockstates/mana_flame.json index 199603700..6cab0046d 100644 --- a/src/main/resources/assets/botania/blockstates/mana_flame.json +++ b/src/main/resources/assets/botania/blockstates/mana_flame.json @@ -1,19 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:block/dummy", - "textures": { - "particle": "minecraft:blocks/fire_layer_0" - } - }, "variants": { - "": [{}], - "inventory": [{ - "model": "builtin/generated", - "textures": { - "layer0": "minecraft:blocks/fire_layer_0" - }, - "transform": "forge:default-item" - }] + "": { "model": "botania:block/mana_flame" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/managlasspane.json b/src/main/resources/assets/botania/blockstates/mana_glass_pane.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/managlasspane.json rename to src/main/resources/assets/botania/blockstates/mana_glass_pane.json diff --git a/src/main/resources/assets/botania/blockstates/pool_default.json b/src/main/resources/assets/botania/blockstates/mana_pool.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pool_default.json rename to src/main/resources/assets/botania/blockstates/mana_pool.json diff --git a/src/main/resources/assets/botania/blockstates/desert_cobble_wall.json b/src/main/resources/assets/botania/blockstates/metamorphic_desert_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/desert_cobble_wall.json rename to src/main/resources/assets/botania/blockstates/metamorphic_desert_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/blockstates/mesa_cobble_wall.json b/src/main/resources/assets/botania/blockstates/metamorphic_mesa_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/mesa_cobble_wall.json rename to src/main/resources/assets/botania/blockstates/metamorphic_mesa_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/blockstates/mountain_cobble_wall.json b/src/main/resources/assets/botania/blockstates/metamorphic_mountain_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/mountain_cobble_wall.json rename to src/main/resources/assets/botania/blockstates/metamorphic_mountain_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/blockstates/plains_cobble_wall.json b/src/main/resources/assets/botania/blockstates/metamorphic_plains_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/plains_cobble_wall.json rename to src/main/resources/assets/botania/blockstates/metamorphic_plains_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/blockstates/swamp_cobble_wall.json b/src/main/resources/assets/botania/blockstates/metamorphic_swamp_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/swamp_cobble_wall.json rename to src/main/resources/assets/botania/blockstates/metamorphic_swamp_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/blockstates/taiga_cobble_wall.json b/src/main/resources/assets/botania/blockstates/metamorphic_taiga_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/taiga_cobble_wall.json rename to src/main/resources/assets/botania/blockstates/metamorphic_taiga_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/blockstates/mossy_livingrock_brick.json b/src/main/resources/assets/botania/blockstates/mossy_livingrock_brick.json new file mode 100644 index 000000000..4e36e750a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/mossy_livingrock_brick.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/livingrock_mossy_brick" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/orange_buried_petals.json b/src/main/resources/assets/botania/blockstates/orange_buried_petals.json new file mode 100644 index 000000000..b1bd88e57 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/orange_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/orange_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pink_buried_petals.json b/src/main/resources/assets/botania/blockstates/pink_buried_petals.json new file mode 100644 index 000000000..42c870deb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pink_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/pink_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prism.json b/src/main/resources/assets/botania/blockstates/prism.json index 611db6d81..087f0e777 100644 --- a/src/main/resources/assets/botania/blockstates/prism.json +++ b/src/main/resources/assets/botania/blockstates/prism.json @@ -1,8 +1,5 @@ { "variants": { - "has_lens=false,powered=false": { "model": "botania:block/prism" }, - "has_lens=true,powered=false": { "model": "botania:block/prism" }, - "has_lens=false,powered=true": { "model": "botania:block/prism" }, - "has_lens=true,powered=true": { "model": "botania:block/prism" } + "": { "model": "botania:block/prism" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/purple_buried_petals.json b/src/main/resources/assets/botania/blockstates/purple_buried_petals.json new file mode 100644 index 000000000..f36a2cf99 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/purple_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/purple_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/red_buried_petals.json b/src/main/resources/assets/botania/blockstates/red_buried_petals.json new file mode 100644 index 000000000..a22c93422 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/red_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/red_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redstringcomparator.json b/src/main/resources/assets/botania/blockstates/red_string_comparator.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/redstringcomparator.json rename to src/main/resources/assets/botania/blockstates/red_string_comparator.json diff --git a/src/main/resources/assets/botania/blockstates/redstringcontainer.json b/src/main/resources/assets/botania/blockstates/red_string_container.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/redstringcontainer.json rename to src/main/resources/assets/botania/blockstates/red_string_container.json diff --git a/src/main/resources/assets/botania/blockstates/redstringdispenser.json b/src/main/resources/assets/botania/blockstates/red_string_dispenser.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/redstringdispenser.json rename to src/main/resources/assets/botania/blockstates/red_string_dispenser.json diff --git a/src/main/resources/assets/botania/blockstates/redstringfertilizer.json b/src/main/resources/assets/botania/blockstates/red_string_fertilizer.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/redstringfertilizer.json rename to src/main/resources/assets/botania/blockstates/red_string_fertilizer.json diff --git a/src/main/resources/assets/botania/blockstates/redstringinterceptor.json b/src/main/resources/assets/botania/blockstates/red_string_interceptor.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/redstringinterceptor.json rename to src/main/resources/assets/botania/blockstates/red_string_interceptor.json diff --git a/src/main/resources/assets/botania/blockstates/redstringrelay.json b/src/main/resources/assets/botania/blockstates/red_string_relay.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/redstringrelay.json rename to src/main/resources/assets/botania/blockstates/red_string_relay.json diff --git a/src/main/resources/assets/botania/blockstates/teru_teru_bozu.json b/src/main/resources/assets/botania/blockstates/teru_teru_bozu.json new file mode 100644 index 000000000..f5ec19d15 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/teru_teru_bozu.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:teru_teru_bozu" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/teruterubozu.json b/src/main/resources/assets/botania/blockstates/teruterubozu.json deleted file mode 100644 index eb045b2dd..000000000 --- a/src/main/resources/assets/botania/blockstates/teruterubozu.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania:block/dummy", - "textures": { - "particle": "minecraft:blocks/wool_colored_white" - } - }, - "variants": { - "": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tinyplanetblock.json b/src/main/resources/assets/botania/blockstates/tiny_planet_block.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/tinyplanetblock.json rename to src/main/resources/assets/botania/blockstates/tiny_planet_block.json diff --git a/src/main/resources/assets/botania/blockstates/tinypotato.json b/src/main/resources/assets/botania/blockstates/tiny_potato.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/tinypotato.json rename to src/main/resources/assets/botania/blockstates/tiny_potato.json diff --git a/src/main/resources/assets/botania/blockstates/white_buried_petals.json b/src/main/resources/assets/botania/blockstates/white_buried_petals.json new file mode 100644 index 000000000..e34fd2758 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/white_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/white_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/yellow_buried_petals.json b/src/main/resources/assets/botania/blockstates/yellow_buried_petals.json new file mode 100644 index 000000000..aef4c0b98 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/yellow_buried_petals.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "botania:block/yellow_buried_petals" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/animated_torch.json b/src/main/resources/assets/botania/models/block/animated_torch.json new file mode 100644 index 000000000..9a45f4eb3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/animated_torch.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/redstone_torch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bellows.json b/src/main/resources/assets/botania/models/block/bellows.json new file mode 100644 index 000000000..8140c9b3c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bellows.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "botania:blocks/livingwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/black_buried_petals.json b/src/main/resources/assets/botania/models/block/black_buried_petals.json new file mode 100644 index 000000000..a067ae3de --- /dev/null +++ b/src/main/resources/assets/botania/models/block/black_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/black_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/blue_buried_petals.json b/src/main/resources/assets/botania/models/block/blue_buried_petals.json new file mode 100644 index 000000000..91426203c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/blue_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/blue_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/brewery.json b/src/main/resources/assets/botania/models/block/brewery.json new file mode 100644 index 000000000..1279a94c4 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/brewery.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "botania:blocks/livingrock0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/brown_buried_petals.json b/src/main/resources/assets/botania/models/block/brown_buried_petals.json new file mode 100644 index 000000000..ebc6fa898 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/brown_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/brown_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/corporea_index.json b/src/main/resources/assets/botania/models/block/corporea_index.json new file mode 100644 index 000000000..6673b79be --- /dev/null +++ b/src/main/resources/assets/botania/models/block/corporea_index.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "botania:blocks/storage2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cyan_buried_petals.json b/src/main/resources/assets/botania/models/block/cyan_buried_petals.json new file mode 100644 index 000000000..ce5043aeb --- /dev/null +++ b/src/main/resources/assets/botania/models/block/cyan_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/cyan_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dry_grass.json b/src/main/resources/assets/botania/models/block/dry_grass.json index 725dff165..0f66f357c 100644 --- a/src/main/resources/assets/botania/models/block/dry_grass.json +++ b/src/main/resources/assets/botania/models/block/dry_grass.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "minecraft:blocks/dirt", + "bottom": "minecraft:block/dirt", "top": "botania:blocks/altgrass0", "side": "botania:blocks/altgrass1" } diff --git a/src/main/resources/assets/botania/models/block/dummy.json b/src/main/resources/assets/botania/models/block/dummy.json deleted file mode 100644 index 2a4f56dc6..000000000 --- a/src/main/resources/assets/botania/models/block/dummy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "__comment": "Dummy for TESRS that still want to set their block break particle without using code", - "elements": [ - { - "from": [0, 0, 0], - "to": [0, 0, 0], - "faces": { - "up": { "uv": [ 0, 0, 0, 0 ], "texture": "dummythatwillnevergetrendered" } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/enchanted_soil.json b/src/main/resources/assets/botania/models/block/enchanted_soil.json index 11c68e6b7..f54ffc6e5 100644 --- a/src/main/resources/assets/botania/models/block/enchanted_soil.json +++ b/src/main/resources/assets/botania/models/block/enchanted_soil.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "minecraft:blocks/dirt", + "bottom": "minecraft:block/dirt", "top": "botania:blocks/enchantedsoil0", "side": "botania:blocks/enchantedsoil1" } diff --git a/src/main/resources/assets/botania/models/block/fel_pumpkin.json b/src/main/resources/assets/botania/models/block/fel_pumpkin.json index 3dc817fed..33d217ce9 100644 --- a/src/main/resources/assets/botania/models/block/fel_pumpkin.json +++ b/src/main/resources/assets/botania/models/block/fel_pumpkin.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "minecraft:blocks/pumpkin_top", + "top": "minecraft:block/pumpkin_top", "front": "botania:blocks/pumpkin_fel", - "side": "minecraft:blocks/pumpkin_side" + "side": "minecraft:block/pumpkin_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/gaia_head.json b/src/main/resources/assets/botania/models/block/gaia_head.json new file mode 100644 index 000000000..d8969567a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/gaia_head.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/soul_sand" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/golden_grass.json b/src/main/resources/assets/botania/models/block/golden_grass.json index e127f0c69..c405fcb7d 100644 --- a/src/main/resources/assets/botania/models/block/golden_grass.json +++ b/src/main/resources/assets/botania/models/block/golden_grass.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "minecraft:blocks/dirt", + "bottom": "minecraft:block/dirt", "top": "botania:blocks/altgrass2", "side": "botania:blocks/altgrass3" } diff --git a/src/main/resources/assets/botania/models/block/gray_buried_petals.json b/src/main/resources/assets/botania/models/block/gray_buried_petals.json new file mode 100644 index 000000000..d91c5db26 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/gray_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/gray_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/green_buried_petals.json b/src/main/resources/assets/botania/models/block/green_buried_petals.json new file mode 100644 index 000000000..0b5726a9f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/green_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/green_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/hourglass.json b/src/main/resources/assets/botania/models/block/hourglass.json new file mode 100644 index 000000000..81fcd60fe --- /dev/null +++ b/src/main/resources/assets/botania/models/block/hourglass.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "botania:blocks/mana_glass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/infused_grass.json b/src/main/resources/assets/botania/models/block/infused_grass.json index 27fab6828..0de93a64b 100644 --- a/src/main/resources/assets/botania/models/block/infused_grass.json +++ b/src/main/resources/assets/botania/models/block/infused_grass.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "minecraft:blocks/dirt", + "bottom": "minecraft:block/dirt", "top": "botania:blocks/altgrass8", "side": "botania:blocks/altgrass9" } diff --git a/src/main/resources/assets/botania/models/block/light_blue_buried_petals.json b/src/main/resources/assets/botania/models/block/light_blue_buried_petals.json new file mode 100644 index 000000000..81fe46989 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/light_blue_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/light_blue_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/light_gray_buried_petals.json b/src/main/resources/assets/botania/models/block/light_gray_buried_petals.json new file mode 100644 index 000000000..a0c91390b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/light_gray_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/light_gray_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/lime_buried_petals.json b/src/main/resources/assets/botania/models/block/lime_buried_petals.json new file mode 100644 index 000000000..7c2b94299 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/lime_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/lime_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/magenta_buried_petals.json b/src/main/resources/assets/botania/models/block/magenta_buried_petals.json new file mode 100644 index 000000000..2bd1c5e8f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/magenta_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/magenta_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_flame.json b/src/main/resources/assets/botania/models/block/mana_flame.json new file mode 100644 index 000000000..4a9098406 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_flame.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/fire_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mutated_grass.json b/src/main/resources/assets/botania/models/block/mutated_grass.json index 9f19ce451..06d9ea10d 100644 --- a/src/main/resources/assets/botania/models/block/mutated_grass.json +++ b/src/main/resources/assets/botania/models/block/mutated_grass.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "minecraft:blocks/dirt", + "bottom": "minecraft:block/dirt", "top": "botania:blocks/altgrass10", "side": "botania:blocks/altgrass11" } diff --git a/src/main/resources/assets/botania/models/block/orange_buried_petals.json b/src/main/resources/assets/botania/models/block/orange_buried_petals.json new file mode 100644 index 000000000..a0e6ad46f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/orange_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/orange_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pink_buried_petals.json b/src/main/resources/assets/botania/models/block/pink_buried_petals.json new file mode 100644 index 000000000..62069c300 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pink_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/pink_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/purple_buried_petals.json b/src/main/resources/assets/botania/models/block/purple_buried_petals.json new file mode 100644 index 000000000..3184ccbb6 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/purple_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/purple_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_buried_petals.json b/src/main/resources/assets/botania/models/block/red_buried_petals.json new file mode 100644 index 000000000..669ba1267 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/red_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/red_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/scorched_grass.json b/src/main/resources/assets/botania/models/block/scorched_grass.json index e49201662..b4de531f3 100644 --- a/src/main/resources/assets/botania/models/block/scorched_grass.json +++ b/src/main/resources/assets/botania/models/block/scorched_grass.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "minecraft:blocks/dirt", + "bottom": "minecraft:block/dirt", "top": "botania:blocks/altgrass6", "side": "botania:blocks/altgrass7" } diff --git a/src/main/resources/assets/botania/models/block/teru_teru_bozu.json b/src/main/resources/assets/botania/models/block/teru_teru_bozu.json new file mode 100644 index 000000000..0d2e2ad7a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/teru_teru_bozu.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/white_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/vivid_grass.json b/src/main/resources/assets/botania/models/block/vivid_grass.json index f5d2a0852..740c0c784 100644 --- a/src/main/resources/assets/botania/models/block/vivid_grass.json +++ b/src/main/resources/assets/botania/models/block/vivid_grass.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "minecraft:blocks/dirt", + "bottom": "minecraft:block/dirt", "top": "botania:blocks/altgrass4", "side": "botania:blocks/altgrass5" } diff --git a/src/main/resources/assets/botania/models/block/white_buried_petals.json b/src/main/resources/assets/botania/models/block/white_buried_petals.json new file mode 100644 index 000000000..0d2e2ad7a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/white_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/white_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/yellow_buried_petals.json b/src/main/resources/assets/botania/models/block/yellow_buried_petals.json new file mode 100644 index 000000000..378086044 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/yellow_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/yellow_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_1.json b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_1.json index 968b50bf5..8cff7795c 100644 --- a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_1.json +++ b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/crystalbow", + "parent": "botania:item/crystal_bow", "textures": { "layer0": "botania:items/bow_crystal_pulling_1" } diff --git a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_2.json b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_2.json index bdbb1d2b1..f5e45475a 100644 --- a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_2.json +++ b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/crystalbow", + "parent": "botania:item/crystal_bow", "textures": { "layer0": "botania:items/bow_crystal_pulling_2" } diff --git a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_3.json b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_3.json index b69971d9a..7e608031c 100644 --- a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_3.json +++ b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_3.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/crystalbow", + "parent": "botania:item/crystal_bow", "textures": { "layer0": "botania:items/bow_crystal_pulling_3" } diff --git a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_4.json b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_4.json index 4c0e83942..5e46e4eb1 100644 --- a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_4.json +++ b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_4.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/crystalbow", + "parent": "botania:item/crystal_bow", "textures": { "layer0": "botania:items/bow_crystal_pulling_4" } diff --git a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_5.json b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_5.json index 4753965d9..94f93aabf 100644 --- a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_5.json +++ b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_5.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/crystalbow", + "parent": "botania:item/crystal_bow", "textures": { "layer0": "botania:items/bow_crystal_pulling_5" } diff --git a/src/main/resources/assets/botania/models/item/gaia_head.json b/src/main/resources/assets/botania/models/item/gaia_head.json index b7da3301d..d29905eca 100644 --- a/src/main/resources/assets/botania/models/item/gaia_head.json +++ b/src/main/resources/assets/botania/models/item/gaia_head.json @@ -1,35 +1,3 @@ { - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 3, -0.75, 0 ], - "scale": [ 1, 1, 1 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 225, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } + "parent": "item/template_skull" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pylon_gaia.json b/src/main/resources/assets/botania/models/item/gaia_pylon.json similarity index 100% rename from src/main/resources/assets/botania/models/item/pylon_gaia.json rename to src/main/resources/assets/botania/models/item/gaia_pylon.json diff --git a/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_1.json b/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_1.json index 17b3e9fc3..11243344b 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_1.json +++ b/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/livingwoodbow", + "parent": "botania:item/livingwood_bow", "textures": { "layer0": "botania:items/bow_livingwood_pulling_1" } diff --git a/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_2.json b/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_2.json index bb572143f..d9de27cc7 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_2.json +++ b/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/livingwoodbow", + "parent": "botania:item/livingwood_bow", "textures": { "layer0": "botania:items/bow_livingwood_pulling_2" } diff --git a/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_3.json b/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_3.json index 09c51db68..0e0724654 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_3.json +++ b/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_3.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/livingwoodbow", + "parent": "botania:item/livingwood_bow", "textures": { "layer0": "botania:items/bow_livingwood_pulling_3" } diff --git a/src/main/resources/assets/botania/models/item/pylon_mana.json b/src/main/resources/assets/botania/models/item/mana_pylon.json similarity index 100% rename from src/main/resources/assets/botania/models/item/pylon_mana.json rename to src/main/resources/assets/botania/models/item/mana_pylon.json diff --git a/src/main/resources/assets/botania/models/item/pylon_natura.json b/src/main/resources/assets/botania/models/item/natura_pylon.json similarity index 100% rename from src/main/resources/assets/botania/models/item/pylon_natura.json rename to src/main/resources/assets/botania/models/item/natura_pylon.json diff --git a/src/main/resources/assets/botania/textures/gui/baublebox.png b/src/main/resources/assets/botania/textures/gui/bauble_box.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/baublebox.png rename to src/main/resources/assets/botania/textures/gui/bauble_box.png diff --git a/src/main/resources/assets/botania/textures/gui/craftingoverlay.png b/src/main/resources/assets/botania/textures/gui/crafting_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/craftingoverlay.png rename to src/main/resources/assets/botania/textures/gui/crafting_overlay.png diff --git a/src/main/resources/assets/botania/textures/gui/elventradeoverlay.png b/src/main/resources/assets/botania/textures/gui/elven_trade_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/elventradeoverlay.png rename to src/main/resources/assets/botania/textures/gui/elven_trade_overlay.png diff --git a/src/main/resources/assets/botania/textures/gui/flowerbag.png b/src/main/resources/assets/botania/textures/gui/flower_bag.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/flowerbag.png rename to src/main/resources/assets/botania/textures/gui/flower_bag.png diff --git a/src/main/resources/assets/botania/textures/gui/hudicons.png b/src/main/resources/assets/botania/textures/gui/hud_icons.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/hudicons.png rename to src/main/resources/assets/botania/textures/gui/hud_icons.png diff --git a/src/main/resources/assets/botania/textures/gui/manahud.png b/src/main/resources/assets/botania/textures/gui/mana_hud.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/manahud.png rename to src/main/resources/assets/botania/textures/gui/mana_hud.png diff --git a/src/main/resources/assets/botania/textures/gui/manainfusionoverlay.png b/src/main/resources/assets/botania/textures/gui/mana_infusion_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/manainfusionoverlay.png rename to src/main/resources/assets/botania/textures/gui/mana_infusion_overlay.png diff --git a/src/main/resources/assets/botania/textures/gui/multiblockoverlay.png b/src/main/resources/assets/botania/textures/gui/multiblock_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/multiblockoverlay.png rename to src/main/resources/assets/botania/textures/gui/multiblock_overlay.png diff --git a/src/main/resources/assets/botania/textures/gui/neiblank.png b/src/main/resources/assets/botania/textures/gui/nei_blank.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/neiblank.png rename to src/main/resources/assets/botania/textures/gui/nei_blank.png diff --git a/src/main/resources/assets/botania/textures/gui/neibrewery.png b/src/main/resources/assets/botania/textures/gui/nei_brewery.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/neibrewery.png rename to src/main/resources/assets/botania/textures/gui/nei_brewery.png diff --git a/src/main/resources/assets/botania/textures/gui/petaloverlay.png b/src/main/resources/assets/botania/textures/gui/petal_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/petaloverlay.png rename to src/main/resources/assets/botania/textures/gui/petal_overlay.png diff --git a/src/main/resources/assets/botania/textures/gui/puredaisyoverlay.png b/src/main/resources/assets/botania/textures/gui/pure_daisy_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/puredaisyoverlay.png rename to src/main/resources/assets/botania/textures/gui/pure_daisy_overlay.png diff --git a/src/main/resources/assets/botania/textures/gui/sheddingoverlay.png b/src/main/resources/assets/botania/textures/gui/shedding_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/sheddingoverlay.png rename to src/main/resources/assets/botania/textures/gui/shedding_overlay.png diff --git a/src/main/resources/assets/botania/textures/gui/terrasteeloverlay.png b/src/main/resources/assets/botania/textures/gui/terrasteel_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/terrasteeloverlay.png rename to src/main/resources/assets/botania/textures/gui/terrasteel_overlay.png diff --git a/src/main/resources/assets/botania/textures/model/teruterubozu.png b/src/main/resources/assets/botania/textures/model/teru_teru_bozu.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/teruterubozu.png rename to src/main/resources/assets/botania/textures/model/teru_teru_bozu.png diff --git a/src/main/resources/assets/botania/textures/model/teruterubozu_halloween.png b/src/main/resources/assets/botania/textures/model/teru_teru_bozu_halloween.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/teruterubozu_halloween.png rename to src/main/resources/assets/botania/textures/model/teru_teru_bozu_halloween.png