From 96170b5f2193fa182d8fa7f76b4b338d00df15c5 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 21 Feb 2016 18:56:06 +0100 Subject: [PATCH] Fix Crate Models --- .../api/apiculture/FlowerManager.java | 4 - .../api/arboriculture/EnumWoodType.java | 1 - .../api/arboriculture/IFruitProvider.java | 1 - .../java/forestry/api/farming/IFarmLogic.java | 1 - .../api/genetics/IFlowerProvider.java | 2 - .../api/recipes/IFabricatorRecipe.java | 1 - .../multiblock/TileAlvearyClimatiser.java | 1 - .../trigger/TriggerMissingDrone.java | 1 - .../java/forestry/core/items/ItemCrated.java | 7 + .../java/forestry/core/models/ModelCrate.java | 84 ++- .../forestry/core/models/TRSRBakedModel.java | 178 ++++++ .../mail/items/EnumStampDefinition.java | 1 - .../assets/forestry/blockstates/crates.json | 570 ++++++++++++++---- 13 files changed, 670 insertions(+), 182 deletions(-) create mode 100644 src/main/java/forestry/core/models/TRSRBakedModel.java diff --git a/src/main/java/forestry/api/apiculture/FlowerManager.java b/src/main/java/forestry/api/apiculture/FlowerManager.java index 2acaf61de..c3e020307 100644 --- a/src/main/java/forestry/api/apiculture/FlowerManager.java +++ b/src/main/java/forestry/api/apiculture/FlowerManager.java @@ -5,10 +5,6 @@ ******************************************************************************/ package forestry.api.apiculture; -import java.util.ArrayList; - -import net.minecraft.item.ItemStack; - import forestry.api.genetics.IFlowerRegistry; public class FlowerManager { diff --git a/src/main/java/forestry/api/arboriculture/EnumWoodType.java b/src/main/java/forestry/api/arboriculture/EnumWoodType.java index 57b291166..71856bb04 100644 --- a/src/main/java/forestry/api/arboriculture/EnumWoodType.java +++ b/src/main/java/forestry/api/arboriculture/EnumWoodType.java @@ -9,7 +9,6 @@ import java.util.Locale; import java.util.Random; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IStringSerializable; public enum EnumWoodType implements IStringSerializable { diff --git a/src/main/java/forestry/api/arboriculture/IFruitProvider.java b/src/main/java/forestry/api/arboriculture/IFruitProvider.java index ff5916c85..cfffeb9bc 100644 --- a/src/main/java/forestry/api/arboriculture/IFruitProvider.java +++ b/src/main/java/forestry/api/arboriculture/IFruitProvider.java @@ -11,7 +11,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.core.ITextureManager; import forestry.api.genetics.IFruitFamily; public interface IFruitProvider { diff --git a/src/main/java/forestry/api/farming/IFarmLogic.java b/src/main/java/forestry/api/farming/IFarmLogic.java index a6b426ee8..9d9e2755f 100644 --- a/src/main/java/forestry/api/farming/IFarmLogic.java +++ b/src/main/java/forestry/api/farming/IFarmLogic.java @@ -7,7 +7,6 @@ package forestry.api.farming; import java.util.Collection; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/forestry/api/genetics/IFlowerProvider.java b/src/main/java/forestry/api/genetics/IFlowerProvider.java index d7a8967b0..208b3184e 100644 --- a/src/main/java/forestry/api/genetics/IFlowerProvider.java +++ b/src/main/java/forestry/api/genetics/IFlowerProvider.java @@ -5,8 +5,6 @@ ******************************************************************************/ package forestry.api.genetics; -import java.util.Set; - import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/forestry/api/recipes/IFabricatorRecipe.java b/src/main/java/forestry/api/recipes/IFabricatorRecipe.java index e7cab5e0c..d8bacaf80 100644 --- a/src/main/java/forestry/api/recipes/IFabricatorRecipe.java +++ b/src/main/java/forestry/api/recipes/IFabricatorRecipe.java @@ -7,7 +7,6 @@ package forestry.api.recipes; import javax.annotation.Nullable; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java index fd6fe70fd..21fcc6837 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java @@ -19,7 +19,6 @@ import forestry.core.proxy.Proxies; import forestry.core.tiles.IActivatable; import forestry.energy.EnergyManager; -import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyReceiver; public abstract class TileAlvearyClimatiser extends TileAlveary implements IEnergyReceiver, IActivatable, IAlvearyComponent.Climatiser { diff --git a/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java b/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java index cd5055622..0c9be81e8 100644 --- a/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java @@ -15,7 +15,6 @@ import net.minecraft.util.EnumFacing; import forestry.api.core.IErrorLogicSource; import forestry.core.errors.EnumErrorCode; import forestry.core.triggers.Trigger; - import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/src/main/java/forestry/core/items/ItemCrated.java b/src/main/java/forestry/core/items/ItemCrated.java index 0dcbc50de..77c269f8e 100755 --- a/src/main/java/forestry/core/items/ItemCrated.java +++ b/src/main/java/forestry/core/items/ItemCrated.java @@ -81,5 +81,12 @@ public class ItemCrated extends ItemForestry { ModelBakery.registerItemVariants(item, modelLocation); } } + + @Override + public int getColorFromItemStack(ItemStack stack, int renderPass) { + if(getContained() == null || renderPass == 100) + return super.getColorFromItemStack(stack, renderPass); + return getContained().getItem().getColorFromItemStack(getContained(), renderPass); + } } diff --git a/src/main/java/forestry/core/models/ModelCrate.java b/src/main/java/forestry/core/models/ModelCrate.java index 36a6f2954..70f330f99 100644 --- a/src/main/java/forestry/core/models/ModelCrate.java +++ b/src/main/java/forestry/core/models/ModelCrate.java @@ -12,6 +12,7 @@ package forestry.core.models; import java.io.IOException; import java.util.Collection; +import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.IResourceManager; @@ -28,6 +29,7 @@ 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.fml.common.ObfuscationReflectionHelper; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -38,32 +40,29 @@ import com.google.gson.JsonParser; import forestry.core.utils.Log; public class ModelCrate implements IModelCustomData { - public static final ModelCrate instance = new ModelCrate(new ModelResourceLocation("forestry:crates", "crate"), EnumWorldBlockLayer.CUTOUT, "cratedStone", "forestry", new ModelResourceLocation("forestry:crates", "cratedStone")); + public static final ModelCrate instance = new ModelCrate("cratedStone", "forestry", new ModelResourceLocation("forestry:crates", "cratedStone"), false); - private final ModelResourceLocation baseLocation; private final String containedUID; private final String modID; private final ResourceLocation containedLocation; - private final EnumWorldBlockLayer containedLayer; + private final boolean isContainedItem; /** * @param baseLocation The location of the crate model - * @param containedLayer The layer for the rendering from the contained item model * @param UID The UID of the crate * @param modID The modId of the creat item - * @param location The location of the model from the contained item + * @param containedLocation The location of the model from the contained item */ - private ModelCrate(ModelResourceLocation baseLocation, EnumWorldBlockLayer containedLayer, String UID, String modID, ResourceLocation location){ - this.baseLocation = baseLocation; - this.containedLayer = containedLayer; + private ModelCrate(String UID, String modID, ResourceLocation containedLocation, boolean isContainedItem){ this.containedUID = UID; this.modID = modID; - this.containedLocation = location; + this.containedLocation = containedLocation; + this.isContainedItem = isContainedItem; } @Override public Collection getDependencies() { - return ImmutableList.of(baseLocation, containedLocation); + return ImmutableList.of(new ModelResourceLocation("forestry:crates", "crate"), containedLocation); } @Override @@ -91,16 +90,28 @@ public class ModelCrate implements IModelCustomData { /** * To bake the base and the contained model */ - private static ImmutableMap, IFlexibleBakedModel> buildModels(IModelState state, VertexFormat format, Function bakedTextureGetter, IModel crateModel, ModelCrate modelToBake){ + private static ImmutableMap, IFlexibleBakedModel> buildModels(IModelState state, VertexFormat format, Function bakedTextureGetter, ModelCrate modelToBake){ ImmutableMap.Builder, IFlexibleBakedModel> builder = ImmutableMap.builder(); - IModel base = getModel(modelToBake.baseLocation); + IModel base = getModel(new ModelResourceLocation("forestry:crates", "crate")); IFlexibleBakedModel baseBaked = base.bake(new ModelStateComposition(state, base.getDefaultState()), format, bakedTextureGetter); + + //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); - + + + IModel content = getModel(modelToBake.containedLocation); - builder.put(Optional.of(modelToBake.containedLayer), content.bake(new ModelStateComposition(state, crateModel.getDefaultState()), format, bakedTextureGetter)); + 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)); + }else{ + builder.put(Optional.of(EnumWorldBlockLayer.CUTOUT), new TRSRBakedModel(content.bake(state, format, bakedTextureGetter), -0.0625F, 0, 0, 0.5F)); + } return builder.build(); } @@ -110,18 +121,8 @@ public class ModelCrate implements IModelCustomData { @Override public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter){ IModel missing = ModelLoaderRegistry.getMissingModel(); - IModel creat; - try { - creat = ModelLoaderRegistry.getModel(new ModelResourceLocation(modID + ":crates", containedUID)); - } catch (IOException e) { - e.printStackTrace(); - return missing.bake(state, format, bakedTextureGetter); - } - if(creat == null){ - return missing.bake(state, format, bakedTextureGetter); - } return new MultiLayerModel.MultiLayerBakedModel( - buildModels(state, format, bakedTextureGetter, creat, this), + buildModels(state, format, bakedTextureGetter, this), missing.bake(missing.getDefaultState(), format, bakedTextureGetter), format, IPerspectiveAwareModel.MapWrapper.getTransforms(state) @@ -138,17 +139,12 @@ public class ModelCrate implements IModelCustomData { */ @Override public IModel process(ImmutableMap customData){ - ImmutableMap.Builder, ModelResourceLocation> builder = ImmutableMap.builder(); - ModelResourceLocation baseLocation = null; ResourceLocation location = null; String UID = ""; + boolean isContainedItem = false; String modID = ""; - EnumWorldBlockLayer layer = null; for(String key : customData.keySet()){ - if("base".equals(key)){ - baseLocation = (ModelResourceLocation) getLocation(customData.get(key)); - } - else if("uid".equals(key)){ + if("uid".equals(key)){ UID = getString(customData.get(key)); } else if("modID".equals(key)){ @@ -157,23 +153,17 @@ public class ModelCrate implements IModelCustomData { else if("location".equals(key)){ location = getLocation(customData.get(key)); } - else if("layer".equals(key)){ - String layerName = getString(customData.get(key)); - for(EnumWorldBlockLayer l : EnumWorldBlockLayer.values()){ - if(l.toString().equals(layerName)){ - layer = l; - break; - } - } + else if("isItem".equals(key)){ + isContainedItem = getBoolean(customData.get(key)); } } - if(modID == null){ + if(modID == null || modID.equals("")){ modID = "forestry"; } - if(baseLocation == null || layer == null || location == null || UID == null) { + if(location == null || UID == null || UID.equals("")) { return instance; } - return new ModelCrate(baseLocation, layer, UID, modID, location); + return new ModelCrate(UID, modID, location, isContainedItem); } private ResourceLocation getLocation(String json){ @@ -195,6 +185,14 @@ public class ModelCrate implements IModelCustomData { } return null; } + + 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 diff --git a/src/main/java/forestry/core/models/TRSRBakedModel.java b/src/main/java/forestry/core/models/TRSRBakedModel.java new file mode 100644 index 000000000..47fefbf96 --- /dev/null +++ b/src/main/java/forestry/core/models/TRSRBakedModel.java @@ -0,0 +1,178 @@ +/******************************************************************************* + * The MIT License (MIT) + * Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Any alternate licenses are noted where appropriate. + ******************************************************************************/ +package forestry.core.models; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.renderer.vertex.VertexFormatElement; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; +import net.minecraftforge.client.model.pipeline.VertexTransformer; + +import java.util.EnumMap; +import java.util.List; + +import javax.vecmath.Matrix3f; +import javax.vecmath.Matrix4f; +import javax.vecmath.Vector3f; +import javax.vecmath.Vector4f; + +// for those wondering TRSR stands for Translation Rotation Scale Rotation +public class TRSRBakedModel implements IFlexibleBakedModel { + + protected final ImmutableList general; + protected final ImmutableMap> faces; + protected final IFlexibleBakedModel original; + + public TRSRBakedModel(IFlexibleBakedModel original, float x, float y, float z, float scale) { + this(original, x, y, z, 0, 0, 0, scale, scale, scale); + } + + public TRSRBakedModel(IFlexibleBakedModel original, float x, float y, float z, float rotX, float rotY, float rotZ, float scale) { + this(original, x, y, z, rotX, rotY, rotZ, scale, scale, scale); + } + + public TRSRBakedModel(IFlexibleBakedModel original, float x, float y, float z, float rotX, float rotY, float rotZ, float scaleX, float scaleY, float scaleZ) { + this(original, new TRSRTransformation(new Vector3f(x, y, z), + null, + new Vector3f(scaleX, scaleY, scaleZ), + TRSRTransformation.quatFromYXZ(rotY, rotX, rotZ))); + } + + public TRSRBakedModel(IFlexibleBakedModel original, TRSRTransformation transform) { + this.original = original; + + ImmutableList.Builder builder; + builder = ImmutableList.builder(); + + transform = TRSRTransformation.blockCenterToCorner(transform); + + // face quads + EnumMap> faces = Maps.newEnumMap(EnumFacing.class); + for(EnumFacing face : EnumFacing.values()) { + if(!original.isBuiltInRenderer()) { + for(BakedQuad quad : original.getFaceQuads(face)) { + Transformer transformer = new Transformer(transform, original.getFormat()); + quad.pipe(transformer); + builder.add(transformer.build()); + } + } + //faces.put(face, builder.build()); + faces.put(face, ImmutableList.of()); + } + + // general quads + //builder = ImmutableList.builder(); + if(!original.isBuiltInRenderer()) { + for(BakedQuad quad : original.getGeneralQuads()) { + Transformer transformer = new Transformer(transform, original.getFormat()); + quad.pipe(transformer); + builder.add(transformer.build()); + } + } + + this.general = builder.build(); + this.faces = Maps.immutableEnumMap(faces); + } + + @Override + public List getFaceQuads(EnumFacing side) { + return faces.get(side); + } + + @Override + public List getGeneralQuads() { + return general; + } + + @Override + public boolean isAmbientOcclusion() { + return false; + } + + @Override + public boolean isGui3d() { + return original.isGui3d(); + } + + @Override + public boolean isBuiltInRenderer() { + return original.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return original.getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return original.getItemCameraTransforms(); + } + + @Override + public VertexFormat getFormat() { + return original.getFormat(); + } + + public static class Transformer extends VertexTransformer { + + protected Matrix4f transformation; + protected Matrix3f normalTransformation; + + public Transformer(TRSRTransformation transformation, VertexFormat format) { + super(new UnpackedBakedQuad.Builder(format)); + // position transform + this.transformation = transformation.getMatrix(); + // normal transform + this.normalTransformation = new Matrix3f(); + this.transformation.getRotationScale(this.normalTransformation); + this.normalTransformation.invert(); + this.normalTransformation.transpose(); + } + + @Override + public void put(int element, float... data) { + VertexFormatElement.EnumUsage usage = parent.getVertexFormat().getElement(element).getUsage(); + + // transform normals and position + if(usage == VertexFormatElement.EnumUsage.POSITION && data.length >= 3) { + Vector4f vec = new Vector4f(data); + vec.setW(1.0f); + transformation.transform(vec); + data = new float[4]; + vec.get(data); + } + else if(usage == VertexFormatElement.EnumUsage.NORMAL && data.length >= 3) { + Vector3f vec = new Vector3f(data); + normalTransformation.transform(vec); + vec.normalize(); + data = new float[4]; + vec.get(data); + } + super.put(element, data); + } + + public UnpackedBakedQuad build() { + return ((UnpackedBakedQuad.Builder)parent).build(); + } + } +} \ No newline at end of file diff --git a/src/main/java/forestry/mail/items/EnumStampDefinition.java b/src/main/java/forestry/mail/items/EnumStampDefinition.java index 04784711f..ac9693d8b 100644 --- a/src/main/java/forestry/mail/items/EnumStampDefinition.java +++ b/src/main/java/forestry/mail/items/EnumStampDefinition.java @@ -18,7 +18,6 @@ import net.minecraft.init.Items; import forestry.api.mail.EnumPostage; import forestry.core.items.ItemOverlay; -import forestry.plugins.PluginCore; public enum EnumStampDefinition implements ItemOverlay.IOverlayInfo { P_1("1n", EnumPostage.P_1, "gemApatite", new Color(0x4a8ca7), new Color(0xffffff)), diff --git a/src/main/resources/assets/forestry/blockstates/crates.json b/src/main/resources/assets/forestry/blockstates/crates.json index 82d4464bf..c0c339524 100644 --- a/src/main/resources/assets/forestry/blockstates/crates.json +++ b/src/main/resources/assets/forestry/blockstates/crates.json @@ -2,10 +2,6 @@ "forge_marker": 1, "defaults": { "model": "forestry:crate", - "custom": { - "base": "forestry:crates#crate", - "layer": "Cutout" - }, "transform": "forge:default-block" }, "variants": { @@ -19,10 +15,6 @@ "custom": { "location": "acacia_log#axis=y", "uid": "cratedacaciawood" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -31,10 +23,6 @@ "custom": { "location": "andesite#normal", "uid": "cratedandesite" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -43,10 +31,6 @@ "custom": { "location": "birch_log#axis=y", "uid": "cratedbirchwood" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -55,10 +39,6 @@ "custom": { "location": "forestry:soil#soil=bog_earth", "uid": "cratedbogearth" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -67,10 +47,6 @@ "custom": { "location": "brick_block#normal", "uid": "cratedbrick" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -79,10 +55,6 @@ "custom": { "location": "cactus#normal", "uid": "cratedcacti" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -91,10 +63,6 @@ "custom": { "location": "cobblestone#normal", "uid": "cratedcobblestone" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -103,10 +71,6 @@ "custom": { "location": "dark_oak_log#axis=y", "uid": "crateddarkoakwood" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -115,10 +79,6 @@ "custom": { "location": "diorite#normal", "uid": "crateddiorite" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -127,10 +87,6 @@ "custom": { "location": "dirt#normal", "uid": "crateddirt" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -139,10 +95,6 @@ "custom": { "location": "granite#normal", "uid": "cratedgranite" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -151,10 +103,6 @@ "custom": { "location": "gravel#normal", "uid": "cratedgravel" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -163,10 +111,6 @@ "custom": { "location": "forestry:soil#soil=humus", "uid": "cratedhumus" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -175,10 +119,6 @@ "custom": { "location": "jungle_log#axis=y", "uid": "cratedjunglewood" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -187,34 +127,464 @@ "custom": { "location": "mycelium#snowy=false", "uid": "cratedmycelium" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } - ], /*, + ], + "cratedpeat": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/peat", + "uid": "cratedpeat" + } + } + ], + "cratedapatite": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/apatite", + "uid": "cratedapatite" + } + } + ], + "cratedfertilizer": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/fertilizerCompound", + "uid": "cratedfertilizer" + } + } + ], + "cratedmulch": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/mulch", + "uid": "cratedmulch" + } + } + ], + "cratedphosphor": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/phosphor", + "uid": "cratedphosphor" + } + } + ], + "cratedash": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/ash", + "uid": "cratedash" + } + } + ], + "cratedtin": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/ingotTin", + "uid": "cratedtin" + } + } + ], + "cratedcopper": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/ingotCopper", + "uid": "cratedcopper" + } + } + ], + "cratedbronze": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/ingotBronze", + "uid": "cratedbronze" + } + } + ], + "cratedwheat": [ + { + "custom": { + "isItem": true, + "location": "item/wheat", + "uid": "cratedwheat" + } + } + ], + "cratedcookies": [ + { + "custom": { + "isItem": true, + "location": "item/cookie", + "uid": "cratedcookies" + } + } + ], + "cratedredstone": [ + { + "custom": { + "isItem": true, + "location": "item/redstone", + "uid": "cratedredstone" + } + } + ], + "cratedlapis": [ + { + "custom": { + "isItem": true, + "location": "item/dye_blue", + "uid": "cratedlapis" + } + } + ], + "cratedreeds": [ + { + "custom": { + "isItem": true, + "location": "item/reeds", + "uid": "cratedreeds" + } + } + ], + "cratedclay": [ + { + "custom": { + "isItem": true, + "location": "item/clay_ball", + "uid": "cratedclay" + } + } + ], + "cratedglowstone": [ + { + "custom": { + "isItem": true, + "location": "item/glowstone_dust", + "uid": "cratedglowstone" + } + } + ], "cratedapples": [ { "custom": { + "isItem": true, "location": "item/apple", "uid": "cratedapples" - }, - "transform": { - "scale": .5, - "translation": [ -0.0625, 0, 0 ] } } - ]*/ + ], + "cratednetherwart": [ + { + "custom": { + "isItem": true, + "location": "item/nether_wart", + "uid": "cratednetherwart" + } + } + ], + "cratedcharcoal": [ + { + "custom": { + "isItem": true, + "location": "item/charcoal", + "uid": "cratedcharcoal" + } + } + ], + "cratedcoal": [ + { + "custom": { + "isItem": true, + "location": "item/coal", + "uid": "cratedcoal" + } + } + ], + "cratedseeds": [ + { + "custom": { + "isItem": true, + "location": "item/wheat_seeds", + "uid": "cratedseeds" + } + } + ], + "cratedpotatoes": [ + { + "custom": { + "isItem": true, + "location": "item/potato", + "uid": "cratedpotatoes" + } + } + ], + "cratedcarrots": [ + { + "custom": { + "isItem": true, + "location": "item/carrot", + "uid": "cratedcarrots" + } + } + ], + "cratedbeeswax": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beeswax", + "uid": "cratedbeeswax" + } + } + ], + "cratedpollen": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/pollen", + "uid": "cratedpollen" + } + } + ], + "cratedcrystallinepollen": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/pollen", + "uid": "cratedcrystallinepollen" + } + } + ], + "cratedpropolis": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/propolis", + "uid": "cratedpropolis" + } + } + ], + "cratedhoneydew": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/honeydew", + "uid": "cratedhoneydew" + } + } + ], + "cratedroyaljelly": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/royalJelly", + "uid": "cratedroyaljelly" + } + } + ], + "cratedhoneycombs": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beecombs/honey", + "uid": "cratedhoneycombs" + } + } + ], + "cratedcocoacomb": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beecombs/cocoa", + "uid": "cratedcocoacomb" + } + } + ], + "cratedsimmeringcombs": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beecombs/simmering", + "uid": "cratedsimmeringcombs" + } + } + ], + "cratedstringycombs": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beecombs/stringy", + "uid": "cratedstringycombs" + } + } + ], + "cratedfrozencombs": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beecombs/frozen", + "uid": "cratedfrozencombs" + } + } + ], + "crateddrippingcombs": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beecombs/dripping", + "uid": "crateddrippingcombs" + } + } + ], + "cratedsilkycombs": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beecombs/silky", + "uid": "cratedsilkycombs" + } + } + ], + "cratedparchedcombs": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beecombs/parched", + "uid": "cratedparchedcombs" + } + } + ], + "cratedmysteriouscombs": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beecombs/mysterious", + "uid": "cratedmysteriouscombs" + } + } + ], + "cratedpowderycombs": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beecombs/powdery", + "uid": "cratedpowderycombs" + } + } + ], + "cratedwheatencombs": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beecombs/wheaten", + "uid": "cratedwheatencombs" + } + } + ], + "cratedmossycombs": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beecombs/mossy", + "uid": "cratedmossycombs" + } + } + ], + "cratedmellowcombs": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/beecombs/mellow", + "uid": "cratedmellowcombs" + } + } + ], + "cratedrefractorywax": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/refractoryWax", + "uid": "cratedrefractorywax" + } + } + ], + "cratedcherry": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/fruits/cherry", + "uid": "cratedcherry" + } + } + ], + "cratedwalnut": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/fruits/walnut", + "uid": "cratedwalnut" + } + } + ], + "cratedchestnut": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/fruits/chestnut", + "uid": "cratedchestnut" + } + } + ], + "cratedlemon": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/fruits/lemon", + "uid": "cratedlemon" + } + } + ], + "cratedplum": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/fruits/plum", + "uid": "cratedplum" + } + } + ], + "cratedpapaya": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/fruits/papaya", + "uid": "cratedpapaya" + } + } + ], + "crateddates": [ + { + "custom": { + "isItem": true, + "location": "forestry:item/fruits/dates", + "uid": "crateddates" + } + } + ], "cratednetherbrick": [ { "custom": { "location": "nether_brick#normal", "uid": "cratednetherbrick" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -223,10 +593,6 @@ "custom": { "location": "netherrack#normal", "uid": "cratednetherrack" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -235,10 +601,6 @@ "custom": { "location": "obsidian#normal", "uid": "cratedobsidian" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -247,10 +609,6 @@ "custom": { "location": "podzol#snowy=false", "uid": "cratedpodzol" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -259,10 +617,6 @@ "custom": { "location": "prismarine#normal", "uid": "cratedprismarine" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -271,10 +625,6 @@ "custom": { "location": "prismarine_bricks#normal", "uid": "cratedprismarinebrick" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -283,10 +633,6 @@ "custom": { "location": "dark_prismarine#normal", "uid": "cratedprismarinedark" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -295,10 +641,6 @@ "custom": { "location": "red_sand#normal", "uid": "cratedredsand" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -307,10 +649,6 @@ "custom": { "location": "sand#normal", "uid": "cratedsand" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -319,10 +657,6 @@ "custom": { "location": "sandstone#normal", "uid": "cratedsandstone" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -331,10 +665,6 @@ "custom": { "location": "soul_sand#normal", "uid": "cratedsoulsand" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -343,10 +673,6 @@ "custom": { "location": "spruce_log#axis=y", "uid": "cratedsprucewood" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -355,10 +681,6 @@ "custom": { "location": "stone#normal", "uid": "cratedstone" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ], @@ -367,10 +689,6 @@ "custom": { "location": "oak_log#axis=y", "uid": "cratedwood" - }, - "transform": { - "scale": 0.5, - "translation": [ -0.0625, 0, 0 ] } } ]