From 42f1621feafda162670d9ba01748b8c5c01785dd Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sat, 24 Jun 2017 16:04:20 -0400 Subject: [PATCH] bronze assets finished, bronze casting finished --- .../nmd/primal/forgecraft/init/ModBlocks.java | 16 ++ .../primal/forgecraft/init/ModCrafting.java | 34 ++- .../nmd/primal/forgecraft/init/ModItems.java | 10 +- .../forgecraft/items/ItemStoneTongs.java | 49 ++++ .../forgecraft/items/tools/CustomPickaxe.java | 2 - .../primal/forgecraft/tiles/TileBloomery.java | 9 +- .../primal/forgecraft/tiles/TileForge.java | 8 +- .../blockstates/hotbronzecrucible.json | 13 + .../blockstates/hotcookedbronzecrucible.json | 13 + .../blockstates/rawbronzecrucible.json | 13 + .../models/block/castingcrucible.json | 153 +++++++++++ .../forgecraft/models/block/e_particle.png | Bin 159 -> 0 bytes .../models/item/bloomery_adobe.json | 4 +- .../forgecraft/models/item/e_particle.png | Bin 159 -> 0 bytes .../models/item/hotbronzecrucible.json | 9 + .../models/item/hotcookedbronzecrucible.json | 9 + .../models/item/rawbronzecrucible.json | 9 + .../models/item/stonetongs_hotbronze.json | 252 ++++++++++++++++++ .../item/stonetongs_hotbronzecooked.json | 11 + .../forgecraft/textures/items/hot_bronze.png | Bin 0 -> 787 bytes .../textures/items/molten_bronze.png | Bin 0 -> 846 bytes .../forgecraft/textures/items/raw_bronze.png | Bin 0 -> 697 bytes 22 files changed, 601 insertions(+), 13 deletions(-) create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/castingcrucible.json delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/e_particle.png delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/e_particle.png create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked.json create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/items/hot_bronze.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/items/molten_bronze.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/items/raw_bronze.png diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java index f107b2a0..215d21cd 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -53,6 +53,10 @@ public class ModBlocks { public static Block emptycruciblecracked; public static Block emptycruciblecrackedhot; + public static Block rawbronzecrucible; + public static Block hotbronzecrucible; + public static Block hotcookedbronzecrucible; + public static Block rawironcrucible; public static Block hotironcrucible; public static Block hotcookedironcrucible; @@ -116,6 +120,10 @@ public class ModBlocks { emptycruciblecracked = new Crucible(Material.ROCK, "emptycruciblecracked"); emptycruciblecrackedhot = new CrucibleHot(Material.ROCK, "emptycruciblecrackedhot"); + rawbronzecrucible = new Crucible(Material.ROCK, "rawbronzecrucible"); + hotbronzecrucible = new CrucibleHot(Material.ROCK, "hotbronzecrucible"); + hotcookedbronzecrucible = new CrucibleHot(Material.ROCK, "hotcookedbronzecrucible"); + rawironcrucible = new Crucible(Material.ROCK, "rawironcrucible"); hotironcrucible = new CrucibleHot(Material.ROCK, "hotironcrucible"); hotcookedironcrucible = new CrucibleHot(Material.ROCK, "hotcookedironcrucible"); @@ -396,6 +404,10 @@ public class ModBlocks { registerBlock(emptycruciblecracked); registerBlock(emptycruciblecrackedhot); + registerBlock(rawbronzecrucible); + registerBlock(hotbronzecrucible); + registerBlock(hotcookedbronzecrucible); + registerBlock(rawironcrucible); registerBlock(hotironcrucible); registerBlock(hotcookedironcrucible); @@ -465,6 +477,10 @@ public class ModBlocks { registerRender(emptycruciblecracked); registerRender(emptycruciblecrackedhot); + registerRender(rawbronzecrucible); + registerRender(hotbronzecrucible); + registerRender(hotcookedbronzecrucible); + registerRender(rawironcrucible); registerRender(hotironcrucible); registerRender(hotcookedironcrucible); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index 4b2fb0c3..b55678e2 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -70,10 +70,8 @@ public class ModCrafting { GameRegistry.addShapedRecipe(new ItemStack(ModItems.stonetongs, 1), "X X", "YSY", 'X', Blocks.STONE, 'S', Items.STRING, 'Y', Items.STICK); - /***Iron Crucible***/ + /***RAW CRUCIBLES***/ - - //Regular Iron Ore GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawironcrucible), "X","Y", ('X'), "oreIron", @@ -90,6 +88,11 @@ public class ModCrafting { ('X'), new ItemStack(ModBlocks.ironcleanball, 1), ('C'), new ItemStack(PrimalItems.CHARCOAL_HIGH), ('Y'), ModBlocks.emptycrucible)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + "XCX"," X "," Y ", + ('X'), "nuggetCopper", + ('C'), "nuggetTin", + ('Y'), ModBlocks.emptycrucible)); @@ -319,6 +322,31 @@ public class ModCrafting { 0.2f, 0.25f ); + //Makes the Hot Bronze Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.rawbronzecrucible, 1), + new ItemStack(ModBlocks.hotbronzecrucible, 1), + new ItemStack(ModBlocks.hotbronzecrucible, 1), + new ItemStack(ModBlocks.rawbronzecrucible, 1), + 800, + 20, + 500, + 0.5f, + 0.0f + ); + +//Makes the Finished Hot Steel Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.hotbronzecrucible, 1), + new ItemStack(ModBlocks.hotcookedbronzecrucible, 1), + new ItemStack(ModBlocks.hotcookedbronzecrucible, 1), + new ItemStack(ModBlocks.rawbronzecrucible, 1), + 1100, + 1100, + 600, + 0.5f, + 0.5f + ); //TODO PLACE HOLDER FOR WOOTZ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 7e58b5e0..03b91548 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -393,7 +393,9 @@ public class ModItems { new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_pickaxe_hot"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_axe_hot"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_shovel_hot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_hoe_hot") + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_hoe_hot"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronze"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronzecooked") ); ModelLoader.setCustomMeshDefinition(ModItems.stonetongs, new ItemMeshDefinition() { @@ -490,6 +492,12 @@ public class ModItems { else if (stack.getTagCompound().getInteger("type") == 29 ) { return new ModelResourceLocation(stack.getItem().getRegistryName() + "_steel_hoe_hot", "inventory"); } + else if (stack.getTagCompound().getInteger("type") == 39 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronze", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 40 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronzecooked", "inventory"); + } else return new ModelResourceLocation(stack.getItem().getRegistryName(), "inventory"); } return new ModelResourceLocation(stack.getItem().getRegistryName(), "inventory"); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java index b8147732..82bb7b32 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java @@ -124,6 +124,13 @@ public class ItemStoneTongs extends Item { 36 | Hot Wootz Axe Head 37 | Hot Wootz Shovel Head 38 | Hot Wootz Hoe Head + + ================================ + + 39 | Hot Bronze Crucible + 40 | Hot Cooked Bronze Crucible + + */ if(!world.isRemote) { @@ -258,6 +265,24 @@ public class ItemStoneTongs extends Item { return EnumActionResult.SUCCESS; } /* TODO Wootz */ + + + /*************************** + * Bronze * + ***************************/ + if (world.getBlockState(pos).getBlock() == ModBlocks.hotbronzecrucible) { + itemstack.getTagCompound().setInteger("type", 39); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + if (world.getBlockState(pos).getBlock() == ModBlocks.hotcookedbronzecrucible) { + itemstack.getTagCompound().setInteger("type", 40); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + } /***** Places the content from the Tongs to the World @@ -391,6 +416,20 @@ public class ItemStoneTongs extends Item { world.setBlockState(tempPos, ModBlocks.steelchunk.getDefaultState().withProperty(PrimalStates.ACTIVE, true), 3); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; + case 39: + world.setBlockState(tempPos, ModBlocks.hotbronzecrucible.getDefaultState(), 3); + TileBaseCrucible tileCrucible39 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible39.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 0); + return EnumActionResult.SUCCESS; + case 40: + world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible.getDefaultState(), 3); + TileBaseCrucible tileCrucible40 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible40.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 0); + return EnumActionResult.SUCCESS; } } } @@ -456,6 +495,16 @@ public class ItemStoneTongs extends Item { itemstack.getTagCompound().setInteger("type", 23); tile.setSlotStack(1, ItemStack.EMPTY); return EnumActionResult.SUCCESS; + } else if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.hotbronzecrucible))) { + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 39); + tile.setSlotStack(1, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; + } else if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.hotcookedbronzecrucible))) { + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 40); + tile.setSlotStack(1, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; } } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java index 3c4da92d..050e48c0 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java @@ -295,8 +295,6 @@ public class CustomPickaxe extends ItemPickaxe implements ToolNBT{ tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); } } - - } @Override diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java index 613b2360..5fb382c0 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java @@ -12,6 +12,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import nmd.primal.core.api.PrimalItems; import nmd.primal.core.api.PrimalStates; +import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.forgecraft.blocks.BloomeryBase; import nmd.primal.forgecraft.blocks.Crucibles.Crucible; import nmd.primal.forgecraft.crafting.BloomeryCrafting; @@ -50,8 +51,9 @@ public class TileBloomery extends TileBaseSlot implements ITickable { world.notifyBlockUpdate(pos, state, state, 2); } this.heatManager(this.getHeat(), state, this.getSlotStack(0), world, pos); + slotZeroManager(world); } - slotZeroManager(world); + slotOneManager(); } } @@ -115,8 +117,9 @@ public class TileBloomery extends TileBaseSlot implements ITickable { this.markDirty(); this.updateBlock(); } - - makeSmoke(world, pos); + if(CommonUtils.randomCheck(20)) { + makeSmoke(world, pos); + } } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java index f01e0abf..4490a76e 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java @@ -13,6 +13,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import nmd.primal.core.api.PrimalItems; import nmd.primal.core.api.PrimalStates; +import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.forgecraft.blocks.Forge; import nmd.primal.forgecraft.crafting.ForgeCrafting; @@ -51,8 +52,9 @@ public class TileForge extends TileBaseSlot implements ITickable { world.notifyBlockUpdate(pos, state, state, 2); } slotZeroManager(world); + this.heatManager(this.getHeat(), state, this.getSlotStack(0), world, pos); } - this.heatManager(this.getHeat(), state, this.getSlotStack(0), world, pos); + craftingManager(); } @@ -75,7 +77,9 @@ public class TileForge extends TileBaseSlot implements ITickable { this.markDirty(); this.updateBlock(); } - makeSmoke(world, pos); + if(CommonUtils.randomCheck(20)) { + makeSmoke(world, pos); + } } } diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible.json new file mode 100644 index 00000000..f88abe9a --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible.json @@ -0,0 +1,13 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot", + "texture1": "forgecraft:items/hot_bronze" + } + }, + "variants": { + "normal": { "model": "forgecraft:castingcrucible" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible.json new file mode 100644 index 00000000..d549eddf --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible.json @@ -0,0 +1,13 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot", + "texture1": "forgecraft:items/molten_bronze" + } + }, + "variants": { + "normal": { "model": "forgecraft:castingcrucible" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible.json new file mode 100644 index 00000000..9fddd6fe --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible.json @@ -0,0 +1,13 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab", + "texture1": "forgecraft:items/raw_bronze" + } + }, + "variants": { + "normal": { "model": "forgecraft:castingcrucible" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/castingcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/block/castingcrucible.json new file mode 100644 index 00000000..92b1da1c --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/block/castingcrucible.json @@ -0,0 +1,153 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab", + "texture1": "forgecraft:blocks/stone_slab" + }, + "elements": [ + { + "__comment": "Cube1", + "from": [ 5, 0, 5 ], + "to": [ 11, 1, 11 ], + "faces": { + "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, + "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, + "north": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube11", + "from": [ 5, 1, 5 ], + "to": [ 11, 7, 6 ], + "faces": { + "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture" }, + "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture" }, + "north": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, + "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, + "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube11", + "from": [ 5, 1, 10 ], + "to": [ 11, 7, 11 ], + "faces": { + "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture" }, + "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture" }, + "north": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, + "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, + "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube13", + "from": [ 5, 1, 6 ], + "to": [ 6, 7, 10 ], + "faces": { + "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, + "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, + "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, + "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" }, + "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube13", + "from": [ 10, 1, 6 ], + "to": [ 11, 7, 10 ], + "faces": { + "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, + "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, + "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, + "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" }, + "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube15", + "from": [ 4, 5, 6 ], + "to": [ 5, 6, 10 ], + "faces": { + "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, + "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, + "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, + "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, + "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, + "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube15", + "from": [ 11, 5, 6 ], + "to": [ 12, 6, 10 ], + "faces": { + "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, + "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, + "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, + "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, + "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, + "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube17", + "from": [ 6, 5, 4 ], + "to": [ 10, 6, 5 ], + "faces": { + "down": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture" }, + "up": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture" }, + "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, + "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, + "west": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, + "east": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube18", + "from": [ 6, 5, 11 ], + "to": [ 10, 6, 12 ], + "faces": { + "down": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture" }, + "up": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture" }, + "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, + "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, + "west": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, + "east": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY10", + "from": [ 6, 6.5, 6 ], + "to": [ 10, 6.501, 10 ], + "faces": { + "up": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture1" } + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [ 0.1, 1.1, -2.35 ] + }, + "firstperson_righthand": { + "translation": [ 0, 4, 0 ] + }, + "gui": { + "translation": [ 0, 4, 0 ] + }, + "ground": { + "translation": [ 0, 4, 0 ] + }, + "fixed": { + "rotation": [ 45, 45, 0 ], + "translation": [ 0, 4, 0 ] + } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/e_particle.png b/1.11/src/main/resources/assets/forgecraft/models/block/e_particle.png deleted file mode 100644 index e557878f9b0081df0e6c571ed915f4780bf1a2fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|X`U{QAsV7vCj@daC~~-LPd)$i z?$?xTj^-IIp9ACFK7V={aJAiXe!J@v0mIGT4Z3dBCY+nlAN}mLRowa~J3GYg{eRVX zXUUaN&3PXSznt{pUt?*oMTj?KX|GSjMcIr5t;EiVqsx9UI;{|T9DHPlG0;W^Pgg&e IbxsLQ03WwL?f?J) diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/bloomery_adobe.json b/1.11/src/main/resources/assets/forgecraft/models/item/bloomery_adobe.json index f73f4f2d..7e9805cb 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/bloomery_adobe.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/bloomery_adobe.json @@ -3,8 +3,8 @@ "textures": { "particle": "forgecraft:blocks/brick", "texture": "forgecraft:blocks/brick", - "texture1": "forgecraft:blocks/brick", - "texture2": "forgecraft:blocks/brick" + "texture1": "primal:items/adobebrick_dry", + "texture2": "primal:blocks/adobebrick_mortar" }, "parent": "forgecraft:block/bloomery_adobe" } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/e_particle.png b/1.11/src/main/resources/assets/forgecraft/models/item/e_particle.png deleted file mode 100644 index e557878f9b0081df0e6c571ed915f4780bf1a2fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|X`U{QAsV7vCj@daC~~-LPd)$i z?$?xTj^-IIp9ACFK7V={aJAiXe!J@v0mIGT4Z3dBCY+nlAN}mLRowa~J3GYg{eRVX zXUUaN&3PXSznt{pUt?*oMTj?KX|GSjMcIr5t;EiVqsx9UI;{|T9DHPlG0;W^Pgg&e IbxsLQ03WwL?f?J) diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible.json new file mode 100644 index 00000000..e420a34e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible.json @@ -0,0 +1,9 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot", + "texture1": "forgecraft:items/hot_bronze" + }, + "parent": "forgecraft:block/castingcrucible" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible.json new file mode 100644 index 00000000..0b015ebe --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible.json @@ -0,0 +1,9 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot", + "texture1": "forgecraft:items/molten_bronze" + }, + "parent": "forgecraft:block/castingcrucible" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible.json new file mode 100644 index 00000000..c183bd72 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible.json @@ -0,0 +1,9 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot", + "texture1": "forgecraft:items/raw_bronze" + }, + "parent": "forgecraft:block/castingcrucible" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze.json new file mode 100644 index 00000000..da56fdd4 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze.json @@ -0,0 +1,252 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab_hot", + "texture3": "forgecraft:items/hot_bronze" + }, + "elements": [ + { + "__comment": "Cube1", + "from": [ 4, 0, 0 ], + "to": [ 5, 1, 3 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 15 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 1, 5, 4 ], "texture": "#texture1" }, + "north": { "uv": [ 11, 13, 12, 14 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 13, 5, 14 ], "texture": "#texture1" }, + "west": { "uv": [ 1, 14, 4, 15 ], "texture": "#texture1" }, + "east": { "uv": [ 12, 14, 15, 15 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube2", + "from": [ 11, 0, 0 ], + "to": [ 12, 1, 3 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 15 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 1, 5, 4 ], "texture": "#texture1" }, + "north": { "uv": [ 11, 13, 12, 14 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 13, 5, 14 ], "texture": "#texture1" }, + "west": { "uv": [ 1, 14, 4, 15 ], "texture": "#texture1" }, + "east": { "uv": [ 12, 14, 15, 15 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube3", + "from": [ 4, 0, 3 ], + "to": [ 5, 1, 10 ], + "rotation": { "origin": [ 4, 0, 3 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 4, 2, 5, 9 ], "texture": "#texture" }, + "up": { "uv": [ 4, 3, 5, 10 ], "texture": "#texture" }, + "north": { "uv": [ 11, 15, 12, 16 ], "texture": "#texture" }, + "south": { "uv": [ 4, 15, 5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 3, 15, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7, 15, 14, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube4", + "from": [ 11, 0, 3 ], + "to": [ 12, 1, 10 ], + "rotation": { "origin": [ 12, 1, 3 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 4, 2, 5, 9 ], "texture": "#texture" }, + "up": { "uv": [ 4, 3, 5, 10 ], "texture": "#texture" }, + "north": { "uv": [ 11, 15, 12, 16 ], "texture": "#texture" }, + "south": { "uv": [ 4, 15, 5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 3, 15, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7, 15, 14, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube5", + "from": [ 6.5, 0, 7.5 ], + "to": [ 7.5, 1, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 6.5, 0, 7.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 6.5, 7.5, 7.5, 16 ], "texture": "#texture" }, + "north": { "uv": [ 8.5, 15, 9.5, 16 ], "texture": "#texture" }, + "south": { "uv": [ 6.5, 15, 7.5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 15, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 15, 8.5, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube6", + "from": [ 8.5, 0, 7.5 ], + "to": [ 9.5, 1, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 8.5, 0, 9.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 8.5, 7.5, 9.5, 16 ], "texture": "#texture" }, + "north": { "uv": [ 6.5, 15, 7.5, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8.5, 15, 9.5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 15, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 15, 8.5, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube16", + "from": [ 5, -3, 2 ], + "to": [ 11, 3, 3 ], + "shade": false, + "faces": { + "down": { "uv": [ 5, 13, 11, 14 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 2, 11, 3 ], "texture": "#texture2" }, + "north": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 2, 10, 3, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 13, 10, 14, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube17", + "from": [ 5, -3, -3 ], + "to": [ 11, 3, -2 ], + "shade": false, + "faces": { + "down": { "uv": [ 5, 13, 11, 14 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 2, 11, 3 ], "texture": "#texture2" }, + "north": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 2, 10, 3, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 13, 10, 14, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube18", + "from": [ 5, -3, -2 ], + "to": [ 6, 3, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 5, 12, 6, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 0, 6, 4 ], "texture": "#texture2" }, + "north": { "uv": [ 10, 10, 11, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 10, 6, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 10, 4, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 12, 10, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube19", + "from": [ 10, -3, -2 ], + "to": [ 11, 3, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 5, 12, 6, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 0, 6, 4 ], "texture": "#texture2" }, + "north": { "uv": [ 10, 10, 11, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 10, 6, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 10, 4, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 12, 10, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube20", + "from": [ 5, -4, -3 ], + "to": [ 11, -3, 3 ], + "shade": false, + "faces": { + "down": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 0, 11, 6 ], "texture": "#texture2" }, + "north": { "uv": [ 5, 3, 11, 4 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 3, 11, 4 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 3, 6, 4 ], "texture": "#texture2" }, + "east": { "uv": [ 10, 3, 16, 4 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube21", + "from": [ 4, 1, -2 ], + "to": [ 5, 2, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2" }, + "north": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube22", + "from": [ 11, 1, -2 ], + "to": [ 12, 2, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2", "rotation": 90 }, + "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2", "rotation": 270 }, + "north": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube23", + "from": [ 6, 1, -4 ], + "to": [ 10, 2, -3 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2", "rotation": 90 }, + "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2", "rotation": 270 }, + "north": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube24", + "from": [ 6, 1, 3 ], + "to": [ 10, 2, 4 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2", "rotation": 90 }, + "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2", "rotation": 270 }, + "north": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" } + } + }, + { + "__comment": "PlaneY17", + "from": [ 6, 2.5, -2 ], + "to": [ 10, 2.501, 2 ], + "faces": { + "up": { "uv": [ 6, 0, 10, 2 ], "texture": "#texture3" } + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 60, 0, 0 ], + "translation": [ 0, 8.9, 3.7 ] + }, + "firstperson_righthand": { + "translation": [ 0, 5.5, -7 ] + }, + "gui": { + "rotation": [ 90, 0, 0 ], + "scale": [ 0.95, 0.95, 0.95 ] + }, + "ground": { + "translation": [ 0, 4, 0 ] + }, + "fixed": { + "rotation": [ 90, 0, 0 ], + "translation": [ 0, 0, 8 ] + } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked.json new file mode 100644 index 00000000..7719f1a2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked.json @@ -0,0 +1,11 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab_hot", + "texture3": "forgecraft:items/molten_bronze" + }, + "parent": "forgecraft:item/stonetongs_hotbronze" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/hot_bronze.png b/1.11/src/main/resources/assets/forgecraft/textures/items/hot_bronze.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b13db0558e795651eaa359421e9589d249f6ce GIT binary patch literal 787 zcmV+u1MK{XP)WFU8GbZ8()Nlj2>E@cM*00MVOL_t(I%LTz%awIhr zK+&tGDJQ309_SzVVVf+9EfGNz&{0v?ROO_U^u#&l_ut;znmfh;%%iaMh5qdE#llOa z-ZIwhWFN^bGuQwjK&xna;I1YTW5KQ`S8JKh0U@!LgSgJ5C*`1L7SFI}{;3C-yP~mC z8Ib2~Av()iIwlPy*(j4Rc8+GhFk|Cc7j~Ptn}N65BbR`)ku5Z&+7TZsdra7x2@XCV z2b=R8`hnkPT)r^ZO79+cQHnNv%k+mqCK}hj!4Sw#Fx0?QgmW%fx#PD#sBs6)cn!1( zay|L-9(g^H$CR0$R^HssSa(#wN@4gRP#nwiE0)UF(!-$ayI?HL>KH#yoO>v80hYjV z!saW_SdQozo1&?wNM?!#)<6siqmhUEVrXwj?>t{e2PnZSUA3%3q}vKdQ2zV8)6M|S zLcVioL`_E8ml2501Y~rI{Hhh^s788TTF+Mu%w*u1c5-R)u{_9KI5l%rCJc z>kQx$fjcY$qW#e9U-XD#(wqd3xtPCv05~dfti`;TT)!^on zZ#E$Iv}ic_$$nDqf-sO?J!wCw?O&|95u4?9oUAeMqK@*Rv;_uD$bL4y!bUX~&&)Vy z!eWWOBW*qEdeF*;7hY3iaTR_XRBLJKk#<_%GbC}84~J<=afLb?E}d{3kR7ac8mR*er)BJf{{dp8X2vK` R>%IU0002ovPDHLkV1gtNS)Bj? literal 0 HcmV?d00001 diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/molten_bronze.png b/1.11/src/main/resources/assets/forgecraft/textures/items/molten_bronze.png new file mode 100644 index 0000000000000000000000000000000000000000..1939724cbeb897d3ff4d51bee2c2f806718c1b4b GIT binary patch literal 846 zcmV-U1F`&xP)5B>03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00Oc}L_t(I%LT#Na^pk* zK+&sKcWbj`Id*28WftBj-uQEVh2mkLikhOb5Hg8nTavZ)#yOGs?LHjm6?FyTu+UV7 zYFv>l3O*Xl^NdnGbCNTMnM$RQW)KW+Xpj%0Aj=ozdE!w?He-cg;A9Tur!B*k<3hag(BC zL7N4HQEPN=>GA<-W>OvTa_DJwLhnAKyB&Jov$KX$9Y}@4xIh{v%05C|5qSI?1R3)d zDx0z~G2?bYiZ{~s4{Y9ppGjPb-@t4}UUfozHz5w2iQV?Zo$jb@hmS#th3X#(CZV~$ zK?cifQ^MNQ_c4)zo!8VaBT^qc@g6v4^dq#1?Z0=zl!8_;ALxBX91Vo(BY*lc0y*&07-18O z1v-7g^&oYI%Ok3LOX8oIt)(dy^=x=Ef~(%JSsBDQDb8LZ3Yb*N-W4Pt95yLfcZP3+ zqRTXYMV26T1QujsImVW{E0I~95CsK~DcN>GI!SjP=u=DH%>0tC$R^LvV@IF8zt03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00JFJL_t(I%O%mfaRfya zK+*d?Ju}iug^!0#SXAMV17TobKum-H89<5M>F)Qz;G}Tm*Po9rOY|^~m3SL%i!C4q zvXqPBS;{&K4dvK{sj~?5onT19+=RmJMF{AI@f5P)zM;H$+b3>C#h?jdf>t%4XbR>@ z8sI0SF&_XzJYd|$Z4;S7ok5*o$3Vk{RHY4`DOf2Ti?*bmO`S;#=tpAtMqS`EvK$?P z>Q(3+sKBr$q}a>24O|7%sDK$t-xDuG1a5-RMB`9VJo!L~C&?1PT*kfzB-?fgFasH~9h)U_*%W z`r{`)zx$0I6B8IJkjg0d>O_y(94$x${Wa(VNU)K7^X)HKZ~p%42O^qzC>l-ICLPWK z9iynBWbuD~z)oN&&p&@;9~Ea>pH>FF|gjf#-mJ zB}+k7_*ysgjm?eoSnL6BG5BX}x`PAZDoAy%RA$2|1)6+K;W(A}SIKkZg~F?-O!|P2 z35`;bY%ydsSHi5M6yCj91$;CKs0-8*ipIC0z#hdl;5q{==!c*RM;SNZ0}|tHf$MI} zm3}10v)Dt)SFvlbWRqiX&Ej=}jb;Sw*WemL3;2@8QqT#}1`#|Qq7rjqr-5#~h2s_~ fpnS8+DUAOBHFZxC2O8r#00000NkvXXu0mjfUIQ9_ literal 0 HcmV?d00001