diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index c44ea34ea..e9281f5cb 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -98,6 +98,7 @@ public class Forestry { PluginManager.runPreInit(); + Proxies.render.registerLoaders(); Proxies.render.registerModels(); } diff --git a/src/main/java/forestry/apiculture/blocks/BlockTypeApiculture.java b/src/main/java/forestry/apiculture/blocks/BlockTypeApiculture.java index f407a7325..d3f5e56ec 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockTypeApiculture.java +++ b/src/main/java/forestry/apiculture/blocks/BlockTypeApiculture.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.apiculture.blocks; +import java.util.Locale; + import javax.annotation.Nonnull; import forestry.apiculture.tiles.TileApiary; @@ -40,6 +42,6 @@ public enum BlockTypeApiculture implements IBlockType { @Override public String getName() { - return name(); + return getMachineProperties().getName(); } } diff --git a/src/main/java/forestry/apiculture/blocks/BlockTypeApicultureTesr.java b/src/main/java/forestry/apiculture/blocks/BlockTypeApicultureTesr.java index 619633a58..796ed3254 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockTypeApicultureTesr.java +++ b/src/main/java/forestry/apiculture/blocks/BlockTypeApicultureTesr.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.apiculture.blocks; +import java.util.Locale; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -48,6 +50,6 @@ public enum BlockTypeApicultureTesr implements IBlockTypeTesr { @Override public String getName() { - return name(); + return getMachineProperties().getName(); } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java index 7f7fe05da..af93fc15d 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java @@ -123,9 +123,7 @@ public class BlockArbFence extends BlockFence implements IWoodTyped, IItemModelR @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - if (!fireproof) { - manager.registerVariant(item, ItemBlockWood.getVariants(this)); - } + manager.registerVariant(item, ItemBlockWood.getVariants(this)); manager.registerItemModel(item, new WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java b/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java index 1305ea0a2..86401cd6e 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java @@ -129,9 +129,7 @@ public class BlockArbStairs extends BlockStairs implements IWoodTyped, IItemMode @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - if (!fireproof) { - manager.registerVariant(item, ItemBlockWood.getVariants(this)); - } + manager.registerVariant(item, ItemBlockWood.getVariants(this)); manager.registerItemModel(item, new WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockFruitPod.java b/src/main/java/forestry/arboriculture/blocks/BlockFruitPod.java index 938a468bf..232bbe156 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockFruitPod.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockFruitPod.java @@ -33,7 +33,7 @@ import forestry.api.core.IStateMapperRegister; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.arboriculture.blocks.property.PropertyFruit; -import forestry.arboriculture.render.StateMapperFluidPod; +import forestry.arboriculture.render.FluidPodStateMapper; import forestry.arboriculture.tiles.TileFruitPod; import forestry.core.blocks.propertys.UnlistedBlockAccess; import forestry.core.blocks.propertys.UnlistedBlockPos; @@ -137,7 +137,7 @@ public class BlockFruitPod extends BlockCocoa implements IStateMapperRegister { @SideOnly(Side.CLIENT) @Override public void registerStateMapper() { - Proxies.render.registerStateMapper(this, new StateMapperFluidPod()); + Proxies.render.registerStateMapper(this, new FluidPodStateMapper()); } /* IGrowable */ diff --git a/src/main/java/forestry/arboriculture/blocks/BlockSapling.java b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java index e699ad1e2..21e868ee6 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockSapling.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java @@ -20,6 +20,7 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -30,18 +31,22 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.TreeManager; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; import forestry.arboriculture.blocks.property.PropertyTree; -import forestry.arboriculture.render.StateMapperSapling; +import forestry.arboriculture.render.SaplingStateMapper; import forestry.arboriculture.tiles.TileSapling; import forestry.core.proxy.Proxies; import forestry.core.tiles.TileUtil; import forestry.core.utils.ItemStackUtil; -public class BlockSapling extends BlockTreeContainer implements IGrowable, IStateMapperRegister { +public class BlockSapling extends BlockTreeContainer implements IGrowable, IStateMapperRegister, IItemModelRegister { /* PROPERTYS */ public static final PropertyTree TREE = new PropertyTree("tree"); @@ -109,7 +114,14 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable, IStat @Override public void registerStateMapper() { - Proxies.render.registerStateMapper(this, new StateMapperSapling()); + Proxies.render.registerStateMapper(this, new SaplingStateMapper()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModel(Item item, IModelManager manager) { + //To delete the error message + manager.registerItemModel(item, 0, "germlings/sapling.treeLarch"); } /* PLANTING */ diff --git a/src/main/java/forestry/arboriculture/blocks/BlockSlab.java b/src/main/java/forestry/arboriculture/blocks/BlockSlab.java index 880d72801..ca9343652 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockSlab.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockSlab.java @@ -115,9 +115,7 @@ public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyp @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - if (!fireproof) { - manager.registerVariant(item, ItemBlockWood.getVariants(this)); - } + manager.registerVariant(item, ItemBlockWood.getVariants(this)); manager.registerItemModel(item, new WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockTypeArboricultureTesr.java b/src/main/java/forestry/arboriculture/blocks/BlockTypeArboricultureTesr.java index 0f89eec68..292079146 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockTypeArboricultureTesr.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockTypeArboricultureTesr.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.arboriculture.blocks; +import java.util.Locale; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -48,6 +50,6 @@ public enum BlockTypeArboricultureTesr implements IBlockTypeTesr { @Override public String getName() { - return name(); + return getMachineProperties().getName(); } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockWood.java b/src/main/java/forestry/arboriculture/blocks/BlockWood.java index 17330e634..442796566 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockWood.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockWood.java @@ -91,9 +91,7 @@ public abstract class BlockWood extends Block implements ITileEntityProvider, II @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - if (!fireproof) { - manager.registerVariant(item, ItemBlockWood.getVariants(this)); - } + manager.registerVariant(item, ItemBlockWood.getVariants(this)); manager.registerItemModel(item, new WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/render/StateMapperFluidPod.java b/src/main/java/forestry/arboriculture/render/FluidPodStateMapper.java similarity index 83% rename from src/main/java/forestry/arboriculture/render/StateMapperFluidPod.java rename to src/main/java/forestry/arboriculture/render/FluidPodStateMapper.java index 9cf322739..a2cc8c132 100644 --- a/src/main/java/forestry/arboriculture/render/StateMapperFluidPod.java +++ b/src/main/java/forestry/arboriculture/render/FluidPodStateMapper.java @@ -8,7 +8,7 @@ import forestry.api.arboriculture.IAlleleFruit; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.arboriculture.blocks.BlockFruitPod; -import forestry.core.render.StateMapperForestry; +import forestry.core.render.ForestryStateMapper; import net.minecraft.block.Block; import net.minecraft.block.BlockCocoa; import net.minecraft.block.BlockDirectional; @@ -19,7 +19,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class StateMapperFluidPod extends StateMapperForestry{ +public class FluidPodStateMapper extends ForestryStateMapper{ private final Map mapStateModelLocations = Maps.newLinkedHashMap(); @@ -30,10 +30,11 @@ public class StateMapperFluidPod extends StateMapperForestry{ for (int age = 0;age < BlockCocoa.AGE.getAllowedValues().size();age++){ for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { if (allele instanceof IAlleleFruit) { - if(((IAlleleFruit) allele).getModelName() != null){ - IBlockState state = block.getDefaultState().withProperty(BlockFruitPod.FRUIT, (IAlleleFruit)allele).withProperty(BlockDirectional.FACING, facing).withProperty(BlockCocoa.AGE, age); + IAlleleFruit fruit = (IAlleleFruit) allele; + if(fruit.getModelName() != null){ + IBlockState state = block.getDefaultState().withProperty(BlockFruitPod.FRUIT, fruit).withProperty(BlockDirectional.FACING, facing).withProperty(BlockCocoa.AGE, age); LinkedHashMap linkedhashmap = Maps.newLinkedHashMap(state.getProperties()); - String modID = ((IAlleleFruit) allele).getModID(); + String modID = fruit.getModID(); if(modID == null){ modID = "forestry"; } diff --git a/src/main/java/forestry/arboriculture/render/StateMapperSapling.java b/src/main/java/forestry/arboriculture/render/SaplingStateMapper.java similarity index 78% rename from src/main/java/forestry/arboriculture/render/StateMapperSapling.java rename to src/main/java/forestry/arboriculture/render/SaplingStateMapper.java index 55657a1f8..159b6de20 100644 --- a/src/main/java/forestry/arboriculture/render/StateMapperSapling.java +++ b/src/main/java/forestry/arboriculture/render/SaplingStateMapper.java @@ -9,7 +9,7 @@ import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.arboriculture.blocks.BlockSapling; -import forestry.core.render.StateMapperForestry; +import forestry.core.render.ForestryStateMapper; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.model.ModelResourceLocation; @@ -17,19 +17,20 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class StateMapperSapling extends StateMapperForestry { +public class SaplingStateMapper extends ForestryStateMapper { @Override public Map putStateModelLocations(Block block) { for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { if (allele instanceof IAlleleTreeSpecies) { - IBlockState state = block.getDefaultState().withProperty(BlockSapling.TREE, (IAlleleTreeSpecies)allele); + IAlleleTreeSpecies tree = (IAlleleTreeSpecies)allele; + IBlockState state = block.getDefaultState().withProperty(BlockSapling.TREE, tree); LinkedHashMap linkedhashmap = Maps.newLinkedHashMap(state.getProperties()); - String modID = ((IAlleleTreeSpecies) allele).getModID(); + String modID = tree.getModID(); if(modID == null){ modID = "forestry"; } - String s = String.format("%s:%s",((IAlleleTreeSpecies) allele).getModID(), "germlings"); + String s = String.format("%s:%s", modID, "germlings"); mapStateModelLocations.put(state, new ModelResourceLocation(s, getPropertyString(linkedhashmap))); } } diff --git a/src/main/java/forestry/core/blocks/BlockBase.java b/src/main/java/forestry/core/blocks/BlockBase.java index 25bc8bd7e..105b02e8f 100644 --- a/src/main/java/forestry/core/blocks/BlockBase.java +++ b/src/main/java/forestry/core/blocks/BlockBase.java @@ -47,7 +47,7 @@ import forestry.core.access.IAccessHandler; import forestry.core.circuits.ISocketable; import forestry.core.fluids.FluidHelper; import forestry.core.proxy.Proxies; -import forestry.core.render.StateMapperMachine; +import forestry.core.render.MachineStateMapper; import forestry.core.tiles.TileBase; import forestry.core.tiles.TileForestry; import forestry.core.tiles.TileUtil; @@ -56,24 +56,24 @@ import forestry.core.utils.PlayerUtil; import jline.internal.Log; -public class BlockBase & IBlockType & IStringSerializable> extends BlockForestry implements IItemModelRegister, IStateMapperRegister { - private final Map definitions = new HashMap<>(); +public class BlockBase

& IBlockType & IStringSerializable> extends BlockForestry implements IItemModelRegister, IStateMapperRegister { + private final Map properties = new HashMap<>(); private final boolean hasTESR; - private final Class machinePropertiesClass; + private final Class

machinePropertiesClass; /* PROPERTIES */ - private final PropertyEnum TYPE; + private final PropertyEnum

TYPE; private final PropertyEnum FACE; protected final BlockState blockState; private boolean isReady = false; - public BlockBase(Class machinePropertiesClass) { + public BlockBase(Class

machinePropertiesClass) { this(false, machinePropertiesClass); } - public BlockBase(boolean hasTESR, Class machinePropertiesClass) { + public BlockBase(boolean hasTESR, Class

machinePropertiesClass) { super(Material.iron); this.hasTESR = hasTESR; @@ -91,12 +91,12 @@ public class BlockBase & IBlockType & IStringSerializable> ext } @SafeVarargs - public final void addDefinitions(C... blockTypes) { - for (C blockType : blockTypes) { + public final void addDefinitions(P... blockTypes) { + for (P blockType : blockTypes) { IMachineProperties machineProperties = blockType.getMachineProperties(); if (machineProperties != null) { machineProperties.setBlock(this); - this.definitions.put(blockType, machineProperties); + this.properties.put(blockType, machineProperties); } else { Log.error("Null Definition found {}", Arrays.toString(blockTypes)); } @@ -153,7 +153,7 @@ public class BlockBase & IBlockType & IStringSerializable> ext @SideOnly(Side.CLIENT) @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for (IMachineProperties definition : definitions.values()) { + for (IMachineProperties definition : properties.values()) { definition.getSubBlocks(item, tab, list); } } @@ -253,7 +253,7 @@ public class BlockBase & IBlockType & IStringSerializable> ext } public void init() { - for (IMachineProperties def : definitions.values()) { + for (IMachineProperties def : properties.values()) { def.registerTileEntity(); } } @@ -262,7 +262,7 @@ public class BlockBase & IBlockType & IStringSerializable> ext @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - for (IMachineProperties def : definitions.values()) { + for (IMachineProperties def : properties.values()) { def.registerModel(item, manager); } } @@ -270,7 +270,7 @@ public class BlockBase & IBlockType & IStringSerializable> ext /* STATES */ @Override public void registerStateMapper() { - Proxies.render.registerStateMapper(this, new StateMapperMachine<>(machinePropertiesClass, TYPE, FACE)); + Proxies.render.registerStateMapper(this, new MachineStateMapper<>(machinePropertiesClass, TYPE, FACE)); } @Override @@ -289,10 +289,10 @@ public class BlockBase & IBlockType & IStringSerializable> ext @Override public IBlockState getStateFromMeta(int meta) { - for(Map.Entry entry : definitions.entrySet()){ + for(Map.Entry entry : properties.entrySet()){ IMachineProperties machineProperties = entry.getValue(); if (machineProperties.getMeta() == meta){ - C blockType = entry.getKey(); + P blockType = entry.getKey(); return getDefaultState().withProperty(this.TYPE, blockType); } } @@ -326,7 +326,7 @@ public class BlockBase & IBlockType & IStringSerializable> ext return hasTESR; } - public final ItemStack get(C type) { + public final ItemStack get(P type) { return new ItemStack(this, 1, type.getMachineProperties().getMeta()); } } diff --git a/src/main/java/forestry/core/blocks/BlockTypeCoreTesr.java b/src/main/java/forestry/core/blocks/BlockTypeCoreTesr.java index 1241e1a20..c3be703b9 100644 --- a/src/main/java/forestry/core/blocks/BlockTypeCoreTesr.java +++ b/src/main/java/forestry/core/blocks/BlockTypeCoreTesr.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.core.blocks; +import java.util.Locale; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -41,6 +43,6 @@ public enum BlockTypeCoreTesr implements IBlockTypeTesr { @Override public String getName() { - return name(); + return getMachineProperties().getName(); } } diff --git a/src/main/java/forestry/core/fluids/BlockForestryFluid.java b/src/main/java/forestry/core/fluids/BlockForestryFluid.java index b481b5e50..016f16df4 100644 --- a/src/main/java/forestry/core/fluids/BlockForestryFluid.java +++ b/src/main/java/forestry/core/fluids/BlockForestryFluid.java @@ -18,6 +18,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EntityFX; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -30,10 +31,12 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; import forestry.core.entities.EntityFXColoredDropParticle; import forestry.core.utils.BlockUtil; -public class BlockForestryFluid extends BlockFluidClassic { +public class BlockForestryFluid extends BlockFluidClassic implements IItemModelRegister { private final boolean flammable; private final int flammability; @@ -135,6 +138,12 @@ public class BlockForestryFluid extends BlockFluidClassic { return super.getMaterial(); } } + + @SideOnly(Side.CLIENT) + @Override + public void registerModel(Item item, IModelManager manager) { + + } @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { diff --git a/src/main/java/forestry/core/items/ItemCrated.java b/src/main/java/forestry/core/items/ItemCrated.java index 77c269f8e..0e8edade5 100755 --- a/src/main/java/forestry/core/items/ItemCrated.java +++ b/src/main/java/forestry/core/items/ItemCrated.java @@ -74,9 +74,9 @@ public class ItemCrated extends ItemForestry { public void registerModel(Item item, IModelManager manager) { if(contained == null){ manager.registerItemModel(item, 0, false); + manager.registerItemModel(item, 1, "crate-filled"); }else{ - String modID = ItemStackUtil.getItemNameFromRegistry(item).getResourceDomain(); - ModelResourceLocation modelLocation = new ModelResourceLocation(modID + ":crates", StringUtil.cleanItemName(item)); + ModelResourceLocation modelLocation = new ModelResourceLocation("forestry:crate-filled", StringUtil.cleanItemName(item)); ModelLoader.setCustomModelResourceLocation(item, 0, modelLocation); ModelBakery.registerItemVariants(item, modelLocation); } diff --git a/src/main/java/forestry/core/models/ModelCrate.java b/src/main/java/forestry/core/models/ModelCrate.java index 70f330f99..289f83cf5 100644 --- a/src/main/java/forestry/core/models/ModelCrate.java +++ b/src/main/java/forestry/core/models/ModelCrate.java @@ -10,208 +10,275 @@ ******************************************************************************/ package forestry.core.models; +import java.io.FileNotFoundException; import java.io.IOException; -import java.util.Collection; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringReader; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; + +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.block.model.ModelBlock; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.IResource; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.client.resources.model.ModelManager; import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.network.ServerStatusResponse.MinecraftProtocolVersionIdentifier; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.ICustomModelLoader; +import net.minecraftforge.client.ItemModelMesherForge; import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.IModelCustomData; -import net.minecraftforge.client.model.IModelState; -import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.client.model.ISmartItemModel; +import net.minecraftforge.client.model.ItemLayerModel; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.ModelStateComposition; -import net.minecraftforge.client.model.MultiLayerModel; -import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.client.model.MultiModel; +import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import com.google.common.base.Charsets; import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; - -import forestry.core.utils.Log; -public class ModelCrate implements IModelCustomData { - public static final ModelCrate instance = new ModelCrate("cratedStone", "forestry", new ModelResourceLocation("forestry:crates", "cratedStone"), false); - - private final String containedUID; - private final String modID; - private final ResourceLocation containedLocation; - private final boolean isContainedItem; +import com.google.common.collect.Maps; +import forestry.core.items.ItemCrated; +import forestry.core.utils.StringUtil; +import forestry.plugins.PluginStorage; +import gnu.trove.map.hash.TIntObjectHashMap; +public class ModelCrate implements ISmartItemModel { + + private HashMap crates = Maps.newHashMap(); + + public static IModel crateModel; + private final Function textureGetter; + public static ModelBlock MODEL_GENERATED; + public static ModelBlock MODEL_COMPASS; + public static ModelBlock MODEL_CLOCK; + public static ModelLoader loader; + + public ModelCrate() { + textureGetter = new Function() { + public TextureAtlasSprite apply(ResourceLocation location) { + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString()); + } + }; + } + /** - * @param baseLocation The location of the crate model - * @param UID The UID of the crate - * @param modID The modId of the creat item - * @param containedLocation The location of the model from the contained item + * To bake the contained model */ - private ModelCrate(String UID, String modID, ResourceLocation containedLocation, boolean isContainedItem){ - this.containedUID = UID; - this.modID = modID; - this.containedLocation = containedLocation; - this.isContainedItem = isContainedItem; - } + private ImmutableMap bakeModels(ItemCrated crated){ + ImmutableMap.Builder pb = ImmutableMap.builder(); - @Override - public Collection getDependencies() { - return ImmutableList.of(new ModelResourceLocation("forestry:crates", "crate"), containedLocation); - } - - @Override - public Collection getTextures(){ - return ImmutableList.of(); - } - - /** - * - * @param loc The location of the model - * @return A model from the {@link ModelLoaderRegistry} - */ - private static IModel getModel(ResourceLocation loc){ - IModel model; - try{ - model = ModelLoaderRegistry.getModel(loc); - } - catch (IOException e){ - Log.logThrowable("Couldn't load Crate Model dependency: %s", e, loc); - model = ModelLoaderRegistry.getMissingModel(); - } - return model; - } - - /** - * To bake the base and the contained model - */ - private static ImmutableMap, IFlexibleBakedModel> buildModels(IModelState state, VertexFormat format, Function bakedTextureGetter, ModelCrate modelToBake){ - ImmutableMap.Builder, IFlexibleBakedModel> builder = ImmutableMap.builder(); + IFlexibleBakedModel flexModel = getModel(crated.getContained()); - IModel base = getModel(new ModelResourceLocation("forestry:crates", "crate")); - IFlexibleBakedModel baseBaked = base.bake(new ModelStateComposition(state, base.getDefaultState()), format, bakedTextureGetter); + IdentityHashMap> modelResourceLocations = ObfuscationReflectionHelper.getPrivateValue(ItemModelMesherForge.class, (ItemModelMesherForge)Minecraft.getMinecraft().getRenderItem().getItemModelMesher(), 0); - //Set the crate color index to 100 - for(BakedQuad quad : baseBaked.getGeneralQuads()){ - ObfuscationReflectionHelper.setPrivateValue(BakedQuad.class, quad, 100, 1); - } - builder.put(Optional.absent(), baseBaked); - builder.put(Optional.of(EnumWorldBlockLayer.SOLID), baseBaked); - - + ModelResourceLocation modelResource = modelResourceLocations.get(crated.getContained().getItem()).get(crated.getContained().getItemDamage()); + ResourceLocation location = getItemLocation(modelResource); - IModel content = getModel(modelToBake.containedLocation); - if(modelToBake.isContainedItem){ - builder.put(Optional.of(EnumWorldBlockLayer.CUTOUT), new TRSRBakedModel(content.bake(state, format, bakedTextureGetter), -0.0625F, 0, 0.0625F, 0.5F)); - builder.put(Optional.of(EnumWorldBlockLayer.CUTOUT_MIPPED), new TRSRBakedModel(content.bake(state, format, bakedTextureGetter), -0.0625F, 0, -0.0625F, 0.5F)); + if(hasItemModel(location)){ + pb.put(String.valueOf(0), new TRSRBakedModel(flexModel, -0.0625F, 0, 0.0625F, 0.5F)); + pb.put(String.valueOf(1), new TRSRBakedModel(flexModel, -0.0625F, 0, -0.0625F, 0.5F)); }else{ - builder.put(Optional.of(EnumWorldBlockLayer.CUTOUT), new TRSRBakedModel(content.bake(state, format, bakedTextureGetter), -0.0625F, 0, 0, 0.5F)); + pb.put(String.valueOf(0), new TRSRBakedModel(flexModel, -0.0625F, 0, 0, 0.5F)); } - return builder.build(); - } - - /** - * Bake the crate model and the content of the crate - */ - @Override - public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter){ - IModel missing = ModelLoaderRegistry.getMissingModel(); - return new MultiLayerModel.MultiLayerBakedModel( - buildModels(state, format, bakedTextureGetter, this), - missing.bake(missing.getDefaultState(), format, bakedTextureGetter), - format, - IPerspectiveAwareModel.MapWrapper.getTransforms(state) - ); - } - - @Override - public IModelState getDefaultState(){ - return TRSRTransformation.identity(); - } - - /** - * Create a crate model from the customData - */ - @Override - public IModel process(ImmutableMap customData){ - ResourceLocation location = null; - String UID = ""; - boolean isContainedItem = false; - String modID = ""; - for(String key : customData.keySet()){ - if("uid".equals(key)){ - UID = getString(customData.get(key)); - } - else if("modID".equals(key)){ - modID = getString(customData.get(key)); - } - else if("location".equals(key)){ - location = getLocation(customData.get(key)); - } - else if("isItem".equals(key)){ - isContainedItem = getBoolean(customData.get(key)); - } - } - if(modID == null || modID.equals("")){ - modID = "forestry"; - } - if(location == null || UID == null || UID.equals("")) { - return instance; - } - return new ModelCrate(UID, modID, location, isContainedItem); - } - - private ResourceLocation getLocation(String json){ - JsonElement e = new JsonParser().parse(json); - if(e.isJsonPrimitive() && e.getAsJsonPrimitive().isString()){ - if(e.getAsString().contains("#")){ - return new ModelResourceLocation(e.getAsString()); - }else{ - return new ResourceLocation(e.getAsString()); - } - } - return new ModelResourceLocation("builtin/missing", "missing"); + return pb.build(); } - private String getString(String json){ - JsonElement e = new JsonParser().parse(json); - if(e.isJsonPrimitive() && e.getAsJsonPrimitive().isString()){ - return e.getAsString(); - } - return null; + /** + * @return The item model {@link ResourceLocation} from the {@link ModelResourceLocation} + */ + private ResourceLocation getItemLocation(ModelResourceLocation modelResource){ + ResourceLocation resourcelocation = new ResourceLocation(modelResource.toString().replaceAll("#.*", "")); + return new ResourceLocation(resourcelocation.getResourceDomain(), "item/" + resourcelocation.getResourcePath()); } - private boolean getBoolean(String json){ - JsonElement e = new JsonParser().parse(json); - if(e.isJsonPrimitive() && e.getAsJsonPrimitive().isBoolean()){ - return e.getAsBoolean(); - } - return false; - } - /** - * The model loader to load crate models from the blockstate file + * @return Return true, when the model from the {@link ResourceLocation} a item model is */ - public static enum Loader implements ICustomModelLoader{ - instance; + private boolean hasItemModel(ResourceLocation location){ + try{ + ModelBlock p_177581_1_ = loadModel(location); + if (p_177581_1_ == null){ + return false; + }else{ + ModelBlock modelblock = p_177581_1_.getRootModel(); + return modelblock == MODEL_GENERATED || modelblock == MODEL_COMPASS || modelblock == MODEL_CLOCK; + } + }catch(Exception e){ + return false; + } + } + + protected ModelBlock loadModel(ResourceLocation p_177594_1_) throws IOException + { + String s = p_177594_1_.getResourcePath(); - @Override - public void onResourceManagerReload(IResourceManager resourceManager) {} - - @Override - public boolean accepts(ResourceLocation modelLocation){ - return modelLocation.getResourceDomain().equals("forestry") && - modelLocation.getResourcePath().equals("models/block/crate"); + if ("builtin/generated".equals(s)) + { + return MODEL_GENERATED; } + else if ("builtin/compass".equals(s)) + { + return MODEL_COMPASS; + } + else if ("builtin/clock".equals(s)) + { + return MODEL_CLOCK; + } + else + { + Reader reader; - @Override - public IModel loadModel(ResourceLocation modelLocation){ - return ModelCrate.instance; + if (s.startsWith("builtin/")) + { + String s1 = s.substring("builtin/".length()); + if(s1.equals("missing")){ + reader = new StringReader("{ \"textures\": { \"particle\": \"missingno\", \"missingno\": \"missingno\"}, \"elements\": [ { \"from\": [ 0, 0, 0 ], \"to\": [ 16, 16, 16 ], \"faces\": { \"down\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"down\", \"texture\": \"#missingno\" }, \"up\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"up\", \"texture\": \"#missingno\" }, \"north\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"north\", \"texture\": \"#missingno\" }, \"south\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"south\", \"texture\": \"#missingno\" }, \"west\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"west\", \"texture\": \"#missingno\" }, \"east\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"east\", \"texture\": \"#missingno\" } }}]}"); + } + else{ + throw new FileNotFoundException(p_177594_1_.toString()); + } + } + else + { + IResource iresource = Minecraft.getMinecraft().getResourceManager().getResource(this.getModelLocation(p_177594_1_)); + reader = new InputStreamReader(iresource.getInputStream(), Charsets.UTF_8); + } + + ModelBlock model; + + try + { + ModelBlock modelblock = ModelBlock.deserialize(reader); + modelblock.name = p_177594_1_.toString(); + model = modelblock; + } + finally + { + reader.close(); + } + + if(model != null && model.getParentLocation() != null){ + if(model.getParentLocation().getResourcePath().equals("builtin/generated")) + { + model.parent = MODEL_GENERATED; + } + else + { + try{ + model.parent = loadModel(model.getParentLocation()); + }catch (IOException e){ + } + } + } + + return model; } } + + protected ResourceLocation getModelLocation(ResourceLocation p_177580_1_) + { + return new ResourceLocation(p_177580_1_.getResourceDomain(), "models/" + p_177580_1_.getResourcePath() + ".json"); + } + + /** + * @return The baked model from the filled crate + */ + private IFlexibleBakedModel getModel(ItemStack stack){ + IBakedModel model = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(stack); + if(model == null) { + return null; + } + else if(model instanceof IFlexibleBakedModel) { + return (IFlexibleBakedModel) model; + } + else { + return new IFlexibleBakedModel.Wrapper(model, DefaultVertexFormats.ITEM); + } + } + + private IFlexibleBakedModel getModelCrate(){ + IFlexibleBakedModel flexModel; + IBakedModel model = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(new ItemStack(PluginStorage.items.crate, 1, 1)); + if(model == null) { + return null; + } + else if(model instanceof IFlexibleBakedModel) { + flexModel = (IFlexibleBakedModel) model; + } + else { + flexModel = new IFlexibleBakedModel.Wrapper(model, DefaultVertexFormats.ITEM); + } + return crateModel.bake(crateModel.getDefaultState(), flexModel.getFormat(), textureGetter); + } + + @Override + public List getFaceQuads(EnumFacing facing) { + return null; + } + + @Override + public List getGeneralQuads() { + return null; + } + + @Override + public boolean isAmbientOcclusion() { + return false; + } + + @Override + public boolean isGui3d() { + return false; + } + + @Override + public boolean isBuiltInRenderer() { + return false; + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return null; + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return null; + } + + /** + * Bake the crated model + */ + @Override + public IBakedModel handleItemState(ItemStack stack) { + ItemCrated crated = (ItemCrated) stack.getItem(); + String crateUID = StringUtil.cleanItemName(crated); + if(crates.get(crateUID) == null){ + IFlexibleBakedModel baseBaked = getModelCrate(); + + //Set the crate color index to 100 + for(BakedQuad quad : baseBaked.getGeneralQuads()){ + ObfuscationReflectionHelper.setPrivateValue(BakedQuad.class, quad, 100, 1); + } + crates.put(crateUID, new MultiModel.Baked(baseBaked, bakeModels(crated))); + } + return crates.get(crateUID); + } } \ No newline at end of file diff --git a/src/main/java/forestry/core/models/ModelIndex.java b/src/main/java/forestry/core/models/ModelIndex.java index 861f49fd1..71aa4ce06 100644 --- a/src/main/java/forestry/core/models/ModelIndex.java +++ b/src/main/java/forestry/core/models/ModelIndex.java @@ -10,15 +10,15 @@ ******************************************************************************/ package forestry.core.models; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraftforge.client.model.IModel; public class ModelIndex { public final ModelResourceLocation modelLocation; - public final IModel model; - - public ModelIndex(ModelResourceLocation modelLocation, IModel model) { + public final IBakedModel model; + + public ModelIndex(ModelResourceLocation modelLocation, IBakedModel model) { this.modelLocation = modelLocation; this.model = model; } diff --git a/src/main/java/forestry/core/models/ModelManager.java b/src/main/java/forestry/core/models/ModelManager.java index 7311beda4..b0ed70c3b 100644 --- a/src/main/java/forestry/core/models/ModelManager.java +++ b/src/main/java/forestry/core/models/ModelManager.java @@ -83,9 +83,6 @@ public class ModelManager implements IModelManager { if (block instanceof IItemModelRegister) { ((IItemModelRegister) block).registerModel(Item.getItemFromBlock(block), getInstance()); } - if (block instanceof IStateMapperRegister) { - ((IStateMapperRegister) block).registerStateMapper(); - } } } diff --git a/src/main/java/forestry/core/models/RenderHandler.java b/src/main/java/forestry/core/models/RenderHandler.java index c4de8e074..154aaff26 100644 --- a/src/main/java/forestry/core/models/RenderHandler.java +++ b/src/main/java/forestry/core/models/RenderHandler.java @@ -23,7 +23,6 @@ public class RenderHandler { public static void registerModels(ModelBakeEvent event) { IRegistry registry = event.modelRegistry; for (final BlockModelIndex index : blockModels) { - Object o = registry.getObject(index.blockModelLocation); registry.putObject(index.blockModelLocation, index.model); registry.putObject(index.itemModelLocation, index.model); } diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index f73093f2c..11f00ce7b 100755 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -20,7 +20,7 @@ import net.minecraft.entity.Entity; import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - +import net.minecraftforge.client.model.b3d.B3DLoader; import forestry.core.fluids.Fluids; import forestry.core.models.BlockModelIndex; import forestry.core.models.ModelIndex; @@ -90,8 +90,12 @@ public class ProxyRender { public void bindTexture(ResourceLocation location) { } + public void registerModels() { } + + public void registerLoaders(){ + } /* FX */ diff --git a/src/main/java/forestry/core/proxy/ProxyRenderClient.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java index 3ab2399d6..0418f3624 100644 --- a/src/main/java/forestry/core/proxy/ProxyRenderClient.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.block.statemap.IStateMapper; import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.item.Item; @@ -29,6 +30,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.b3d.B3DLoader; +import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.fml.client.FMLClientHandler; import forestry.apiculture.entities.EntityFXBee; @@ -150,12 +153,19 @@ public class ProxyRenderClient extends ProxyRender { return fluidLocation; } }); + ModelBakery.registerItemVariants(Item.getItemFromBlock(block), fluidLocation); } @Override public void registerStateMapper(Block block, IStateMapper mapper) { ModelLoader.setCustomStateMapper(block, mapper); } + + @Override + public void registerLoaders(){ + B3DLoader.instance.addDomain(Constants.ID); + OBJLoader.instance.addDomain(Constants.ID); + } @Override public void registerModels() { diff --git a/src/main/java/forestry/core/render/StateMapperForestry.java b/src/main/java/forestry/core/render/ForestryStateMapper.java similarity index 94% rename from src/main/java/forestry/core/render/StateMapperForestry.java rename to src/main/java/forestry/core/render/ForestryStateMapper.java index 75f6b2e17..ceaa63610 100644 --- a/src/main/java/forestry/core/render/StateMapperForestry.java +++ b/src/main/java/forestry/core/render/ForestryStateMapper.java @@ -10,7 +10,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.IStateMapper; import net.minecraft.client.resources.model.ModelResourceLocation; -public abstract class StateMapperForestry implements IStateMapper { +public abstract class ForestryStateMapper implements IStateMapper { protected Map mapStateModelLocations = Maps.newLinkedHashMap(); diff --git a/src/main/java/forestry/core/render/StateMapperMachine.java b/src/main/java/forestry/core/render/MachineStateMapper.java similarity index 61% rename from src/main/java/forestry/core/render/StateMapperMachine.java rename to src/main/java/forestry/core/render/MachineStateMapper.java index 041cf6740..5a7ab6e60 100644 --- a/src/main/java/forestry/core/render/StateMapperMachine.java +++ b/src/main/java/forestry/core/render/MachineStateMapper.java @@ -1,6 +1,7 @@ package forestry.core.render; import java.util.LinkedHashMap; +import java.util.Locale; import java.util.Map; import com.google.common.collect.Maps; @@ -17,30 +18,30 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class StateMapperMachine & IBlockType & IStringSerializable> extends StateMapperForestry { +public class MachineStateMapper & IBlockType & IStringSerializable> extends ForestryStateMapper { - private final Class clazz; - private final PropertyEnum META; + private final Class machinePropertiesClass; + private final PropertyEnum META; private final PropertyEnum FACE; - public StateMapperMachine(Class clazz, PropertyEnum META, PropertyEnum FACE) { - this.clazz = clazz; + public MachineStateMapper(Class machinePropertiesClass, PropertyEnum META, PropertyEnum FACE) { + this.machinePropertiesClass = machinePropertiesClass; this.META = META; this.FACE = FACE; } @Override public Map putStateModelLocations(Block block) { - for (C definition : clazz.getEnumConstants()) { - if (definition instanceof IMachinePropertiesTesr) + for (T type : machinePropertiesClass.getEnumConstants()) { + if (type.getMachineProperties() instanceof IMachinePropertiesTesr) continue; for (EnumFacing facing : EnumFacing.values()) { if (facing == EnumFacing.DOWN || facing == EnumFacing.UP) continue; - IBlockState state = block.getDefaultState().withProperty(META, definition).withProperty(FACE, facing); + IBlockState state = block.getDefaultState().withProperty(META, type).withProperty(FACE, facing); LinkedHashMap linkedhashmap = Maps.newLinkedHashMap(state.getProperties()); - ResourceLocation RL = Block.blockRegistry.getNameForObject(block); - String s = String.format("%s:%s", RL.getResourceDomain(), RL.getResourcePath() + "_" + META.getName((C) linkedhashmap.remove(META))); + ResourceLocation blockLocation = Block.blockRegistry.getNameForObject(block); + String s = String.format("%s:%s", blockLocation.getResourceDomain(), blockLocation.getResourcePath() + "_" + META.getName((T) linkedhashmap.remove(META))); mapStateModelLocations.put(state, new ModelResourceLocation(s, getPropertyString(linkedhashmap))); } } diff --git a/src/main/java/forestry/energy/blocks/BlockTypeEngine.java b/src/main/java/forestry/energy/blocks/BlockTypeEngine.java index 0ee19dadf..ad5634231 100644 --- a/src/main/java/forestry/energy/blocks/BlockTypeEngine.java +++ b/src/main/java/forestry/energy/blocks/BlockTypeEngine.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.energy.blocks; +import java.util.Locale; + import javax.annotation.Nonnull; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -46,6 +48,6 @@ public enum BlockTypeEngine implements IBlockTypeTesr { @Override public String getName() { - return name(); + return getMachineProperties().getName(); } } diff --git a/src/main/java/forestry/factory/blocks/BlockTypeFactoryPlain.java b/src/main/java/forestry/factory/blocks/BlockTypeFactoryPlain.java index 25680d72f..6eaec51eb 100644 --- a/src/main/java/forestry/factory/blocks/BlockTypeFactoryPlain.java +++ b/src/main/java/forestry/factory/blocks/BlockTypeFactoryPlain.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.factory.blocks; +import java.util.Locale; + import javax.annotation.Nonnull; import forestry.core.blocks.IBlockType; @@ -42,6 +44,6 @@ public enum BlockTypeFactoryPlain implements IBlockType { @Override public String getName() { - return name(); + return getMachineProperties().getName(); } } diff --git a/src/main/java/forestry/factory/blocks/BlockTypeFactoryTesr.java b/src/main/java/forestry/factory/blocks/BlockTypeFactoryTesr.java index 76ece3fea..d75ce35cc 100644 --- a/src/main/java/forestry/factory/blocks/BlockTypeFactoryTesr.java +++ b/src/main/java/forestry/factory/blocks/BlockTypeFactoryTesr.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.factory.blocks; +import java.util.Locale; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -62,6 +64,6 @@ public enum BlockTypeFactoryTesr implements IBlockTypeTesr { @Override public String getName() { - return name(); + return getMachineProperties().getName(); } } diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockTypeLepidopterologyTesr.java b/src/main/java/forestry/lepidopterology/blocks/BlockTypeLepidopterologyTesr.java index 20f36ef97..4e9669341 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockTypeLepidopterologyTesr.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockTypeLepidopterologyTesr.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.lepidopterology.blocks; +import java.util.Locale; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -48,6 +50,6 @@ public enum BlockTypeLepidopterologyTesr implements IBlockTypeTesr { @Override public String getName() { - return name(); + return getMachineProperties().getName(); } } diff --git a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java index b728dbe9d..57024b52d 100644 --- a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java +++ b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java @@ -10,11 +10,20 @@ ******************************************************************************/ package forestry.lepidopterology.proxy; +import forestry.core.models.ModelIndex; +import forestry.core.models.ModelManager; +import forestry.core.proxy.Proxies; +import forestry.lepidopterology.entities.EntityButterfly; +import forestry.lepidopterology.render.ModelButterflyItem; +import forestry.lepidopterology.render.RenderButterflyEntity; +import forestry.plugins.PluginLepidopterology; +import net.minecraftforge.fml.client.registry.RenderingRegistry; + public class ProxyLepidopterologyClient extends ProxyLepidopterology { @Override public void initializeRendering() { - /*RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, new RenderButterflyEntity()); - MinecraftForgeClient.registerItemRenderer(PluginLepidopterology.items.butterflyGE, new RenderButterflyItem());*/ + RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, new RenderButterflyEntity()); + //Proxies.render.registerModel(new ModelIndex(ModelManager.getInstance().getModelLocation(PluginLepidopterology.items.butterflyGE, "butterflyGE"), new ModelButterflyItem())); } } diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java index 6b1a83150..a04330c45 100644 --- a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java @@ -18,7 +18,10 @@ import com.google.common.collect.ImmutableMap; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; +import forestry.core.models.ModelManager; +import forestry.core.models.TRSRBakedModel; import forestry.core.utils.Log; +import forestry.plugins.PluginLepidopterology; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -37,8 +40,9 @@ public class ModelButterflyItem implements ISmartItemModel { public IRetexturableModel modelButterfly; public ResourceLocation location; - public ModelButterflyItem(ResourceLocation location) { - this.location = location; + public ModelButterflyItem() { + this.location = new ResourceLocation("forestry:item/butterflyGE.b3d"); + //this.location = new ResourceLocation("forestry:item/butterflyGE.obj"); } @Override @@ -78,20 +82,23 @@ public class ModelButterflyItem implements ISmartItemModel { @Override public IBakedModel handleItemState(ItemStack item) { - try { - modelButterfly = (IRetexturableModel) ModelLoaderRegistry.getModel(location); - } catch (IOException e) { - Log.warning( - "Failed to find Butterfly Model for (" + location.toString() + ") in the Forestry registry."); + if(modelButterfly == null){ + try { + modelButterfly = (IRetexturableModel) ModelLoaderRegistry.getModel(location); + } catch (IOException e) { + Log.warning( + "Failed to find Butterfly Model for (" + location.toString() + ") in the Forestry registry."); + } + if (modelButterfly == null) { + return null; + } } IButterfly butterfly = ButterflyManager.butterflyRoot.getMember(item); - if (modelButterfly == null) { - return null; - } if (butterfly == null) { butterfly = ButterflyManager.butterflyRoot.templateAsIndividual(ButterflyManager.butterflyRoot.getDefaultTemplate()); } return bakeModel(butterfly); + //return bakeModel(butterfly); } public IBakedModel bakeModel(IButterfly butterfly) { @@ -103,8 +110,9 @@ public class ModelButterflyItem implements ISmartItemModel { }; ImmutableMap.Builder textures = ImmutableMap.builder(); textures.put("#ButterflyGE", butterfly.getGenome().getSecondary().getEntityTexture().toString().replace(".png", "").replace("textures/", "")); + textures.put("Butterfly2texture", butterfly.getGenome().getSecondary().getEntityTexture().toString().replace(".png", "").replace("textures/", "")); modelButterfly = (IRetexturableModel) modelButterfly.retexture(textures.build()); - return modelButterfly.bake(ModelRotation.X270_Y90, DefaultVertexFormats.ITEM, textureGetter); + return new TRSRBakedModel(modelButterfly.bake(ModelRotation.X0_Y0, DefaultVertexFormats.ITEM, textureGetter), -0.5F, -1.5F, 1.5F, 0, (float)Math.PI * 2, 0, 1F); } public static float getIrregularWingYaw(long flapping, float flap) { diff --git a/src/main/java/forestry/mail/blocks/BlockTypeMail.java b/src/main/java/forestry/mail/blocks/BlockTypeMail.java index 0d8c35b6b..1c628133e 100644 --- a/src/main/java/forestry/mail/blocks/BlockTypeMail.java +++ b/src/main/java/forestry/mail/blocks/BlockTypeMail.java @@ -45,6 +45,6 @@ public enum BlockTypeMail implements IBlockType { @Override public String getName() { - return name(); + return getMachineProperties().getName(); } } diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index bf07c85c0..974bd0654 100644 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -56,6 +56,7 @@ import forestry.core.models.RenderHandler; import forestry.core.multiblock.MultiblockLogicFactory; import forestry.core.network.IPacketRegistry; import forestry.core.network.PacketRegistryCore; +import forestry.core.proxy.Proxies; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.ClimateUtil; import forestry.core.utils.ForestryModEnvWarningCallable; diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index 4141d8973..6985ebfc1 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -12,6 +12,7 @@ package forestry.plugins; import java.awt.Color; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -35,17 +36,27 @@ import net.minecraft.block.BlockTrapDoor; import net.minecraft.block.BlockWall; import net.minecraft.block.BlockWorkbench; import net.minecraft.block.IGrowable; +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemDoor; import net.minecraft.item.ItemStack; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.IShearable; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Property; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import forestry.Forestry; @@ -60,6 +71,8 @@ import forestry.core.config.Constants; import forestry.core.config.LocalizedConfiguration; import forestry.core.fluids.Fluids; import forestry.core.items.ItemCrated; +import forestry.core.models.ModelCrate; +import forestry.core.models.RenderHandler; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; @@ -74,7 +87,6 @@ import forestry.storage.CrateRegistry; import forestry.storage.PickupHandlerStorage; import forestry.storage.ResupplyHandler; import forestry.storage.items.ItemRegistryStorage; -import forestry.storage.proxy.ProxyStorage; @Plugin(pluginID = "Storage", name = "Storage", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.storage.description") public class PluginStorage extends ForestryPlugin { @@ -82,8 +94,6 @@ public class PluginStorage extends ForestryPlugin { private static final List crates = new ArrayList<>(); private static final String CONFIG_CATEGORY = "backpacks"; - @SidedProxy(clientSide = "forestry.storage.proxy.ProxyStorageClient", serverSide = "forestry.storage.proxy.ProxyStorage") - public static ProxyStorage proxy; private final ArrayList minerItems = new ArrayList<>(); private final ArrayList diggerItems = new ArrayList<>(); private final ArrayList foresterItems = new ArrayList<>(); @@ -141,7 +151,6 @@ public class PluginStorage extends ForestryPlugin { definition = new BackpackDefinition("builder", new Color(0xdd3a3a).getRGB()); BackpackManager.definitions.put(definition.getKey(), definition); - proxy.registerCrateModelLoader(); } @Override @@ -160,6 +169,11 @@ public class PluginStorage extends ForestryPlugin { protected void registerItemsAndBlocks() { items = new ItemRegistryStorage(); } + + @Override + protected void preInit() { + MinecraftForge.EVENT_BUS.register(this); + } @Override public void postInit() { @@ -561,4 +575,18 @@ public class PluginStorage extends ForestryPlugin { 'W', wovenSilk, 'T', backpackT1); } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onBakeModel(ModelBakeEvent event) { + try { + ModelCrate.crateModel = ModelLoaderRegistry.getModel(new ModelResourceLocation("forestry:crate-filled", "inventory")); + ModelCrate.MODEL_GENERATED = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.modelLoader, 14); + ModelCrate.MODEL_COMPASS = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.modelLoader, 15); + ModelCrate.MODEL_CLOCK = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.modelLoader, 16); + ModelCrate.loader = event.modelLoader; + } catch (Exception e) { + e.printStackTrace(); + } + } } diff --git a/src/main/java/forestry/storage/CrateRegistry.java b/src/main/java/forestry/storage/CrateRegistry.java index f98c3bcf0..733e521cf 100644 --- a/src/main/java/forestry/storage/CrateRegistry.java +++ b/src/main/java/forestry/storage/CrateRegistry.java @@ -11,11 +11,15 @@ package forestry.storage; import net.minecraft.block.Block; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.storage.ICrateRegistry; import forestry.core.items.ItemCrated; +import forestry.core.models.ModelCrate; +import forestry.core.models.ModelIndex; +import forestry.core.proxy.Proxies; import forestry.core.utils.Log; import forestry.core.utils.StringUtil; import forestry.plugins.PluginStorage; @@ -36,6 +40,7 @@ public class CrateRegistry implements ICrateRegistry { ItemCrated crate = new ItemCrated(stack, useOreDict); crate.setUnlocalizedName(uid); GameRegistry.registerItem(crate, StringUtil.cleanItemName(crate)); + Proxies.render.registerModel(new ModelIndex(new ModelResourceLocation("forestry:crate-filled", StringUtil.cleanItemName(crate)), new ModelCrate())); PluginStorage.registerCrate(crate); } diff --git a/src/main/java/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java index 2288e2285..0bad7f7b1 100755 --- a/src/main/java/forestry/storage/items/ItemBackpack.java +++ b/src/main/java/forestry/storage/items/ItemBackpack.java @@ -232,9 +232,6 @@ public class ItemBackpack extends ItemWithGui { @SideOnly(Side.CLIENT) private ModelResourceLocation[] models; - @SideOnly(Side.CLIENT) - public static int i = 0; - @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { @@ -245,13 +242,10 @@ public class ItemBackpack extends ItemWithGui { models[1] = new ModelResourceLocation("forestry:" + typeTag + "_locked", "inventory"); models[2] = new ModelResourceLocation("forestry:" + typeTag + "_receive", "inventory"); models[3] = new ModelResourceLocation("forestry:" + typeTag + "_resupply", "inventory"); - if (i == 0 && (type == EnumBackpackType.T1 || type == EnumBackpackType.APIARIST) || i == 1 && type == EnumBackpackType.T2) { - manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_neutral")); - manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_locked")); - manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_receive")); - manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_resupply")); - i++; - } + manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_neutral")); + manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_locked")); + manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_receive")); + manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_resupply")); manager.registerItemModel(item, new BackpackMeshDefinition()); } diff --git a/src/main/java/forestry/storage/proxy/ProxyStorage.java b/src/main/java/forestry/storage/proxy/ProxyStorage.java deleted file mode 100644 index 80bd2621e..000000000 --- a/src/main/java/forestry/storage/proxy/ProxyStorage.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.storage.proxy; - -public class ProxyStorage { - - public void registerCrateModelLoader() { - } - -} diff --git a/src/main/java/forestry/storage/proxy/ProxyStorageClient.java b/src/main/java/forestry/storage/proxy/ProxyStorageClient.java deleted file mode 100644 index 99e47ddee..000000000 --- a/src/main/java/forestry/storage/proxy/ProxyStorageClient.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.storage.proxy; - -import forestry.core.models.ModelCrate; -import net.minecraftforge.client.model.ModelLoaderRegistry; - -public class ProxyStorageClient extends ProxyStorage { - - @Override - public void registerCrateModelLoader() { - ModelLoaderRegistry.registerLoader(ModelCrate.Loader.instance); - } -} diff --git a/src/main/resources/assets/forestry/blockstates/apiculture_bee.house.json b/src/main/resources/assets/forestry/blockstates/apiculture_bee.house.json new file mode 100644 index 000000000..bc16cc83b --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/apiculture_bee.house.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:apiculture_bee.house" }, + "face=east": { "model": "forestry:apiculture_bee.house", "y": 90 }, + "face=south": { "model": "forestry:apiculture_bee.house", "y": 180 }, + "face=west": { "model": "forestry:apiculture_bee.house", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/apiculture_beehouse.json b/src/main/resources/assets/forestry/blockstates/apiculture_beehouse.json deleted file mode 100644 index 0cd61e93a..000000000 --- a/src/main/resources/assets/forestry/blockstates/apiculture_beehouse.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "face=north": { "model": "forestry:apiculture_beehouse" }, - "face=east": { "model": "forestry:apiculture_beehouse", "y": 90 }, - "face=south": { "model": "forestry:apiculture_beehouse", "y": 180 }, - "face=west": { "model": "forestry:apiculture_beehouse", "y": -90 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/butterflyGE.json b/src/main/resources/assets/forestry/blockstates/butterflyGE.json index 7b8a84acd..2417a05b7 100644 --- a/src/main/resources/assets/forestry/blockstates/butterflyGE.json +++ b/src/main/resources/assets/forestry/blockstates/butterflyGE.json @@ -4,7 +4,7 @@ "textures": { "#Butterfly2texture": "forestry:texture" }, - "model": "forestry:butterflyGE.b3d" + "model": "forestry:butterflyGE.obj" }, "variants": { "inventory": [{ diff --git a/src/main/resources/assets/forestry/blockstates/logs.json b/src/main/resources/assets/forestry/blockstates/logs.json index 212bd0fa2..d6acc3a42 100644 --- a/src/main/resources/assets/forestry/blockstates/logs.json +++ b/src/main/resources/assets/forestry/blockstates/logs.json @@ -1,120 +1,646 @@ { - "variants": { - //larch - "axis=normal,woodtype=larch": { "model": "forestry:arboriculture/logs/larch" }, - "axis=side,woodtype=larch": { "model": "forestry:arboriculture/logs/larch_side" }, - "axis=side_90,woodtype=larch": { "model": "forestry:arboriculture/logs/larch_side", "y": 90 }, - //teak - "axis=normal,woodtype=teak": { "model": "forestry:arboriculture/logs/teak" }, - "axis=side,woodtype=teak": { "model": "forestry:arboriculture/logs/teak_side" }, - "axis=side_90,woodtype=teak": { "model": "forestry:arboriculture/logs/teak_side", "y": 90 }, - //acacia - "axis=normal,woodtype=acacia": { "model": "forestry:arboriculture/logs/acacia" }, - "axis=side,woodtype=acacia": { "model": "forestry:arboriculture/logs/acacia_side" }, - "axis=side_90,woodtype=acacia": { "model": "forestry:arboriculture/logs/acacia_side", "y": 90 }, - //lime - "axis=normal,woodtype=lime": { "model": "forestry:arboriculture/logs/lime" }, - "axis=side,woodtype=lime": { "model": "forestry:arboriculture/logs/lime_side" }, - "axis=side_90,woodtype=lime": { "model": "forestry:arboriculture/logs/lime_side", "y": 90 }, - //chestnut - "axis=normal,woodtype=chestnut": { "model": "forestry:arboriculture/logs/chestnut" }, - "axis=side,woodtype=chestnut": { "model": "forestry:arboriculture/logs/chestnut_side" }, - "axis=side_90,woodtype=chestnut": { "model": "forestry:arboriculture/logs/chestnut_side", "y": 90 }, - //wenge - "axis=normal,woodtype=wenge": { "model": "forestry:arboriculture/logs/wenge" }, - "axis=side,woodtype=wenge": { "model": "forestry:arboriculture/logs/wenge_side" }, - "axis=side_90,woodtype=wenge": { "model": "forestry:arboriculture/logs/wenge_side", "y": 90 }, - //baobab - "axis=normal,woodtype=baobab": { "model": "forestry:arboriculture/logs/baobab" }, - "axis=side,woodtype=baobab": { "model": "forestry:arboriculture/logs/baobab_side" }, - "axis=side_90,woodtype=baobab": { "model": "forestry:arboriculture/logs/baobab_side", "y": 90 },# - //sequoia - "axis=normal,woodtype=sequoia": { "model": "forestry:arboriculture/logs/sequoia" }, - "axis=side,woodtype=sequoia": { "model": "forestry:arboriculture/logs/sequoia_side" }, - "axis=side_90,woodtype=sequoia": { "model": "forestry:arboriculture/logs/sequoia_side", "y": 90 }, - //kapok - "axis=normal,woodtype=kapok": { "model": "forestry:arboriculture/logs/kapok" }, - "axis=side,woodtype=kapok": { "model": "forestry:arboriculture/logs/kapok_side" }, - "axis=side_90,woodtype=kapok": { "model": "forestry:arboriculture/logs/kapok_side", "y": 90 }, - //ebony - "axis=normal,woodtype=ebony": { "model": "forestry:arboriculture/logs/ebony" }, - "axis=side,woodtype=ebony": { "model": "forestry:arboriculture/logs/ebony_side" }, - "axis=side_90,woodtype=ebony": { "model": "forestry:arboriculture/logs/ebony_side", "y": 90 }, - //mahogany - "axis=normal,woodtype=mahogany": { "model": "forestry:arboriculture/logs/mahogany" }, - "axis=side,woodtype=mahogany": { "model": "forestry:arboriculture/logs/mahogany_side" }, - "axis=side_90,woodtype=mahogany": { "model": "forestry:arboriculture/logs/mahogany_side", "y": 90 }, - //balsa - "axis=normal,woodtype=balsa": { "model": "forestry:arboriculture/logs/balsa" }, - "axis=side,woodtype=balsa": { "model": "forestry:arboriculture/logs/balsa_side" }, - "axis=side_90,woodtype=balsa": { "model": "forestry:arboriculture/logs/balsa_side", "y": 90 }, - //willow - "axis=normal,woodtype=willow": { "model": "forestry:arboriculture/logs/willow" }, - "axis=side,woodtype=willow": { "model": "forestry:arboriculture/logs/willow_side" }, - "axis=side_90,woodtype=willow": { "model": "forestry:arboriculture/logs/willow_side", "y": 90 }, - //walnut - "axis=normal,woodtype=walnut": { "model": "forestry:arboriculture/logs/walnut" }, - "axis=side,woodtype=walnut": { "model": "forestry:arboriculture/logs/walnut_side" }, - "axis=side_90,woodtype=walnut": { "model": "forestry:arboriculture/logs/walnut_side", "y": 90 }, - //greenheart - "axis=normal,woodtype=greenheart": { "model": "forestry:arboriculture/logs/greenheart" }, - "axis=side,woodtype=greenheart": { "model": "forestry:arboriculture/logs/greenheart_side" }, - "axis=side_90,woodtype=greenheart": { "model": "forestry:arboriculture/logs/greenheart_side", "y": 90 }, - //cherry - "axis=normal,woodtype=cherry": { "model": "forestry:arboriculture/logs/cherry" }, - "axis=side,woodtype=cherry": { "model": "forestry:arboriculture/logs/cherry_side" }, - "axis=side_90,woodtype=cherry": { "model": "forestry:arboriculture/logs/cherry_side", "y": 90 }, - //mahoe - "axis=normal,woodtype=mahoe": { "model": "forestry:arboriculture/logs/mahoe" }, - "axis=side,woodtype=mahoe": { "model": "forestry:arboriculture/logs/mahoe_side" }, - "axis=side_90,woodtype=mahoe": { "model": "forestry:arboriculture/logs/mahoe_side", "y": 90 }, - //poplar - "axis=normal,woodtype=poplar": { "model": "forestry:arboriculture/logs/poplar" }, - "axis=side,woodtype=poplar": { "model": "forestry:arboriculture/logs/poplar_side" }, - "axis=side_90,woodtype=poplar": { "model": "forestry:arboriculture/logs/poplar_side", "y": 90 }, - //palm - "axis=normal,woodtype=palm": { "model": "forestry:arboriculture/logs/palm" }, - "axis=side,woodtype=palm": { "model": "forestry:arboriculture/logs/palm_side" }, - "axis=side_90,woodtype=palm": { "model": "forestry:arboriculture/logs/palm_side", "y": 90 }, - //papaya - "axis=normal,woodtype=papaya": { "model": "forestry:arboriculture/logs/papaya" }, - "axis=side,woodtype=papaya": { "model": "forestry:arboriculture/logs/papaya_side" }, - "axis=side_90,woodtype=papaya": { "model": "forestry:arboriculture/logs/papaya_side", "y": 90 }, - //pine - "axis=normal,woodtype=pine": { "model": "forestry:arboriculture/logs/pine" }, - "axis=side,woodtype=pine": { "model": "forestry:arboriculture/logs/pine_side" }, - "axis=side_90,woodtype=pine": { "model": "forestry:arboriculture/logs/pine_side", "y": 90 }, - //plum - "axis=normal,woodtype=plum": { "model": "forestry:arboriculture/logs/plum" }, - "axis=side,woodtype=plum": { "model": "forestry:arboriculture/logs/plum_side" }, - "axis=side_90,woodtype=plum": { "model": "forestry:arboriculture/logs/plum_side", "y": 90 }, - //maple - "axis=normal,woodtype=maple": { "model": "forestry:arboriculture/logs/maple" }, - "axis=side,woodtype=maple": { "model": "forestry:arboriculture/logs/maple_side" }, - "axis=side_90,woodtype=maple": { "model": "forestry:arboriculture/logs/maple_side", "y": 90 }, - //citrus - "axis=normal,woodtype=citrus": { "model": "forestry:arboriculture/logs/citrus" }, - "axis=side,woodtype=citrus": { "model": "forestry:arboriculture/logs/citrus_side" }, - "axis=side_90,woodtype=citrus": { "model": "forestry:arboriculture/logs/citrus_side", "y": 90 }, - //giganteum - "axis=normal,woodtype=giganteum": { "model": "forestry:arboriculture/logs/giganteum" }, - "axis=side,woodtype=giganteum": { "model": "forestry:arboriculture/logs/giganteum_side" }, - "axis=side_90,woodtype=giganteum": { "model": "forestry:arboriculture/logs/giganteum_side", "y": 90 }, - //ipe - "axis=normal,woodtype=ipe": { "model": "forestry:arboriculture/logs/ipe" }, - "axis=side,woodtype=ipe": { "model": "forestry:arboriculture/logs/ipe_side" }, - "axis=side_90,woodtype=ipe": { "model": "forestry:arboriculture/logs/ipe_side", "y": 90 }, - //padauk - "axis=normal,woodtype=padauk": { "model": "forestry:arboriculture/logs/padauk" }, - "axis=side,woodtype=padauk": { "model": "forestry:arboriculture/logs/padauk_side" }, - "axis=side_90,woodtype=padauk": { "model": "forestry:arboriculture/logs/padauk_side", "y": 90 }, - //cocobolo - "axis=normal,woodtype=cocobolo": { "model": "forestry:arboriculture/logs/cocobolo" }, - "axis=side,woodtype=cocobolo": { "model": "forestry:arboriculture/logs/cocobolo_side" }, - "axis=side_90,woodtype=cocobolo": { "model": "forestry:arboriculture/logs/cocobolo_side", "y": 90 }, - //zebrawood - "axis=normal,woodtype=zebrawood": { "model": "forestry:arboriculture/logs/zebrawood" }, - "axis=side,woodtype=zebrawood": { "model": "forestry:arboriculture/logs/zebrawood_side" }, - "axis=side_90,woodtype=zebrawood": { "model": "forestry:arboriculture/logs/zebrawood_side", "y": 90 } + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block" + }, + "variants": { + "axis=normal,woodtype=acacia": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.acacia", + "end": "forestry:blocks/wood/heart.acacia" + } + }, + "axis=normal,woodtype=balsa": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.balsa", + "end": "forestry:blocks/wood/heart.balsa" + } + }, + "axis=normal,woodtype=baobab": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.baobab", + "end": "forestry:blocks/wood/heart.baobab" + } + }, + "axis=normal,woodtype=cherry": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.cherry", + "end": "forestry:blocks/wood/heart.cherry" + } + }, + "axis=normal,woodtype=chestnut": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.chestnut", + "end": "forestry:blocks/wood/heart.chestnut" + } + }, + "axis=normal,woodtype=citrus": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.citrus", + "end": "forestry:blocks/wood/heart.citrus" + } + }, + "axis=normal,woodtype=cocobolo": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.cocobolo", + "end": "forestry:blocks/wood/heart.cocobolo" + } + }, + "axis=normal,woodtype=ebony": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.ebony", + "end": "forestry:blocks/wood/heart.ebony" + } + }, + "axis=normal,woodtype=giganteum": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.giganteum", + "end": "forestry:blocks/wood/heart.giganteum" + } + }, + "axis=normal,woodtype=greenheart": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.greenheart", + "end": "forestry:blocks/wood/heart.greenheart" + } + }, + "axis=normal,woodtype=ipe": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.ipe", + "end": "forestry:blocks/wood/heart.ipe" + } + }, + "axis=normal,woodtype=kapok": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.kapok", + "end": "forestry:blocks/wood/heart.kapok" + } + }, + "axis=normal,woodtype=larch": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.larch", + "end": "forestry:blocks/wood/heart.larch" + } + }, + "axis=normal,woodtype=lime": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.lime", + "end": "forestry:blocks/wood/heart.lime" + } + }, + "axis=normal,woodtype=mahoe": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.mahoe", + "end": "forestry:blocks/wood/heart.mahoe" + } + }, + "axis=normal,woodtype=mahogany": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.mahogany", + "end": "forestry:blocks/wood/heart.mahogany" + } + }, + "axis=normal,woodtype=maple": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.maple", + "end": "forestry:blocks/wood/heart.maple" + } + }, + "axis=normal,woodtype=padauk": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.padauk", + "end": "forestry:blocks/wood/heart.padauk" + } + }, + "axis=normal,woodtype=palm": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.palm", + "end": "forestry:blocks/wood/heart.palm" + } + }, + "axis=normal,woodtype=papaya": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.papaya", + "end": "forestry:blocks/wood/heart.papaya" + } + }, + "axis=normal,woodtype=pine": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.pine", + "end": "forestry:blocks/wood/heart.pine" + } + }, + "axis=normal,woodtype=plum": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.plum", + "end": "forestry:blocks/wood/heart.plum" + } + }, + "axis=normal,woodtype=poplar": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.poplar", + "end": "forestry:blocks/wood/heart.poplar" + } + }, + "axis=normal,woodtype=sequoia": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.sequoia", + "end": "forestry:blocks/wood/heart.sequoia" + } + }, + "axis=normal,woodtype=teak": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.teak", + "end": "forestry:blocks/wood/heart.teak" + } + }, + "axis=normal,woodtype=walnut": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.walnut", + "end": "forestry:blocks/wood/heart.walnut" + } + }, + "axis=normal,woodtype=wenge": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.wenge", + "end": "forestry:blocks/wood/heart.wenge" + } + }, + "axis=normal,woodtype=willow": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.willow", + "end": "forestry:blocks/wood/heart.willow" + } + }, + "axis=normal,woodtype=zebrawood": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.zebrawood", + "end": "forestry:blocks/wood/heart.zebrawood" + } + }, + "axis=side,woodtype=acacia": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.acacia", + "end": "forestry:blocks/wood/heart.acacia" + } + }, + "axis=side,woodtype=balsa": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.balsa", + "end": "forestry:blocks/wood/heart.balsa" + } + }, + "axis=side,woodtype=baobab": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.baobab", + "end": "forestry:blocks/wood/heart.baobab" + } + }, + "axis=side,woodtype=cherry": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.cherry", + "end": "forestry:blocks/wood/heart.cherry" + } + }, + "axis=side,woodtype=chestnut": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.chestnut", + "end": "forestry:blocks/wood/heart.chestnut" + } + }, + "axis=side,woodtype=citrus": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.citrus", + "end": "forestry:blocks/wood/heart.citrus" + } + }, + "axis=side,woodtype=cocobolo": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.cocobolo", + "end": "forestry:blocks/wood/heart.cocobolo" + } + }, + "axis=side,woodtype=ebony": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.ebony", + "end": "forestry:blocks/wood/heart.ebony" + } + }, + "axis=side,woodtype=giganteum": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.giganteum", + "end": "forestry:blocks/wood/heart.giganteum" + } + }, + "axis=side,woodtype=greenheart": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.greenheart", + "end": "forestry:blocks/wood/heart.greenheart" + } + }, + "axis=side,woodtype=ipe": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.ipe", + "end": "forestry:blocks/wood/heart.ipe" + } + }, + "axis=side,woodtype=kapok": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.kapok", + "end": "forestry:blocks/wood/heart.kapok" + } + }, + "axis=side,woodtype=larch": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.larch", + "end": "forestry:blocks/wood/heart.larch" + } + }, + "axis=side,woodtype=lime": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.lime", + "end": "forestry:blocks/wood/heart.lime" + } + }, + "axis=side,woodtype=mahoe": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.mahoe", + "end": "forestry:blocks/wood/heart.mahoe" + } + }, + "axis=side,woodtype=mahogany": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.mahogany", + "end": "forestry:blocks/wood/heart.mahogany" + } + }, + "axis=side,woodtype=maple": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.maple", + "end": "forestry:blocks/wood/heart.maple" + } + }, + "axis=side,woodtype=padauk": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.padauk", + "end": "forestry:blocks/wood/heart.padauk" + } + }, + "axis=side,woodtype=palm": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.palm", + "end": "forestry:blocks/wood/heart.palm" + } + }, + "axis=side,woodtype=papaya": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.papaya", + "end": "forestry:blocks/wood/heart.papaya" + } + }, + "axis=side,woodtype=pine": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.pine", + "end": "forestry:blocks/wood/heart.pine" + } + }, + "axis=side,woodtype=plum": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.plum", + "end": "forestry:blocks/wood/heart.plum" + } + }, + "axis=side,woodtype=poplar": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.poplar", + "end": "forestry:blocks/wood/heart.poplar" + } + }, + "axis=side,woodtype=sequoia": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.sequoia", + "end": "forestry:blocks/wood/heart.sequoia" + } + }, + "axis=side,woodtype=teak": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.teak", + "end": "forestry:blocks/wood/heart.teak" + } + }, + "axis=side,woodtype=walnut": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.walnut", + "end": "forestry:blocks/wood/heart.walnut" + } + }, + "axis=side,woodtype=wenge": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.wenge", + "end": "forestry:blocks/wood/heart.wenge" + } + }, + "axis=side,woodtype=willow": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.willow", + "end": "forestry:blocks/wood/heart.willow" + } + }, + "axis=side,woodtype=zebrawood": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.zebrawood", + "end": "forestry:blocks/wood/heart.zebrawood" + } + }, + "axis=side_90,woodtype=acacia": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.acacia", + "end": "forestry:blocks/wood/heart.acacia" + } + }, + "axis=side_90,woodtype=balsa": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.balsa", + "end": "forestry:blocks/wood/heart.balsa" + } + }, + "axis=side_90,woodtype=baobab": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.baobab", + "end": "forestry:blocks/wood/heart.baobab" + } + }, + "axis=side_90,woodtype=cherry": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.cherry", + "end": "forestry:blocks/wood/heart.cherry" + } + }, + "axis=side_90,woodtype=chestnut": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.chestnut", + "end": "forestry:blocks/wood/heart.chestnut" + } + }, + "axis=side_90,woodtype=citrus": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.citrus", + "end": "forestry:blocks/wood/heart.citrus" + } + }, + "axis=side_90,woodtype=cocobolo": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.cocobolo", + "end": "forestry:blocks/wood/heart.cocobolo" + } + }, + "axis=side_90,woodtype=ebony": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.ebony", + "end": "forestry:blocks/wood/heart.ebony" + } + }, + "axis=side_90,woodtype=giganteum": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.giganteum", + "end": "forestry:blocks/wood/heart.giganteum" + } + }, + "axis=side_90,woodtype=greenheart": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.greenheart", + "end": "forestry:blocks/wood/heart.greenheart" + } + }, + "axis=side_90,woodtype=ipe": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.ipe", + "end": "forestry:blocks/wood/heart.ipe" + } + }, + "axis=side_90,woodtype=kapok": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.kapok", + "end": "forestry:blocks/wood/heart.kapok" + } + }, + "axis=side_90,woodtype=larch": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.larch", + "end": "forestry:blocks/wood/heart.larch" + } + }, + "axis=side_90,woodtype=lime": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.lime", + "end": "forestry:blocks/wood/heart.lime" + } + }, + "axis=side_90,woodtype=mahoe": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.mahoe", + "end": "forestry:blocks/wood/heart.mahoe" + } + }, + "axis=side_90,woodtype=mahogany": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.mahogany", + "end": "forestry:blocks/wood/heart.mahogany" + } + }, + "axis=side_90,woodtype=maple": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.maple", + "end": "forestry:blocks/wood/heart.maple" + } + }, + "axis=side_90,woodtype=padauk": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.padauk", + "end": "forestry:blocks/wood/heart.padauk" + } + }, + "axis=side_90,woodtype=palm": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.palm", + "end": "forestry:blocks/wood/heart.palm" + } + }, + "axis=side_90,woodtype=papaya": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.papaya", + "end": "forestry:blocks/wood/heart.papaya" + } + }, + "axis=side_90,woodtype=pine": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.pine", + "end": "forestry:blocks/wood/heart.pine" + } + }, + "axis=side_90,woodtype=plum": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.plum", + "end": "forestry:blocks/wood/heart.plum" + } + }, + "axis=side_90,woodtype=poplar": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.poplar", + "end": "forestry:blocks/wood/heart.poplar" + } + }, + "axis=side_90,woodtype=sequoia": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.sequoia", + "end": "forestry:blocks/wood/heart.sequoia" + } + }, + "axis=side_90,woodtype=teak": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.teak", + "end": "forestry:blocks/wood/heart.teak" + } + }, + "axis=side_90,woodtype=walnut": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.walnut", + "end": "forestry:blocks/wood/heart.walnut" + } + }, + "axis=side_90,woodtype=wenge": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.wenge", + "end": "forestry:blocks/wood/heart.wenge" + } + }, + "axis=side_90,woodtype=willow": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.willow", + "end": "forestry:blocks/wood/heart.willow" + } + }, + "axis=side_90,woodtype=zebrawood": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.zebrawood", + "end": "forestry:blocks/wood/heart.zebrawood" + }, + "y": 90 } + } } diff --git a/src/main/resources/assets/forestry/blockstates/logsFireproof.json b/src/main/resources/assets/forestry/blockstates/logsFireproof.json index 212bd0fa2..77f99dd3b 100644 --- a/src/main/resources/assets/forestry/blockstates/logsFireproof.json +++ b/src/main/resources/assets/forestry/blockstates/logsFireproof.json @@ -1,120 +1,646 @@ { - "variants": { - //larch - "axis=normal,woodtype=larch": { "model": "forestry:arboriculture/logs/larch" }, - "axis=side,woodtype=larch": { "model": "forestry:arboriculture/logs/larch_side" }, - "axis=side_90,woodtype=larch": { "model": "forestry:arboriculture/logs/larch_side", "y": 90 }, - //teak - "axis=normal,woodtype=teak": { "model": "forestry:arboriculture/logs/teak" }, - "axis=side,woodtype=teak": { "model": "forestry:arboriculture/logs/teak_side" }, - "axis=side_90,woodtype=teak": { "model": "forestry:arboriculture/logs/teak_side", "y": 90 }, - //acacia - "axis=normal,woodtype=acacia": { "model": "forestry:arboriculture/logs/acacia" }, - "axis=side,woodtype=acacia": { "model": "forestry:arboriculture/logs/acacia_side" }, - "axis=side_90,woodtype=acacia": { "model": "forestry:arboriculture/logs/acacia_side", "y": 90 }, - //lime - "axis=normal,woodtype=lime": { "model": "forestry:arboriculture/logs/lime" }, - "axis=side,woodtype=lime": { "model": "forestry:arboriculture/logs/lime_side" }, - "axis=side_90,woodtype=lime": { "model": "forestry:arboriculture/logs/lime_side", "y": 90 }, - //chestnut - "axis=normal,woodtype=chestnut": { "model": "forestry:arboriculture/logs/chestnut" }, - "axis=side,woodtype=chestnut": { "model": "forestry:arboriculture/logs/chestnut_side" }, - "axis=side_90,woodtype=chestnut": { "model": "forestry:arboriculture/logs/chestnut_side", "y": 90 }, - //wenge - "axis=normal,woodtype=wenge": { "model": "forestry:arboriculture/logs/wenge" }, - "axis=side,woodtype=wenge": { "model": "forestry:arboriculture/logs/wenge_side" }, - "axis=side_90,woodtype=wenge": { "model": "forestry:arboriculture/logs/wenge_side", "y": 90 }, - //baobab - "axis=normal,woodtype=baobab": { "model": "forestry:arboriculture/logs/baobab" }, - "axis=side,woodtype=baobab": { "model": "forestry:arboriculture/logs/baobab_side" }, - "axis=side_90,woodtype=baobab": { "model": "forestry:arboriculture/logs/baobab_side", "y": 90 },# - //sequoia - "axis=normal,woodtype=sequoia": { "model": "forestry:arboriculture/logs/sequoia" }, - "axis=side,woodtype=sequoia": { "model": "forestry:arboriculture/logs/sequoia_side" }, - "axis=side_90,woodtype=sequoia": { "model": "forestry:arboriculture/logs/sequoia_side", "y": 90 }, - //kapok - "axis=normal,woodtype=kapok": { "model": "forestry:arboriculture/logs/kapok" }, - "axis=side,woodtype=kapok": { "model": "forestry:arboriculture/logs/kapok_side" }, - "axis=side_90,woodtype=kapok": { "model": "forestry:arboriculture/logs/kapok_side", "y": 90 }, - //ebony - "axis=normal,woodtype=ebony": { "model": "forestry:arboriculture/logs/ebony" }, - "axis=side,woodtype=ebony": { "model": "forestry:arboriculture/logs/ebony_side" }, - "axis=side_90,woodtype=ebony": { "model": "forestry:arboriculture/logs/ebony_side", "y": 90 }, - //mahogany - "axis=normal,woodtype=mahogany": { "model": "forestry:arboriculture/logs/mahogany" }, - "axis=side,woodtype=mahogany": { "model": "forestry:arboriculture/logs/mahogany_side" }, - "axis=side_90,woodtype=mahogany": { "model": "forestry:arboriculture/logs/mahogany_side", "y": 90 }, - //balsa - "axis=normal,woodtype=balsa": { "model": "forestry:arboriculture/logs/balsa" }, - "axis=side,woodtype=balsa": { "model": "forestry:arboriculture/logs/balsa_side" }, - "axis=side_90,woodtype=balsa": { "model": "forestry:arboriculture/logs/balsa_side", "y": 90 }, - //willow - "axis=normal,woodtype=willow": { "model": "forestry:arboriculture/logs/willow" }, - "axis=side,woodtype=willow": { "model": "forestry:arboriculture/logs/willow_side" }, - "axis=side_90,woodtype=willow": { "model": "forestry:arboriculture/logs/willow_side", "y": 90 }, - //walnut - "axis=normal,woodtype=walnut": { "model": "forestry:arboriculture/logs/walnut" }, - "axis=side,woodtype=walnut": { "model": "forestry:arboriculture/logs/walnut_side" }, - "axis=side_90,woodtype=walnut": { "model": "forestry:arboriculture/logs/walnut_side", "y": 90 }, - //greenheart - "axis=normal,woodtype=greenheart": { "model": "forestry:arboriculture/logs/greenheart" }, - "axis=side,woodtype=greenheart": { "model": "forestry:arboriculture/logs/greenheart_side" }, - "axis=side_90,woodtype=greenheart": { "model": "forestry:arboriculture/logs/greenheart_side", "y": 90 }, - //cherry - "axis=normal,woodtype=cherry": { "model": "forestry:arboriculture/logs/cherry" }, - "axis=side,woodtype=cherry": { "model": "forestry:arboriculture/logs/cherry_side" }, - "axis=side_90,woodtype=cherry": { "model": "forestry:arboriculture/logs/cherry_side", "y": 90 }, - //mahoe - "axis=normal,woodtype=mahoe": { "model": "forestry:arboriculture/logs/mahoe" }, - "axis=side,woodtype=mahoe": { "model": "forestry:arboriculture/logs/mahoe_side" }, - "axis=side_90,woodtype=mahoe": { "model": "forestry:arboriculture/logs/mahoe_side", "y": 90 }, - //poplar - "axis=normal,woodtype=poplar": { "model": "forestry:arboriculture/logs/poplar" }, - "axis=side,woodtype=poplar": { "model": "forestry:arboriculture/logs/poplar_side" }, - "axis=side_90,woodtype=poplar": { "model": "forestry:arboriculture/logs/poplar_side", "y": 90 }, - //palm - "axis=normal,woodtype=palm": { "model": "forestry:arboriculture/logs/palm" }, - "axis=side,woodtype=palm": { "model": "forestry:arboriculture/logs/palm_side" }, - "axis=side_90,woodtype=palm": { "model": "forestry:arboriculture/logs/palm_side", "y": 90 }, - //papaya - "axis=normal,woodtype=papaya": { "model": "forestry:arboriculture/logs/papaya" }, - "axis=side,woodtype=papaya": { "model": "forestry:arboriculture/logs/papaya_side" }, - "axis=side_90,woodtype=papaya": { "model": "forestry:arboriculture/logs/papaya_side", "y": 90 }, - //pine - "axis=normal,woodtype=pine": { "model": "forestry:arboriculture/logs/pine" }, - "axis=side,woodtype=pine": { "model": "forestry:arboriculture/logs/pine_side" }, - "axis=side_90,woodtype=pine": { "model": "forestry:arboriculture/logs/pine_side", "y": 90 }, - //plum - "axis=normal,woodtype=plum": { "model": "forestry:arboriculture/logs/plum" }, - "axis=side,woodtype=plum": { "model": "forestry:arboriculture/logs/plum_side" }, - "axis=side_90,woodtype=plum": { "model": "forestry:arboriculture/logs/plum_side", "y": 90 }, - //maple - "axis=normal,woodtype=maple": { "model": "forestry:arboriculture/logs/maple" }, - "axis=side,woodtype=maple": { "model": "forestry:arboriculture/logs/maple_side" }, - "axis=side_90,woodtype=maple": { "model": "forestry:arboriculture/logs/maple_side", "y": 90 }, - //citrus - "axis=normal,woodtype=citrus": { "model": "forestry:arboriculture/logs/citrus" }, - "axis=side,woodtype=citrus": { "model": "forestry:arboriculture/logs/citrus_side" }, - "axis=side_90,woodtype=citrus": { "model": "forestry:arboriculture/logs/citrus_side", "y": 90 }, - //giganteum - "axis=normal,woodtype=giganteum": { "model": "forestry:arboriculture/logs/giganteum" }, - "axis=side,woodtype=giganteum": { "model": "forestry:arboriculture/logs/giganteum_side" }, - "axis=side_90,woodtype=giganteum": { "model": "forestry:arboriculture/logs/giganteum_side", "y": 90 }, - //ipe - "axis=normal,woodtype=ipe": { "model": "forestry:arboriculture/logs/ipe" }, - "axis=side,woodtype=ipe": { "model": "forestry:arboriculture/logs/ipe_side" }, - "axis=side_90,woodtype=ipe": { "model": "forestry:arboriculture/logs/ipe_side", "y": 90 }, - //padauk - "axis=normal,woodtype=padauk": { "model": "forestry:arboriculture/logs/padauk" }, - "axis=side,woodtype=padauk": { "model": "forestry:arboriculture/logs/padauk_side" }, - "axis=side_90,woodtype=padauk": { "model": "forestry:arboriculture/logs/padauk_side", "y": 90 }, - //cocobolo - "axis=normal,woodtype=cocobolo": { "model": "forestry:arboriculture/logs/cocobolo" }, - "axis=side,woodtype=cocobolo": { "model": "forestry:arboriculture/logs/cocobolo_side" }, - "axis=side_90,woodtype=cocobolo": { "model": "forestry:arboriculture/logs/cocobolo_side", "y": 90 }, - //zebrawood - "axis=normal,woodtype=zebrawood": { "model": "forestry:arboriculture/logs/zebrawood" }, - "axis=side,woodtype=zebrawood": { "model": "forestry:arboriculture/logs/zebrawood_side" }, - "axis=side_90,woodtype=zebrawood": { "model": "forestry:arboriculture/logs/zebrawood_side", "y": 90 } + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block" + }, + "variants": { + "axis=normal,woodtype=larch": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.larch", + "end": "forestry:blocks/wood/heart.larch" + } + }, + "axis=side,woodtype=larch": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.larch", + "end": "forestry:blocks/wood/heart.larch" + } + }, + "axis=side_90,woodtype=larch": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.larch", + "end": "forestry:blocks/wood/heart.larch" + } + }, + "axis=normal,woodtype=teak": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.teak", + "end": "forestry:blocks/wood/heart.teak" + } + }, + "axis=side,woodtype=teak": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.teak", + "end": "forestry:blocks/wood/heart.teak" + } + }, + "axis=side_90,woodtype=teak": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.teak", + "end": "forestry:blocks/wood/heart.teak" + } + }, + "axis=normal,woodtype=acacia": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.acacia", + "end": "forestry:blocks/wood/heart.acacia" + } + }, + "axis=side,woodtype=acacia": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.acacia", + "end": "forestry:blocks/wood/heart.acacia" + } + }, + "axis=side_90,woodtype=acacia": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.acacia", + "end": "forestry:blocks/wood/heart.acacia" + } + }, + "axis=normal,woodtype=lime": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.lime", + "end": "forestry:blocks/wood/heart.lime" + } + }, + "axis=side,woodtype=lime": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.lime", + "end": "forestry:blocks/wood/heart.lime" + } + }, + "axis=side_90,woodtype=lime": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.lime", + "end": "forestry:blocks/wood/heart.lime" + } + }, + "axis=normal,woodtype=chestnut": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.chestnut", + "end": "forestry:blocks/wood/heart.chestnut" + } + }, + "axis=side,woodtype=chestnut": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.chestnut", + "end": "forestry:blocks/wood/heart.chestnut" + } + }, + "axis=side_90,woodtype=chestnut": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.chestnut", + "end": "forestry:blocks/wood/heart.chestnut" + } + }, + "axis=normal,woodtype=wenge": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.wenge", + "end": "forestry:blocks/wood/heart.wenge" + } + }, + "axis=side,woodtype=wenge": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.wenge", + "end": "forestry:blocks/wood/heart.wenge" + } + }, + "axis=side_90,woodtype=wenge": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.wenge", + "end": "forestry:blocks/wood/heart.wenge" + } + }, + "axis=normal,woodtype=baobab": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.baobab", + "end": "forestry:blocks/wood/heart.baobab" + } + }, + "axis=side,woodtype=baobab": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.baobab", + "end": "forestry:blocks/wood/heart.baobab" + } + }, + "axis=side_90,woodtype=baobab": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.baobab", + "end": "forestry:blocks/wood/heart.baobab" + } + }, + "axis=normal,woodtype=sequoia": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.sequoia", + "end": "forestry:blocks/wood/heart.sequoia" + } + }, + "axis=side,woodtype=sequoia": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.sequoia", + "end": "forestry:blocks/wood/heart.sequoia" + } + }, + "axis=side_90,woodtype=sequoia": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.sequoia", + "end": "forestry:blocks/wood/heart.sequoia" + } + }, + "axis=normal,woodtype=kapok": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.kapok", + "end": "forestry:blocks/wood/heart.kapok" + } + }, + "axis=side,woodtype=kapok": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.kapok", + "end": "forestry:blocks/wood/heart.kapok" + } + }, + "axis=side_90,woodtype=kapok": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.kapok", + "end": "forestry:blocks/wood/heart.kapok" + } + }, + "axis=normal,woodtype=ebony": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.ebony", + "end": "forestry:blocks/wood/heart.ebony" + } + }, + "axis=side,woodtype=ebony": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.ebony", + "end": "forestry:blocks/wood/heart.ebony" + } + }, + "axis=side_90,woodtype=ebony": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.ebony", + "end": "forestry:blocks/wood/heart.ebony" + } + }, + "axis=normal,woodtype=mahogany": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.mahogany", + "end": "forestry:blocks/wood/heart.mahogany" + } + }, + "axis=side,woodtype=mahogany": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.mahogany", + "end": "forestry:blocks/wood/heart.mahogany" + } + }, + "axis=side_90,woodtype=mahogany": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.mahogany", + "end": "forestry:blocks/wood/heart.mahogany" + } + }, + "axis=normal,woodtype=balsa": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.balsa", + "end": "forestry:blocks/wood/heart.balsa" + } + }, + "axis=side,woodtype=balsa": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.balsa", + "end": "forestry:blocks/wood/heart.balsa" + } + }, + "axis=side_90,woodtype=balsa": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.balsa", + "end": "forestry:blocks/wood/heart.balsa" + } + }, + "axis=normal,woodtype=willow": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.willow", + "end": "forestry:blocks/wood/heart.willow" + } + }, + "axis=side,woodtype=willow": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.willow", + "end": "forestry:blocks/wood/heart.willow" + } + }, + "axis=side_90,woodtype=willow": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.willow", + "end": "forestry:blocks/wood/heart.willow" + } + }, + "axis=normal,woodtype=walnut": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.walnut", + "end": "forestry:blocks/wood/heart.walnut" + } + }, + "axis=side,woodtype=walnut": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.walnut", + "end": "forestry:blocks/wood/heart.walnut" + } + }, + "axis=side_90,woodtype=walnut": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.walnut", + "end": "forestry:blocks/wood/heart.walnut" + } + }, + "axis=normal,woodtype=greenheart": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.greenheart", + "end": "forestry:blocks/wood/heart.greenheart" + } + }, + "axis=side,woodtype=greenheart": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.greenheart", + "end": "forestry:blocks/wood/heart.greenheart" + } + }, + "axis=side_90,woodtype=greenheart": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.greenheart", + "end": "forestry:blocks/wood/heart.greenheart" + } + }, + "axis=normal,woodtype=cherry": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.cherry", + "end": "forestry:blocks/wood/heart.cherry" + } + }, + "axis=side,woodtype=cherry": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.cherry", + "end": "forestry:blocks/wood/heart.cherry" + } + }, + "axis=side_90,woodtype=cherry": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.cherry", + "end": "forestry:blocks/wood/heart.cherry" + } + }, + "axis=normal,woodtype=mahoe": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.mahoe", + "end": "forestry:blocks/wood/heart.mahoe" + } + }, + "axis=side,woodtype=mahoe": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.mahoe", + "end": "forestry:blocks/wood/heart.mahoe" + } + }, + "axis=side_90,woodtype=mahoe": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.mahoe", + "end": "forestry:blocks/wood/heart.mahoe" + } + }, + "axis=normal,woodtype=poplar": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.poplar", + "end": "forestry:blocks/wood/heart.poplar" + } + }, + "axis=side,woodtype=poplar": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.poplar", + "end": "forestry:blocks/wood/heart.poplar" + } + }, + "axis=side_90,woodtype=poplar": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.poplar", + "end": "forestry:blocks/wood/heart.poplar" + } + }, + "axis=normal,woodtype=palm": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.palm", + "end": "forestry:blocks/wood/heart.palm" + } + }, + "axis=side,woodtype=palm": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.palm", + "end": "forestry:blocks/wood/heart.palm" + } + }, + "axis=side_90,woodtype=palm": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.palm", + "end": "forestry:blocks/wood/heart.palm" + } + }, + "axis=normal,woodtype=papaya": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.papaya", + "end": "forestry:blocks/wood/heart.papaya" + } + }, + "axis=side,woodtype=papaya": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.papaya", + "end": "forestry:blocks/wood/heart.papaya" + } + }, + "axis=side_90,woodtype=papaya": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.papaya", + "end": "forestry:blocks/wood/heart.papaya" + } + }, + "axis=normal,woodtype=pine": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.pine", + "end": "forestry:blocks/wood/heart.pine" + } + }, + "axis=side,woodtype=pine": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.pine", + "end": "forestry:blocks/wood/heart.pine" + } + }, + "axis=side_90,woodtype=pine": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.pine", + "end": "forestry:blocks/wood/heart.pine" + } + }, + "axis=normal,woodtype=plum": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.plum", + "end": "forestry:blocks/wood/heart.plum" + } + }, + "axis=side,woodtype=plum": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.plum", + "end": "forestry:blocks/wood/heart.plum" + } + }, + "axis=side_90,woodtype=plum": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.plum", + "end": "forestry:blocks/wood/heart.plum" + } + }, + "axis=normal,woodtype=maple": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.maple", + "end": "forestry:blocks/wood/heart.maple" + } + }, + "axis=side,woodtype=maple": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.maple", + "end": "forestry:blocks/wood/heart.maple" + } + }, + "axis=side_90,woodtype=maple": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.maple", + "end": "forestry:blocks/wood/heart.maple" + } + }, + "axis=normal,woodtype=citrus": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.citrus", + "end": "forestry:blocks/wood/heart.citrus" + } + }, + "axis=side,woodtype=citrus": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.citrus", + "end": "forestry:blocks/wood/heart.citrus" + } + }, + "axis=side_90,woodtype=citrus": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.citrus", + "end": "forestry:blocks/wood/heart.citrus" + } + }, + "axis=normal,woodtype=giganteum": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.giganteum", + "end": "forestry:blocks/wood/heart.giganteum" + } + }, + "axis=side,woodtype=giganteum": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.giganteum", + "end": "forestry:blocks/wood/heart.giganteum" + } + }, + "axis=side_90,woodtype=giganteum": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.giganteum", + "end": "forestry:blocks/wood/heart.giganteum" + } + }, + "axis=normal,woodtype=ipe": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.ipe", + "end": "forestry:blocks/wood/heart.ipe" + } + }, + "axis=side,woodtype=ipe": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.ipe", + "end": "forestry:blocks/wood/heart.ipe" + } + }, + "axis=side_90,woodtype=ipe": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.ipe", + "end": "forestry:blocks/wood/heart.ipe" + } + }, + "axis=normal,woodtype=padauk": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.padauk", + "end": "forestry:blocks/wood/heart.padauk" + } + }, + "axis=side,woodtype=padauk": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.padauk", + "end": "forestry:blocks/wood/heart.padauk" + } + }, + "axis=side_90,woodtype=padauk": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.padauk", + "end": "forestry:blocks/wood/heart.padauk" + } + }, + "axis=normal,woodtype=cocobolo": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.cocobolo", + "end": "forestry:blocks/wood/heart.cocobolo" + } + }, + "axis=side,woodtype=cocobolo": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.cocobolo", + "end": "forestry:blocks/wood/heart.cocobolo" + } + }, + "axis=side_90,woodtype=cocobolo": { + "model": "column_side", + "y": 90, + "textures": { + "side": "forestry:blocks/wood/bark.cocobolo", + "end": "forestry:blocks/wood/heart.cocobolo" + } + }, + "axis=normal,woodtype=zebrawood": { + "model": "cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.zebrawood", + "end": "forestry:blocks/wood/heart.zebrawood" + } + }, + "axis=side,woodtype=zebrawood": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.zebrawood", + "end": "forestry:blocks/wood/heart.zebrawood" + } + }, + "axis=side_90,woodtype=zebrawood": { + "model": "column_side", + "textures": { + "side": "forestry:blocks/wood/bark.zebrawood", + "end": "forestry:blocks/wood/heart.zebrawood" + }, + "y": 90 } + } } diff --git a/src/main/resources/assets/forestry/blockstates/mail_stamp.collector.json b/src/main/resources/assets/forestry/blockstates/mail_stamp.collector.json new file mode 100644 index 000000000..06c7099f1 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/mail_stamp.collector.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:mail_stamp.collector" }, + "face=east": { "model": "forestry:mail_stamp.collector", "y": 90 }, + "face=south": { "model": "forestry:mail_stamp.collector", "y": 180 }, + "face=west": { "model": "forestry:mail_stamp.collector", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/mail_trade.station.json b/src/main/resources/assets/forestry/blockstates/mail_trade.station.json new file mode 100644 index 000000000..88cf17807 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/mail_trade.station.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:mail_trade.station" }, + "face=east": { "model": "forestry:mail_trade.station", "y": 90 }, + "face=south": { "model": "forestry:mail_trade.station", "y": 180 }, + "face=west": { "model": "forestry:mail_trade.station", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/mail_tradestation.json b/src/main/resources/assets/forestry/blockstates/mail_tradestation.json deleted file mode 100644 index 27fb59eca..000000000 --- a/src/main/resources/assets/forestry/blockstates/mail_tradestation.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "face=north": { "model": "forestry:mail_tradestation" }, - "face=east": { "model": "forestry:mail_tradestation", "y": 90 }, - "face=south": { "model": "forestry:mail_tradestation", "y": 180 }, - "face=west": { "model": "forestry:mail_tradestation", "y": -90 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/mushroom.json b/src/main/resources/assets/forestry/blockstates/mushroom.json new file mode 100644 index 000000000..444533882 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/mushroom.json @@ -0,0 +1,6 @@ +{ + "variants": { + "mushroom=brown": { "model": "brown_mushroom" }, + "mushroom=red": { "model": "red_mushroom" } + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture_beehouse.json b/src/main/resources/assets/forestry/models/block/apiculture_bee.house.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/apiculture_beehouse.json rename to src/main/resources/assets/forestry/models/block/apiculture_bee.house.json diff --git a/src/main/resources/assets/forestry/models/block/apiculture_bee_house.json b/src/main/resources/assets/forestry/models/block/apiculture_bee_house.json new file mode 100644 index 000000000..49f9ae61c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture_bee_house.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/beehouse.4", + "down": "forestry:blocks/beehouse.0", + "up": "forestry:blocks/beehouse.1", + "north": "forestry:blocks/beehouse.2", + "east": "forestry:blocks/beehouse.4", + "south": "forestry:blocks/beehouse.4", + "west": "forestry:blocks/beehouse.4" + } +} diff --git a/src/main/resources/assets/forestry/models/block/machine.json b/src/main/resources/assets/forestry/models/block/machine.json deleted file mode 100644 index 74b48ff62..000000000 --- a/src/main/resources/assets/forestry/models/block/machine.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "elements": [ - { - "name": "tank_resource", - "from": [ 2.0, 2.0, 0.0 ], - "to": [ 8.0, 14.0, 16.0 ], - "faces": { - "north": { "texture": "#machine", "uv": [ 1.5, 10.5, 4.5, 12.0 ], "rotation": 270 }, - "east": { "texture": "#machine", "uv": [ 6.0, 12.0, 9.0, 16.0 ], "rotation": 90 }, - "south": { "texture": "#machine", "uv": [ 4.5, 10.5, 7.5, 12.0 ], "rotation": 270 }, - "west": { "texture": "#machine", "uv": [ 1.5, 12.0, 4.5, 16.0 ], "rotation": 270 }, - "up": { "texture": "#machine", "uv": [ 0.0, 12.0, 1.5, 16.0 ] }, - "down": { "texture": "#machine", "uv": [ 4.5, 12.0, 6.0, 16.0 ] } - } - }, - { - "name": "tank_product", - "from": [ 8.0, 2.0, 0.0 ], - "to": [ 14.0, 14.0, 16.0 ], - "faces": { - "north": { "texture": "#machine", "uv": [ 1.5, 5.0, 4.5, 6.5 ], "rotation": 270 }, - "east": { "texture": "#machine", "uv": [ 6.0, 6.5, 9.0, 10.5 ], "rotation": 90 }, - "south": { "texture": "#machine", "uv": [ 4.5, 5.0, 7.5, 6.5 ], "rotation": 270 }, - "west": { "texture": "#machine", "uv": [ 1.5, 6.5, 4.5, 10.5 ] }, - "up": { "texture": "#machine", "uv": [ 0.0, 6.5, 1.5, 10.5 ] }, - "down": { "texture": "#machine", "uv": [ 4.5, 6.5, 6.0, 10.5 ] } - } - }, - { - "name": "basefront", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 16.0, 4.0 ], - "faces": { - "north": { "texture": "#machine", "uv": [ 4.0, 0.0, 8.0, 4.0 ], "rotation": 270 }, - "east": { "texture": "#machine", "uv": [ 0.0, 4.0, 4.0, 5.0 ], "rotation": 270 }, - "south": { "texture": "#machine", "uv": [ 8.0, 0.0, 12.0, 4.0 ], "rotation": 270 }, - "west": { "texture": "#machine", "uv": [ 8.0, 4.0, 12.0, 5.0 ], "rotation": 90 }, - "up": { "texture": "#machine", "uv": [ 12.0, 4.0, 16.0, 5.0 ], "rotation": 180 }, - "down": { "texture": "#machine", "uv": [ 4.0, 4.0, 8.0, 5.0 ] } - } - }, - { - "name": "baseback", - "from": [ 0.0, 0.0, 12.0 ], - "to": [ 16.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#machine", "uv": [ 4.0, 0.0, 8.0, 4.0 ] }, - "east": { "texture": "#machine", "uv": [ 0.0, 4.0, 4.0, 5.0 ], "rotation": 270 }, - "south": { "texture": "#machine", "uv": [ 8.0, 0.0, 12.0, 4.0 ] }, - "west": { "texture": "#machine", "uv": [ 8.0, 4.0, 12.0, 5.0 ], "rotation": 90 }, - "up": { "texture": "#machine", "uv": [ 12.0, 4.0, 16.0, 5.0 ], "rotation": 180 }, - "down": { "texture": "#machine", "uv": [ 4.0, 4.0, 8.0, 5.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/mail_philatelist.json b/src/main/resources/assets/forestry/models/block/mail_stamp.collector.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/mail_philatelist.json rename to src/main/resources/assets/forestry/models/block/mail_stamp.collector.json diff --git a/src/main/resources/assets/forestry/models/block/mail_tradestation.json b/src/main/resources/assets/forestry/models/block/mail_trade.station.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/mail_tradestation.json rename to src/main/resources/assets/forestry/models/block/mail_trade.station.json diff --git a/src/main/resources/assets/forestry/models/item/apicultureChest_apiarist_chest.json b/src/main/resources/assets/forestry/models/item/apicultureChest_api.chest.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/apicultureChest_apiarist_chest.json rename to src/main/resources/assets/forestry/models/item/apicultureChest_api.chest.json diff --git a/src/main/resources/assets/forestry/models/item/apiculture_beehouse.json b/src/main/resources/assets/forestry/models/item/apiculture_bee.house.json similarity index 78% rename from src/main/resources/assets/forestry/models/item/apiculture_beehouse.json rename to src/main/resources/assets/forestry/models/item/apiculture_bee.house.json index 3e2a25cb6..2c10ece09 100644 --- a/src/main/resources/assets/forestry/models/item/apiculture_beehouse.json +++ b/src/main/resources/assets/forestry/models/item/apiculture_bee.house.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/apiculture_beehouse", + "parent": "forestry:block/apiculture_bee.house", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/mail_philatelist.json b/src/main/resources/assets/forestry/models/item/apiculture_bee_house.json similarity index 78% rename from src/main/resources/assets/forestry/models/item/mail_philatelist.json rename to src/main/resources/assets/forestry/models/item/apiculture_bee_house.json index b0eaaeed1..2c10ece09 100644 --- a/src/main/resources/assets/forestry/models/item/mail_philatelist.json +++ b/src/main/resources/assets/forestry/models/item/apiculture_bee_house.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/mail_philatelist", + "parent": "forestry:block/apiculture_bee.house", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/arboriculture_arbchest.json b/src/main/resources/assets/forestry/models/item/arboriculture_arb.chest.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/arboriculture_arbchest.json rename to src/main/resources/assets/forestry/models/item/arboriculture_arb.chest.json diff --git a/src/main/resources/assets/forestry/models/item/butterflyGE.b3d b/src/main/resources/assets/forestry/models/item/butterflyGE.b3d new file mode 100644 index 000000000..40fbfd588 Binary files /dev/null and b/src/main/resources/assets/forestry/models/item/butterflyGE.b3d differ diff --git a/src/main/resources/assets/forestry/models/item/butterflyGE.mtl b/src/main/resources/assets/forestry/models/item/butterflyGE.mtl new file mode 100644 index 000000000..06ce5cb46 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/butterflyGE.mtl @@ -0,0 +1,8 @@ +newmtl ButterflyGE +Ns 0 +Ka 0.000000 0.000000 0.000000 +Kd 0.8 0.8 0.8 +Ks 0.8 0.8 0.8 +d 1 +illum 2 +map_Kd C:\ForestryMC\forestry\src\main\resources\assets\forestry\textures\entity\butterflies\lepiAurora.png diff --git a/src/main/resources/assets/forestry/models/item/butterflyGE.obj b/src/main/resources/assets/forestry/models/item/butterflyGE.obj new file mode 100644 index 000000000..838b619c6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/butterflyGE.obj @@ -0,0 +1,137 @@ +mtllib butterflyGE.mtl +o Butterfly2 +v 0.031250 -0.093750 -0.375000 +v 0.468750 -0.093750 -0.375000 +v 0.468750 -0.093750 0.437500 +v 0.031250 -0.093750 0.437500 +v 0.031250 -0.031250 -0.375000 +v 0.468750 -0.031250 -0.375000 +v 0.468750 -0.031250 0.437500 +v 0.031250 -0.031250 0.437500 +v 0.006250 -0.031250 -0.281250 +v 0.068750 -0.031250 -0.281250 +v 0.068750 -0.031250 -0.218750 +v 0.006250 -0.031250 -0.218750 +v 0.006250 0.031250 -0.281250 +v 0.068750 0.031250 -0.281250 +v 0.068750 0.031250 -0.218750 +v 0.006250 0.031250 -0.218750 +v -0.068750 -0.031250 -0.281250 +v -0.006250 -0.031250 -0.281250 +v -0.006250 -0.031250 -0.218750 +v -0.068750 -0.031250 -0.218750 +v -0.068750 0.031250 -0.281250 +v -0.006250 0.031250 -0.281250 +v -0.006250 0.031250 -0.218750 +v -0.068750 0.031250 -0.218750 +v -0.468750 -0.093750 -0.375000 +v -0.031250 -0.093750 -0.375000 +v -0.031250 -0.093750 0.437500 +v -0.468750 -0.093750 0.437500 +v -0.468750 -0.031250 -0.375000 +v -0.031250 -0.031250 -0.375000 +v -0.031250 -0.031250 0.437500 +v -0.468750 -0.031250 0.437500 +v 0.000000 -0.088388 -0.250000 +v 0.044194 -0.044194 -0.250000 +v 0.044194 -0.044194 0.125000 +v 0.000000 -0.088388 0.125000 +v -0.044194 -0.044194 -0.250000 +v 0.000000 0.000000 -0.250000 +v 0.000000 0.000000 0.125000 +v -0.044194 -0.044194 0.125000 +vt 0.203125 0.593750 +vt 0.203125 0.562500 +vt 0.312500 0.562500 +vt 0.312500 0.593750 +vt 0.000000 0.593750 +vt 0.000000 0.562500 +vt 0.203125 1.000000 +vt 0.312500 1.000000 +vt 0.515625 0.593750 +vt 0.515625 0.562500 +vt 0.625000 0.562500 +vt 0.625000 0.593750 +vt 0.421875 1.000000 +vt 0.421875 0.593750 +vt 0.640625 0.687500 +vt 0.640625 0.656250 +vt 0.656250 0.656250 +vt 0.656250 0.687500 +vt 0.625000 0.687500 +vt 0.625000 0.656250 +vt 0.640625 0.718750 +vt 0.656250 0.718750 +vt 0.671875 0.687500 +vt 0.671875 0.656250 +vt 0.687500 0.656250 +vt 0.687500 0.687500 +vt 0.671875 0.718750 +vt 0.640625 0.750000 +vt 0.656250 0.750000 +vt 0.625000 0.750000 +vt 0.625000 0.718750 +vt 0.640625 0.781250 +vt 0.656250 0.781250 +vt 0.671875 0.750000 +vt 0.687500 0.718750 +vt 0.687500 0.750000 +vt 0.671875 0.781250 +vt 0.203125 0.156250 +vt 0.203125 0.125000 +vt 0.312500 0.125000 +vt 0.312500 0.156250 +vt 0.000000 0.156250 +vt 0.000000 0.125000 +vt 0.515625 0.156250 +vt 0.515625 0.125000 +vt 0.625000 0.125000 +vt 0.625000 0.156250 +vt 0.421875 0.562500 +vt 0.421875 0.156250 +vt 0.718750 0.812500 +vt 0.718750 0.781250 +vt 0.734375 0.781250 +vt 0.734375 0.812500 +vt 0.625000 0.812500 +vt 0.625000 0.781250 +vt 0.718750 1.000000 +vt 0.734375 1.000000 +vt 0.828125 0.812500 +vt 0.828125 0.781250 +vt 0.843750 0.781250 +vt 0.843750 0.812500 +vt 0.750000 1.000000 +vt 0.750000 0.812500 +usemtl None +s off +f 6/1 2/2 1/3 5/4 +f 7/5 3/6 2/2 6/1 +f 7/7 6/1 5/4 8/8 +f 8/9 4/10 3/11 7/12 +f 5/4 1/3 4/10 8/9 +f 2/13 3/14 4/4 1/8 +f 14/15 10/16 9/17 13/18 +f 15/19 11/20 10/16 14/15 +f 15/21 14/15 13/18 16/22 +f 16/23 12/24 11/25 15/26 +f 13/18 9/17 12/24 16/23 +f 10/27 11/23 12/18 9/22 +f 22/28 18/21 17/22 21/29 +f 23/30 19/31 18/21 22/28 +f 23/32 22/28 21/29 24/33 +f 24/34 20/27 19/35 23/36 +f 21/29 17/22 20/27 24/34 +f 18/37 19/34 20/29 17/33 +f 30/38 26/39 25/40 29/41 +f 31/42 27/43 26/39 30/38 +f 31/2 30/38 29/41 32/3 +f 32/44 28/45 27/46 31/47 +f 29/41 25/40 28/45 32/44 +f 26/48 27/49 28/41 25/3 +f 38/50 34/51 33/52 37/53 +f 39/54 35/55 34/51 38/50 +f 39/56 38/50 37/53 40/57 +f 40/58 36/59 35/60 39/61 +f 37/53 33/52 36/59 40/58 +f 34/62 35/63 36/53 33/57 diff --git a/src/main/resources/assets/forestry/models/block/crate-filled.json b/src/main/resources/assets/forestry/models/item/crate-filled.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/crate-filled.json rename to src/main/resources/assets/forestry/models/item/crate-filled.json diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology_lepichest.json b/src/main/resources/assets/forestry/models/item/lepidopterology_lepi.chest.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/lepidopterology_lepichest.json rename to src/main/resources/assets/forestry/models/item/lepidopterology_lepi.chest.json diff --git a/src/main/resources/assets/forestry/models/item/mail_stamp.collector.json b/src/main/resources/assets/forestry/models/item/mail_stamp.collector.json new file mode 100644 index 000000000..9781ee07a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail_stamp.collector.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/mail_stamp.collector", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail_tradestation.json b/src/main/resources/assets/forestry/models/item/mail_trade.station.json similarity index 79% rename from src/main/resources/assets/forestry/models/item/mail_tradestation.json rename to src/main/resources/assets/forestry/models/item/mail_trade.station.json index 038856336..f1d956915 100644 --- a/src/main/resources/assets/forestry/models/item/mail_tradestation.json +++ b/src/main/resources/assets/forestry/models/item/mail_trade.station.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/mail_tradestation", + "parent": "forestry:block/mail_trade.station", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ],