diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 4c5aba78a..41be77176 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -27,10 +27,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; -import vazkii.botania.client.model.LexiconModel; import vazkii.botania.client.model.PlatformModel; import vazkii.botania.client.model.PylonItemModel; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.integration.buildcraft.TriggerManaLevel; import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; @@ -99,9 +97,6 @@ public class MiscellaneousIcons { // Platforms evt.modelRegistry.putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); - - // Lexicon - evt.modelRegistry.putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel()); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 994cc85d1..06d014753 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -472,10 +472,6 @@ public final class ModelHandler { registerItemModel(pestleAndMortar); registerItemModel(blackLotus); registerItemModel(blackLotus, 1); - - ModelLoader.registerItemVariants(lexicon, - new ModelResourceLocation("botania:lexicon_default", "inventory"), - new ModelResourceLocation("botania:lexicon_firstperson", "inventory")); registerItemModel(lexicon); registerItemModel(manasteelHelm); diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java deleted file mode 100644 index c5830b0aa..000000000 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ /dev/null @@ -1,115 +0,0 @@ -package vazkii.botania.client.model; - -import com.google.common.collect.ImmutableMap; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.IFlexibleBakedModel; -import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.IModelState; -import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.TRSRTransformation; -import net.minecraftforge.client.model.animation.Animation; -import net.minecraftforge.client.model.animation.Event; -import net.minecraftforge.common.model.animation.IAnimationStateMachine; -import net.minecraftforge.fml.common.FMLLog; -import org.apache.commons.lang3.tuple.Pair; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.common.core.handler.ConfigHandler; - -import javax.vecmath.Matrix4f; -import java.io.IOException; -import java.util.List; -import java.util.Map; - -/** - * This class handles choosing between the lexicon's default model and the special first person one - */ -public class LexiconModel implements IPerspectiveAwareModel { - - private static final Map missingTransforms; - - static { - ImmutableMap.Builder builder = ImmutableMap.builder(); - for (ItemCameraTransforms.TransformType t :ItemCameraTransforms.TransformType.values()) { - builder.put(t, TRSRTransformation.identity()); - } - missingTransforms = builder.build(); - } - - private IFlexibleBakedModel normalModel; - private Map normalModelTransforms; - - private IModel specialModel; - private Map specialModelTransforms; - - private IAnimationStateMachine asm; - - private boolean hasInit = false; - - private void initModels() { - if(hasInit) - return; - - normalModel = new IFlexibleBakedModel.Wrapper(Minecraft.getMinecraft() - .getRenderItem().getItemModelMesher().getModelManager() - .getModel(new ModelResourceLocation("botania:lexicon_default", "inventory")), Attributes.DEFAULT_BAKED_FORMAT); - - asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/item/lexicon_firstperson.json"), ImmutableMap.of()); - - try { - normalModelTransforms = IPerspectiveAwareModel.MapWrapper.getTransforms(ModelLoaderRegistry.getModel(new ModelResourceLocation("botania:lexicon_default", "inventory")).getDefaultState()); - specialModel = ModelLoaderRegistry.getModel(new ModelResourceLocation("botania:lexicon_firstperson", "inventory")); - specialModelTransforms = IPerspectiveAwareModel.MapWrapper.getTransforms(specialModel.getDefaultState()); - } catch (IOException ex) { - FMLLog.warning("[Botania] Lexicon model couldn't be loaded"); - if(normalModelTransforms == null) - normalModelTransforms = missingTransforms; - if(specialModel == null) - specialModel = ModelLoaderRegistry.getMissingModel(); - if(specialModelTransforms == null) - specialModelTransforms = missingTransforms; - } - - hasInit = true; - } - - @SuppressWarnings("deprecation") - @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - initModels(); - if (ConfigHandler.lexicon3dModel && cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON) { - //System.out.println("m8"); - float time = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 20F; - - Pair> animate = asm.apply(time); - IFlexibleBakedModel baked = specialModel.bake(animate.getLeft(), Attributes.DEFAULT_BAKED_FORMAT, ModelLoader.defaultTextureGetter()); - - TRSRTransformation transform = specialModelTransforms.get(cameraTransformType) == null ? TRSRTransformation.identity() : specialModelTransforms.get(cameraTransformType); - return Pair.of(baked, transform.getMatrix()); - - } else { - TRSRTransformation transform = normalModelTransforms.get(cameraTransformType) == null ? TRSRTransformation.identity() : normalModelTransforms.get(cameraTransformType); - return Pair.of(normalModel, transform.getMatrix()); - } - } - - @Override public VertexFormat getFormat() { return Attributes.DEFAULT_BAKED_FORMAT; } - @Override public List getFaceQuads(EnumFacing e) { initModels(); return normalModel.getFaceQuads(e); } - @Override public List getGeneralQuads() { initModels(); return normalModel.getGeneralQuads(); } - @Override public boolean isAmbientOcclusion() { initModels(); return normalModel.isAmbientOcclusion(); } - @Override public boolean isGui3d() { initModels(); return normalModel.isGui3d(); } - @Override public boolean isBuiltInRenderer() { initModels(); return normalModel.isBuiltInRenderer(); } - @Override public TextureAtlasSprite getParticleTexture() { initModels(); return normalModel.getParticleTexture(); } - @SuppressWarnings("deprecation") - @Override public ItemCameraTransforms getItemCameraTransforms() { initModels(); return normalModel.getItemCameraTransforms(); } -} diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index e0d607cbb..649ce3d37 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.mana; +import java.awt.*; import java.util.ArrayList; import java.util.List; @@ -33,6 +34,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; @@ -41,6 +44,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockMod; @@ -181,6 +185,17 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return 2; } + @Override + @SideOnly(Side.CLIENT) + public int getRenderColor(IBlockState state) { + if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { + float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; + return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); + } else { + return 16777215; + } + } + @Override public boolean hasComparatorInputOverride() { return true; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 86e5ce2f4..3b4b746f7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.mana; +import java.awt.*; import java.util.List; import java.util.Random; @@ -33,6 +34,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; @@ -41,9 +44,11 @@ import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; +import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -87,7 +92,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); return super.setUnlocalizedName(par1Str); } @@ -139,6 +144,15 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return false; } + @Override + @SideOnly(Side.CLIENT) + public int getRenderColor(IBlockState state) { + if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) + return super.getRenderColor(state); + float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; + return Color.getHSBColor((time * 5) % 360 / 360F, 0.4F, 0.9F).hashCode(); + } + @Override public int getRenderType() { return 2; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 17090a3f5..b1c430e8b 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -10,19 +10,14 @@ */ package vazkii.botania.common.item.block; -import java.awt.*; import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.state.enums.PoolVariant; -import vazkii.botania.client.core.handler.ClientTickHandler; -public class ItemBlockPool extends ItemBlockWithMetadataAndName { +public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { public ItemBlockPool(Block par2Block) { super(par2Block); @@ -35,15 +30,4 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName { par3List.add(StatCollector.translateToLocal("botaniamisc.creativePool" + i)); } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int renderPass) { - if (stack.getItemDamage() == PoolVariant.FABULOUS.ordinal() && renderPass == 0) { - float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); - } else { - return 16777215; - } - } - } diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index 5c62b19bc..8e7938fd3 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -2,7 +2,12 @@ "forge_marker": 1, "defaults": { "model": "botania:pool_tinted", - "transform": "forge:default-block" + "transform": { + "thirdperson": { + "translation": [ 0, 0.09375, -0.171875], + "rotation": [{"x": 10}, {"y": -45}, {"z": 0}] + } + } }, "variants": { "variant": { diff --git a/src/main/resources/assets/botania/blockstates/spreader.json b/src/main/resources/assets/botania/blockstates/spreader.json index 31cbca0ca..f8564bf6e 100644 --- a/src/main/resources/assets/botania/blockstates/spreader.json +++ b/src/main/resources/assets/botania/blockstates/spreader.json @@ -2,36 +2,41 @@ "forge_marker": 1, "defaults": { "model": "botania:spreader", - "transform": "forge:default-block" + "transform": { + "thirdperson": { + "translation": [ 0, 0.09375, -0.171875], + "rotation": [{"x": 10}, {"y": -45}, {"z": 170}] + } + } }, "variants": { "variant": { "mana": { "textures": { - "all": "botania:placeholder", - "side": "botania:placeholder", - "inside": "botania:placeholder" + "inside": "botania:model/spreader_item/mana_inside", + "side": "botania:model/spreader_item/mana_side", + "material": "botania:blocks/livingwood0" } }, "redstone": { "textures": { - "all": "botania:placeholder", - "side": "botania:placeholder", - "inside": "botania:placeholder" + "inside": "botania:model/spreader_item/redstone_inside", + "side": "botania:model/spreader_item/redstone_side", + "material": "botania:model/spreader_item/redstone_material" } }, "elven": { "textures": { - "all": "botania:placeholder", - "side": "botania:placeholder", - "inside": "botania:placeholder" + "inside": "botania:model/spreader_item/elven_inside", + "side": "botania:model/spreader_item/elven_side", + "material": "botania:blocks/dreamwood0" } }, "gaia": { "textures": { - "all": "botania:placeholder", - "side": "botania:placeholder", - "inside": "botania:placeholder" + "inside": "botania:model/spreader_item/gaia_inside", + "side": "botania:model/spreader_item/gaia_side", + "material": "botania:blocks/dreamwood0" } } } diff --git a/src/main/resources/assets/botania/models/block/spreader.json b/src/main/resources/assets/botania/models/block/spreader.json index 1e01caecf..93cc92e43 100644 --- a/src/main/resources/assets/botania/models/block/spreader.json +++ b/src/main/resources/assets/botania/models/block/spreader.json @@ -1,137 +1,119 @@ { "textures": { - "particle": "#all" + "particle": "#material" }, "elements": [ { - "name": "cubeSide4", - "from": [14, 1, 2], - "to": [15, 14, 15], + "name": "inside", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 11.0, 10.0, 11.0 ], "faces": { - "down": {"uv": [0.5, 0, 0.75, 3.25], "texture": "#side"}, - "up": {"uv": [0.25, 0, 0.5, 3.25], "texture": "#side"}, - "north": {"uv": [3.75, 3.25, 7, 6.5], "texture": "#side"}, - "south": {"uv": [0.25, 3.25, 3.5, 6.5], "texture": "#side"}, - "west": {"uv": [0, 3.25, 0.25, 6.5], "texture": "#side"}, - "east": {"uv": [3.5, 3.25, 3.75, 6.5], "texture": "#side"} + "north": { "texture": "#inside", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, + "east": { "texture": "#inside", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, + "south": { "texture": "#inside", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, + "west": { "texture": "#inside", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, + "up": { "texture": "#inside", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, + "down": { "texture": "#inside", "uv": [ 2.0, 2.0, 14.0, 14.0 ] } } }, { - "name": "cubeInside", - "from": [5, 4, 5], - "to": [11, 10, 11], + "name": "bottom", + "from": [ 1.0, 0.0, 1.0 ], + "to": [ 15.0, 1.0, 15.0 ], "faces": { - "down": {"uv": [10.5, 4.25, 12, 5.75], "texture": "#inside"}, - "up": {"uv": [9, 4.25, 10.5, 5.75], "texture": "#inside"}, - "north": {"uv": [12, 5.75, 13.5, 7.25], "texture": "#inside"}, - "south": {"uv": [9, 5.75, 10.5, 7.25], "texture": "#inside"}, - "west": {"uv": [7.5, 5.75, 9, 7.25], "texture": "#inside"}, - "east": {"uv": [10.5, 5.75, 12, 7.25], "texture": "#inside"} + "north": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 2.0 ], "tintindex": 0 }, + "east": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 2.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 2.0 ], "tintindex": 0 }, + "west": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 2.0 ], "tintindex": 0 }, + "up": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 15.0 ], "tintindex": 0 }, + "down": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 15.0 ], "tintindex": 0 } } }, { - "name": "cubeHole2", - "from": [2, 1, 14], - "to": [6, 13, 15], + "name": "back", + "from": [ 1.0, 1.0, 14.0 ], + "to": [ 15.0, 13.0, 15.0 ], "faces": { - "down": {"uv": [2, 0, 3, 0.25], "texture": "#top"}, - "up": {"uv": [1, 0, 2, 0.25], "texture": "#top"}, - "north": {"uv": [2.25, 0.25, 2.5, 3.25], "texture": "#top"}, - "south": {"uv": [1, 0.25, 1.25, 3.25], "texture": "#top"}, - "west": {"uv": [0, 0.25, 1, 3.25], "texture": "#top"}, - "east": {"uv": [1.25, 0.25, 2.25, 3.25], "texture": "#top"} + "north": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 12.0 ], "tintindex": 0 }, + "east": { "texture": "#material", "uv": [ 0.0, 0.0, 1.0, 12.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 12.0 ], "tintindex": 0 }, + "west": { "texture": "#material", "uv": [ 0.0, 0.0, 1.0, 12.0 ], "tintindex": 0 }, + "up": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 1.0 ], "tintindex": 0 }, + "down": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 1.0 ], "tintindex": 0 } } }, { - "name": "cubeSide5", - "from": [2, 13, 2], - "to": [14, 14, 15], + "name": "top", + "from": [ 1.0, 13.0, 1.0 ], + "to": [ 15.0, 14.0, 15.0 ], "faces": { - "down": {"uv": [6, 0, 9, 3.25], "texture": "#side"}, - "up": {"uv": [3, 0, 6, 3.25], "texture": "#side"}, - "north": {"uv": [9.25, 3.25, 12.5, 3.5], "texture": "#side"}, - "south": {"uv": [3, 3.25, 6.25, 3.5], "texture": "#side"}, - "west": {"uv": [0, 3.25, 3, 3.5], "texture": "#side"}, - "east": {"uv": [6.25, 3.25, 9.25, 3.5], "texture": "#side"} + "north": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 1.0 ], "tintindex": 0 }, + "east": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 1.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 1.0 ], "tintindex": 0 }, + "west": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 1.0 ], "tintindex": 0 }, + "up": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 15.0 ], "tintindex": 0 }, + "down": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 15.0 ], "tintindex": 0 } } }, { - "name": "cubeHole4", - "from": [6, 9, 14], - "to": [10, 13, 15], + "name": "west", + "from": [ 1.0, 1.0, 2.0 ], + "to": [ 2.0, 13.0, 14.0 ], "faces": { - "down": {"uv": [2, 0, 3, 0.25], "texture": "#top"}, - "up": {"uv": [1, 0, 2, 0.25], "texture": "#top"}, - "north": {"uv": [2.25, 0.25, 2.5, 1.25], "texture": "#top"}, - "south": {"uv": [1, 0.25, 1.25, 1.25], "texture": "#top"}, - "west": {"uv": [0, 0.25, 1, 1.25], "texture": "#top"}, - "east": {"uv": [1.25, 0.25, 2.25, 1.25], "texture": "#top"} + "east": { "texture": "#side", "uv": [ 2.0, 2.0, 14.0, 14.0 ], "tintindex": 0 }, + "west": { "texture": "#side", "uv": [ 2.0, 2.0, 14.0, 14.0 ], "tintindex": 0 } } }, { - "name": "cubeHole3", - "from": [6, 1, 14], - "to": [10, 5, 15], + "name": "east", + "from": [ 14.0, 1.0, 2.0 ], + "to": [ 15.0, 13.0, 14.0 ], "faces": { - "down": {"uv": [2, 0, 3, 0.25], "texture": "#top"}, - "up": {"uv": [1, 0, 2, 0.25], "texture": "#top"}, - "north": {"uv": [2.25, 0.25, 2.5, 1.25], "texture": "#top"}, - "south": {"uv": [1, 0.25, 1.25, 1.25], "texture": "#top"}, - "west": {"uv": [0, 0.25, 1, 1.25], "texture": "#top"}, - "east": {"uv": [1.25, 0.25, 2.25, 1.25], "texture": "#top"} + "east": { "texture": "#side", "uv": [ 2.0, 2.0, 14.0, 14.0 ], "tintindex": 0 }, + "west": { "texture": "#side", "uv": [ 2.0, 2.0, 14.0, 14.0 ], "tintindex": 0 } } }, { - "name": "cubeSide1", - "from": [1, 0, 1], - "to": [15, 1, 15], + "name": "front_bottom", + "from": [ 6.0, 1.0, 1.0 ], + "to": [ 10.0, 5.0, 2.0 ], "faces": { - "down": {"uv": [7, 0, 10.5, 3.5], "texture": "#side"}, - "up": {"uv": [3.5, 0, 7, 3.5], "texture": "#side"}, - "north": {"uv": [10.5, 3.5, 14, 3.75], "texture": "#side"}, - "south": {"uv": [3.5, 3.5, 7, 3.75], "texture": "#side"}, - "west": {"uv": [0, 3.5, 3.5, 3.75], "texture": "#side"}, - "east": {"uv": [7, 3.5, 10.5, 3.75], "texture": "#side"} + "north": { "texture": "#material", "uv": [ 0.0, 0.0, 4.0, 4.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 0.0, 0.0, 4.0, 4.0 ], "tintindex": 0 }, + "up": { "texture": "#material", "uv": [ 0.0, 0.0, 4.0, 1.0 ], "tintindex": 0 } } }, { - "name": "cubeSide3", - "from": [1, 1, 2], - "to": [2, 14, 15], + "name": "front_top", + "from": [ 6.0, 9.0, 1.0 ], + "to": [ 10.0, 13.0, 2.0 ], "faces": { - "down": {"uv": [0.5, 0, 0.75, 3.25], "texture": "#side"}, - "up": {"uv": [0.25, 0, 0.5, 3.25], "texture": "#side"}, - "north": {"uv": [3.75, 3.25, 7, 6.5], "texture": "#side"}, - "south": {"uv": [0.25, 3.25, 3.5, 6.5], "texture": "#side"}, - "west": {"uv": [0, 3.25, 0.25, 6.5], "texture": "#side"}, - "east": {"uv": [3.5, 3.25, 3.75, 6.5], "texture": "#side"} + "north": { "texture": "#material", "uv": [ 0.0, 0.0, 4.0, 4.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 0.0, 0.0, 4.0, 4.0 ], "tintindex": 0 }, + "down": { "texture": "#material", "uv": [ 0.0, 0.0, 4.0, 1.0 ], "tintindex": 0 } } }, { - "name": "cubeHole1", - "from": [10, 1, 14], - "to": [14, 13, 15], + "name": "front_left", + "from": [ 1.0, 1.0, 1.0 ], + "to": [ 6.0, 13.0, 2.0 ], "faces": { - "down": {"uv": [2, 0, 3, 0.25], "texture": "#top"}, - "up": {"uv": [1, 0, 2, 0.25], "texture": "#top"}, - "north": {"uv": [2.25, 0.25, 2.5, 3.25], "texture": "#top"}, - "south": {"uv": [1, 0.25, 1.25, 3.25], "texture": "#top"}, - "west": {"uv": [0, 0.25, 1, 3.25], "texture": "#top"}, - "east": {"uv": [1.25, 0.25, 2.25, 3.25], "texture": "#top"} + "north": { "texture": "#material", "uv": [ 1.0, 1.0, 5.0, 13.0 ], "tintindex": 0 }, + "east": { "texture": "#material", "uv": [ 1.0, 1.0, 2.0, 13.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 1.0, 1.0, 5.0, 13.0 ], "tintindex": 0 }, + "west": { "texture": "#material", "uv": [ 1.0, 1.0, 2.0, 13.0 ], "tintindex": 0 } } }, { - "name": "cubeSide2", - "from": [1, 1, 1], - "to": [15, 14, 2], + "name": "front_right", + "from": [ 10.0, 1.0, 1.0 ], + "to": [ 15.0, 13.0, 2.0 ], "faces": { - "down": {"uv": [7, 0, 10.5, 0.25], "texture": "#side"}, - "up": {"uv": [3.5, 0, 7, 0.25], "texture": "#side"}, - "north": {"uv": [7.25, 0.25, 7.5, 3.5], "texture": "#side"}, - "south": {"uv": [3.5, 0.25, 3.75, 3.5], "texture": "#side"}, - "west": {"uv": [0, 0.25, 3.5, 3.5], "texture": "#side"}, - "east": {"uv": [3.75, 0.25, 7.25, 3.5], "texture": "#side"} + "north": { "texture": "#material", "uv": [ 12.0, 1.0, 16.0, 13.0 ], "tintindex": 0 }, + "east": { "texture": "#material", "uv": [ 15.0, 1.0, 16.0, 13.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 12.0, 1.0, 16.0, 13.0 ], "tintindex": 0 }, + "west": { "texture": "#material", "uv": [ 15.0, 1.0, 16.0, 13.0 ], "tintindex": 0 } } } ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lexicon_default.json b/src/main/resources/assets/botania/models/item/lexicon.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lexicon_default.json rename to src/main/resources/assets/botania/models/item/lexicon.json diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png new file mode 100644 index 000000000..df635c5cc Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/elven_side.png b/src/main/resources/assets/botania/textures/model/spreader_item/elven_side.png new file mode 100644 index 000000000..ea286b623 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_item/elven_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png new file mode 100644 index 000000000..df635c5cc Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/gaia_side.png b/src/main/resources/assets/botania/textures/model/spreader_item/gaia_side.png new file mode 100644 index 000000000..ea286b623 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_item/gaia_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png new file mode 100644 index 000000000..79dcd775b Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/mana_side.png b/src/main/resources/assets/botania/textures/model/spreader_item/mana_side.png new file mode 100644 index 000000000..a40186110 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_item/mana_side.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png new file mode 100644 index 000000000..ea9c2889a Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/redstone_material.png b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_material.png new file mode 100644 index 000000000..4db4ca424 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_material.png differ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/redstone_side.png b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_side.png new file mode 100644 index 000000000..593f1b1c3 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_side.png differ