diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index 508fa9b27..8693f9361 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -76,6 +76,7 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP public BlockForestryLeaves() { super(Material.leaves, false); this.setCreativeTab(Tabs.tabArboriculture); + setStepSound(soundTypeGrass); } @Override diff --git a/src/main/java/forestry/arboriculture/render/ModelLeaves.java b/src/main/java/forestry/arboriculture/render/ModelLeaves.java index 369404ebb..89130f1f1 100644 --- a/src/main/java/forestry/arboriculture/render/ModelLeaves.java +++ b/src/main/java/forestry/arboriculture/render/ModelLeaves.java @@ -79,7 +79,7 @@ public class ModelLeaves extends ModelBlockOverlay { } // Render the plain leaf block. - baker.renderStandardBlock(block, pos, tile.getLeaveSprite(Proxies.render.fancyGraphicsEnabled())); + baker.renderStandardBlock(block, pos, tile.getLeaveSprite(Proxies.render.fancyGraphicsEnabled()), 0); // Render overlay for fruit leaves. TextureAtlasSprite fruitSprite = tile.getFruitSprite(); diff --git a/src/main/java/forestry/arboriculture/render/StateMapperSapling.java b/src/main/java/forestry/arboriculture/render/StateMapperSapling.java index bedc63261..55657a1f8 100644 --- a/src/main/java/forestry/arboriculture/render/StateMapperSapling.java +++ b/src/main/java/forestry/arboriculture/render/StateMapperSapling.java @@ -13,7 +13,10 @@ import forestry.core.render.StateMapperForestry; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class StateMapperSapling extends StateMapperForestry { @Override diff --git a/src/main/java/forestry/core/models/ModelBaker.java b/src/main/java/forestry/core/models/ModelBaker.java index 202925eca..d1641828c 100644 --- a/src/main/java/forestry/core/models/ModelBaker.java +++ b/src/main/java/forestry/core/models/ModelBaker.java @@ -29,6 +29,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraftforge.client.model.IColoredBakedQuad; +/** + * A model baker to make custom models in the mod + */ public class ModelBaker implements IModelBaker { protected double renderMinX; @@ -77,10 +80,10 @@ public class ModelBaker implements IModelBaker { } @Override - public boolean renderStandardBlock(Block block, BlockPos pos, TextureAtlasSprite[] textures) { + public boolean renderStandardBlock(Block block, BlockPos pos, TextureAtlasSprite[] textures, int colorIndex) { setRenderBoundsFromBlock(block); - setColorIndex(0); + setColorIndex(colorIndex); renderFaceXNeg(pos, textures[EnumFacing.WEST.ordinal()]); renderFaceXPos(pos, textures[EnumFacing.EAST.ordinal()]); @@ -93,10 +96,10 @@ public class ModelBaker implements IModelBaker { } @Override - public boolean renderStandardBlock(Block block, BlockPos pos, TextureAtlasSprite texture) { + public boolean renderStandardBlock(Block block, BlockPos pos, TextureAtlasSprite texture, int colorIndex) { setRenderBoundsFromBlock(block); - setColorIndex(0); + setColorIndex(colorIndex); renderFaceXNeg(pos, texture); renderFaceXPos(pos, texture); diff --git a/src/main/java/forestry/core/models/ModelBlockOverlay.java b/src/main/java/forestry/core/models/ModelBlockOverlay.java index 13a9782ea..2a1fc01e7 100644 --- a/src/main/java/forestry/core/models/ModelBlockOverlay.java +++ b/src/main/java/forestry/core/models/ModelBlockOverlay.java @@ -29,6 +29,9 @@ import forestry.api.core.IModelBaker; import forestry.core.blocks.propertys.UnlistedBlockAccess; import forestry.core.blocks.propertys.UnlistedBlockPos; +/** + * A ovelay block model to make a block with 2 or more layers + */ public abstract class ModelBlockOverlay implements ISmartItemModel, ISmartBlockModel { protected void renderBottomFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { @@ -173,9 +176,9 @@ public abstract class ModelBlockOverlay implements ISmartItemMo return baker.bakeModel(true); } + + protected abstract void renderInventory(B block, ItemStack item, IModelBaker baker); - protected abstract void renderInventory(B block, ItemStack item, IModelBaker renderer); - - protected abstract boolean renderInWorld(B block, IBlockAccess world, BlockPos pos, IModelBaker renderer); + protected abstract boolean renderInWorld(B block, IBlockAccess world, BlockPos pos, IModelBaker baker); } diff --git a/src/main/java/forestry/core/models/ModelCrate.java b/src/main/java/forestry/core/models/ModelCrate.java index 376b13732..1ee96d89c 100644 --- a/src/main/java/forestry/core/models/ModelCrate.java +++ b/src/main/java/forestry/core/models/ModelCrate.java @@ -53,7 +53,7 @@ public class ModelCrate implements IModelCustomData{ * @param modID The modId of the creat item * @param location The location of the model from the contained item */ - public ModelCrate(ModelResourceLocation baseLocation, EnumWorldBlockLayer containedLayer, String UID, String modID, ResourceLocation location){ + private ModelCrate(ModelResourceLocation baseLocation, EnumWorldBlockLayer containedLayer, String UID, String modID, ResourceLocation location){ this.baseLocation = baseLocation; this.containedLayer = containedLayer; this.containedUID = UID; @@ -71,6 +71,11 @@ public class ModelCrate implements IModelCustomData{ 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{ @@ -83,6 +88,9 @@ public class ModelCrate implements IModelCustomData{ return model; } + /** + * To bake the base and the contained model + */ private static ImmutableMap, IFlexibleBakedModel> buildModels(IModelState state, VertexFormat format, Function bakedTextureGetter, IModel crateModel, ModelCrate modelToBake){ ImmutableMap.Builder, IFlexibleBakedModel> builder = ImmutableMap.builder(); @@ -104,7 +112,7 @@ public class ModelCrate implements IModelCustomData{ IModel missing = ModelLoaderRegistry.getMissingModel(); IModel creat; try { - creat = ModelLoaderRegistry.getModel(new ModelResourceLocation(modID + ":" + "crates", containedUID)); + creat = ModelLoaderRegistry.getModel(new ModelResourceLocation(modID + ":crates", containedUID)); } catch (IOException e) { e.printStackTrace(); return missing.bake(state, format, bakedTextureGetter); @@ -125,6 +133,9 @@ public class ModelCrate implements IModelCustomData{ return TRSRTransformation.identity(); } + /** + * Create a crate model from the customData + */ @Override public IModel process(ImmutableMap customData){ ImmutableMap.Builder, ModelResourceLocation> builder = ImmutableMap.builder(); @@ -156,7 +167,10 @@ public class ModelCrate implements IModelCustomData{ } } } - if(baseLocation == null || layer == null || location == null || UID == null || modID == null) { + if(modID == null){ + modID = "forestry"; + } + if(baseLocation == null || layer == null || location == null || UID == null) { return instance; } return new ModelCrate(baseLocation, layer, UID, modID, location); @@ -182,6 +196,9 @@ public class ModelCrate implements IModelCustomData{ return null; } + /** + * The model loader to load crate models from the blockstate file + */ public static enum Loader implements ICustomModelLoader{ instance; diff --git a/src/main/java/forestry/farming/models/ModelFarmBlock.java b/src/main/java/forestry/farming/models/ModelFarmBlock.java index 7cde92ee2..8e1d41b94 100644 --- a/src/main/java/forestry/farming/models/ModelFarmBlock.java +++ b/src/main/java/forestry/farming/models/ModelFarmBlock.java @@ -13,7 +13,7 @@ import net.minecraft.world.IBlockAccess; public class ModelFarmBlock extends ModelBlockOverlay { @Override - public void renderInventory(BlockFarm blockFarm, ItemStack item, IModelBaker backer) { + public void renderInventory(BlockFarm blockFarm, ItemStack item, IModelBaker baker) { if (blockFarm == null) { return; } @@ -23,29 +23,29 @@ public class ModelFarmBlock extends ModelBlockOverlay { TextureAtlasSprite[] sprites = getSprites(type); TextureAtlasSprite[] overlaySprites = getOverlaySprites(EnumFarmBlockType.VALUES[item.getItemDamage()]); - backer.renderFaceYNeg(null, sprites[0]); - backer.renderFaceYNeg(null, overlaySprites[0]); + baker.renderFaceYNeg(null, sprites[0]); + baker.renderFaceYNeg(null, overlaySprites[0]); - backer.renderFaceYPos(null, sprites[1]); - backer.renderFaceYPos(null, overlaySprites[1]); + baker.renderFaceYPos(null, sprites[1]); + baker.renderFaceYPos(null, overlaySprites[1]); - backer.renderFaceZNeg(null, sprites[2]); - backer.renderFaceZNeg(null, overlaySprites[2]); + baker.renderFaceZNeg(null, sprites[2]); + baker.renderFaceZNeg(null, overlaySprites[2]); - backer.renderFaceZPos(null, sprites[3]); - backer.renderFaceZPos(null, overlaySprites[3]); + baker.renderFaceZPos(null, sprites[3]); + baker.renderFaceZPos(null, overlaySprites[3]); - backer.renderFaceXNeg(null, sprites[4]); - backer.renderFaceXNeg(null, overlaySprites[4]); + baker.renderFaceXNeg(null, sprites[4]); + baker.renderFaceXNeg(null, overlaySprites[4]); - backer.renderFaceXPos(null, sprites[5]); - backer.renderFaceXPos(null, overlaySprites[5]); + baker.renderFaceXPos(null, sprites[5]); + baker.renderFaceXPos(null, overlaySprites[5]); blockFarm.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } @Override - public boolean renderInWorld(BlockFarm blockFarm, IBlockAccess world, BlockPos pos, IModelBaker backer) { + public boolean renderInWorld(BlockFarm blockFarm, IBlockAccess world, BlockPos pos, IModelBaker baker) { TileFarm farm = (TileFarm) world.getTileEntity(pos); @@ -53,8 +53,8 @@ public class ModelFarmBlock extends ModelBlockOverlay { TextureAtlasSprite[] texturesOverlay = getOverlaySprites(farm.getFarmBlockType()); // Render the plain block. - backer.renderStandardBlock(blockFarm, pos, textures); - renderFarmOverlay(world, blockFarm, pos, backer, texturesOverlay); + baker.renderStandardBlock(blockFarm, pos, textures, 0); + renderFarmOverlay(world, blockFarm, pos, baker, texturesOverlay); return true; } diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index 667b0f7f2..afdd12872 100644 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -173,7 +173,13 @@ public class PluginCore extends ForestryPlugin { crateRegistry.registerCrate(Blocks.cobblestone, "cratedCobblestone"); crateRegistry.registerCrate(new ItemStack(Blocks.dirt, 1, 0), "cratedDirt"); crateRegistry.registerCrate(new ItemStack(Blocks.dirt, 1, 2), "cratedPodzol"); - crateRegistry.registerCrate(Blocks.stone, "cratedStone"); + crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 0), "cratedStone"); + crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 1), "cratedGranite"); + crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 3), "cratedDiorite"); + crateRegistry.registerCrate(new ItemStack(Blocks.stone, 1, 5), "cratedAndesite"); + crateRegistry.registerCrate(new ItemStack(Blocks.prismarine, 1, 0), "cratedPrismarine"); + crateRegistry.registerCrate(new ItemStack(Blocks.prismarine, 1, 1), "cratedPrismarinebrick"); + crateRegistry.registerCrate(new ItemStack(Blocks.prismarine, 1, 2), "cratedPrismarinedark"); crateRegistry.registerCrate(Blocks.brick_block, "cratedBrick"); crateRegistry.registerCrate(Blocks.cactus, "cratedCacti"); crateRegistry.registerCrate(new ItemStack(Blocks.sand, 1, 0), "cratedSand"); diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index 0a2ccb6c3..02dc4198b 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -272,6 +272,8 @@ public class PluginFactory extends ForestryPlugin { int appleJuiceAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.apple"); RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.apple)}, Fluids.JUICE.getFluid(appleJuiceAmount), PluginCore.items.mulch.getItemStack(), appleMulchAmount); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.carrot)}, Fluids.JUICE.getFluid(appleJuiceAmount), + PluginCore.items.mulch.getItemStack(), appleMulchAmount); int seedOilAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed"); FluidStack seedOil = Fluids.SEEDOIL.getFluid(seedOilAmount); @@ -303,6 +305,7 @@ public class PluginFactory extends ForestryPlugin { RecipeUtil.addFermenterRecipes(new ItemStack(Blocks.cactus), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.cactus"), Fluids.BIOMASS); RecipeUtil.addFermenterRecipes(new ItemStack(Items.wheat), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); + RecipeUtil.addFermenterRecipes(new ItemStack(Items.potato), (2 * ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat")), Fluids.BIOMASS); RecipeUtil.addFermenterRecipes(new ItemStack(Items.reeds), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.cane"), Fluids.BIOMASS); RecipeUtil.addFermenterRecipes(new ItemStack(Blocks.brown_mushroom), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.mushroom"), Fluids.BIOMASS); RecipeUtil.addFermenterRecipes(new ItemStack(Blocks.red_mushroom), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.mushroom"), Fluids.BIOMASS); diff --git a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java index d1287af8d..afab256b8 100644 --- a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java @@ -37,6 +37,7 @@ import forestry.farming.logic.FarmableGenericSapling; import forestry.plugins.ForestryPlugin; import forestry.plugins.Plugin; import forestry.plugins.PluginCore; +import forestry.plugins.PluginManager; @Plugin(pluginID = "BiomesOPlenty", name = "BiomesOPlenty", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.biomesoplenty.description") public class PluginBiomesOPlenty extends ForestryPlugin { @@ -97,12 +98,12 @@ public class PluginBiomesOPlenty extends ForestryPlugin { FMLInterModComms.sendMessage(Constants.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); } - if (saplings != null && persimmon != null) { + if (PluginManager.Module.FARMING.isEnabled() && saplings != null && persimmon != null) { Farmables.farmables.get("farmArboreal").add(new FarmableGenericSapling(saplings, 15, persimmon)); } Block boPTurnip = GameRegistry.findBlock(BoP, "turnip"); - if (boPTurnip != null) { + if (PluginManager.Module.FARMING.isEnabled() && boPTurnip != null) { Item boPTurnipSeeds = GameRegistry.findItem(BoP, "turnipSeeds"); if (boPTurnipSeeds != null) { Farmables.farmables.get("farmVegetables").add(new FarmableGenericCrop(new ItemStack(boPTurnipSeeds, 1, 0), boPTurnip, 7)); diff --git a/src/main/java/forestry/plugins/compat/PluginNatura.java b/src/main/java/forestry/plugins/compat/PluginNatura.java index c9cc605ec..231e3988b 100644 --- a/src/main/java/forestry/plugins/compat/PluginNatura.java +++ b/src/main/java/forestry/plugins/compat/PluginNatura.java @@ -37,6 +37,7 @@ import forestry.farming.logic.FarmableGenericCrop; import forestry.plugins.ForestryPlugin; import forestry.plugins.Plugin; import forestry.plugins.PluginCore; +import forestry.plugins.PluginManager; @Plugin(pluginID = "Natura", name = "Natura", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.natura.description") public class PluginNatura extends ForestryPlugin { @@ -220,9 +221,11 @@ public class PluginNatura extends ForestryPlugin { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{aSeedList}, Fluids.SEEDOIL.getFluid(amount)); } - Block cropBlock = GameRegistry.findBlock(NATURA, "N Crops"); - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(seedBarley, cropBlock, 3)); - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(seedCotton, cropBlock, 8)); + if(PluginManager.Module.FARMING.isEnabled()){ + Block cropBlock = GameRegistry.findBlock(NATURA, "N Crops"); + Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(seedBarley, cropBlock, 3)); + Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(seedCotton, cropBlock, 8)); + } List berries = new ArrayList<>(); if (berryBlight != null) { diff --git a/src/main/resources/assets/forestry/blockstates/crates.json b/src/main/resources/assets/forestry/blockstates/crates.json index a51e2c5a8..82d4464bf 100644 --- a/src/main/resources/assets/forestry/blockstates/crates.json +++ b/src/main/resources/assets/forestry/blockstates/crates.json @@ -4,8 +4,7 @@ "model": "forestry:crate", "custom": { "base": "forestry:crates#crate", - "layer": "Cutout", - "modID": "forestry" + "layer": "Cutout" }, "transform": "forge:default-block" }, @@ -15,6 +14,342 @@ "model": "forestry:crate-filled" } ], + "cratedacaciawood": [ + { + "custom": { + "location": "acacia_log#axis=y", + "uid": "cratedacaciawood" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedandesite": [ + { + "custom": { + "location": "andesite#normal", + "uid": "cratedandesite" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedbirchwood": [ + { + "custom": { + "location": "birch_log#axis=y", + "uid": "cratedbirchwood" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedbogearth": [ + { + "custom": { + "location": "forestry:soil#soil=bog_earth", + "uid": "cratedbogearth" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedbrick": [ + { + "custom": { + "location": "brick_block#normal", + "uid": "cratedbrick" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedcacti": [ + { + "custom": { + "location": "cactus#normal", + "uid": "cratedcacti" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedcobblestone": [ + { + "custom": { + "location": "cobblestone#normal", + "uid": "cratedcobblestone" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "crateddarkoakwood": [ + { + "custom": { + "location": "dark_oak_log#axis=y", + "uid": "crateddarkoakwood" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "crateddiorite": [ + { + "custom": { + "location": "diorite#normal", + "uid": "crateddiorite" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "crateddirt": [ + { + "custom": { + "location": "dirt#normal", + "uid": "crateddirt" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedgranite": [ + { + "custom": { + "location": "granite#normal", + "uid": "cratedgranite" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedgravel": [ + { + "custom": { + "location": "gravel#normal", + "uid": "cratedgravel" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedhumus": [ + { + "custom": { + "location": "forestry:soil#soil=humus", + "uid": "cratedhumus" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedjunglewood": [ + { + "custom": { + "location": "jungle_log#axis=y", + "uid": "cratedjunglewood" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedmycelium": [ + { + "custom": { + "location": "mycelium#snowy=false", + "uid": "cratedmycelium" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], /*, + "cratedapples": [ + { + "custom": { + "location": "item/apple", + "uid": "cratedapples" + }, + "transform": { + "scale": .5, + "translation": [ -0.0625, 0, 0 ] + } + } + ]*/ + "cratednetherbrick": [ + { + "custom": { + "location": "nether_brick#normal", + "uid": "cratednetherbrick" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratednetherrack": [ + { + "custom": { + "location": "netherrack#normal", + "uid": "cratednetherrack" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedobsidian": [ + { + "custom": { + "location": "obsidian#normal", + "uid": "cratedobsidian" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedpodzol": [ + { + "custom": { + "location": "podzol#snowy=false", + "uid": "cratedpodzol" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedprismarine": [ + { + "custom": { + "location": "prismarine#normal", + "uid": "cratedprismarine" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedprismarinebrick": [ + { + "custom": { + "location": "prismarine_bricks#normal", + "uid": "cratedprismarinebrick" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedprismarinedark": [ + { + "custom": { + "location": "dark_prismarine#normal", + "uid": "cratedprismarinedark" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedredsand": [ + { + "custom": { + "location": "red_sand#normal", + "uid": "cratedredsand" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedsand": [ + { + "custom": { + "location": "sand#normal", + "uid": "cratedsand" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedsandstone": [ + { + "custom": { + "location": "sandstone#normal", + "uid": "cratedsandstone" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedsoulsand": [ + { + "custom": { + "location": "soul_sand#normal", + "uid": "cratedsoulsand" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedsprucewood": [ + { + "custom": { + "location": "spruce_log#axis=y", + "uid": "cratedsprucewood" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], "cratedstone": [ { "custom": { @@ -27,11 +362,11 @@ } } ], - "cratedapples": [ + "cratedwood": [ { "custom": { - "location": "item/apple", - "uid": "cratedapples" + "location": "oak_log#axis=y", + "uid": "cratedwood" }, "transform": { "scale": 0.5,