From d8ccfd844ce2c2b07a7ed3cc19fb805133dbc2ee Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Thu, 19 Dec 2019 22:35:45 +0100 Subject: [PATCH] Needs more unused materials - Added and hid a few items for future recipe changes - Re-ordered the Creative Tab a little --- .../java/com/simibubi/create/AllItems.java | 52 ++++++++++++------ .../com/simibubi/create/CreateItemGroup.java | 37 +++++++++---- .../create/foundation/item/IAddedByOther.java | 5 ++ .../relays/belt/BeltConnectorItem.java | 3 +- .../relays/elementary/CogWheelBlock.java | 7 +++ .../relays/elementary/ShaftBlock.java | 10 ++++ .../management/LogisticalDialItem.java | 3 +- .../base/LogisticalControllerItem.java | 3 +- .../index/LogisticalIndexBlock.java | 20 ++++++- .../resources/assets/create/lang/en_us.json | 11 ++++ .../assets/create/models/item/brass_cube.json | 6 ++ .../create/models/item/brass_nugget.json | 6 ++ .../create/models/item/brass_sheet.json | 6 ++ .../create/models/item/copper_ingot.json | 6 ++ .../create/models/item/copper_nugget.json | 6 ++ .../create/models/item/crushed_brass.json | 6 ++ .../create/models/item/crushed_copper.json | 6 ++ .../create/models/item/crushed_zinc.json | 6 ++ .../assets/create/models/item/zinc_cube.json | 6 ++ .../create/models/item/zinc_nugget.json | 6 ++ .../textures/item/andesite_alloy_cube.png | Bin 487 -> 758 bytes .../create/textures/item/brass_cube.png | Bin 0 -> 508 bytes .../create/textures/item/brass_nugget.png | Bin 0 -> 324 bytes .../create/textures/item/brass_sheet.png | Bin 0 -> 498 bytes .../create/textures/item/copper_ingot.png | Bin 0 -> 504 bytes .../create/textures/item/copper_nugget.png | Bin 0 -> 320 bytes .../create/textures/item/crushed_brass.png | Bin 0 -> 403 bytes .../create/textures/item/crushed_copper.png | Bin 0 -> 421 bytes .../create/textures/item/crushed_gold.png | Bin 432 -> 405 bytes .../create/textures/item/crushed_iron.png | Bin 410 -> 505 bytes .../create/textures/item/crushed_zinc.png | Bin 0 -> 772 bytes .../assets/create/textures/item/zinc_cube.png | Bin 0 -> 481 bytes .../create/textures/item/zinc_nugget.png | Bin 0 -> 346 bytes 33 files changed, 177 insertions(+), 34 deletions(-) create mode 100644 src/main/java/com/simibubi/create/foundation/item/IAddedByOther.java create mode 100644 src/main/resources/assets/create/models/item/brass_cube.json create mode 100644 src/main/resources/assets/create/models/item/brass_nugget.json create mode 100644 src/main/resources/assets/create/models/item/brass_sheet.json create mode 100644 src/main/resources/assets/create/models/item/copper_ingot.json create mode 100644 src/main/resources/assets/create/models/item/copper_nugget.json create mode 100644 src/main/resources/assets/create/models/item/crushed_brass.json create mode 100644 src/main/resources/assets/create/models/item/crushed_copper.json create mode 100644 src/main/resources/assets/create/models/item/crushed_zinc.json create mode 100644 src/main/resources/assets/create/models/item/zinc_cube.json create mode 100644 src/main/resources/assets/create/models/item/zinc_nugget.json create mode 100644 src/main/resources/assets/create/textures/item/brass_cube.png create mode 100644 src/main/resources/assets/create/textures/item/brass_nugget.png create mode 100644 src/main/resources/assets/create/textures/item/brass_sheet.png create mode 100644 src/main/resources/assets/create/textures/item/copper_ingot.png create mode 100644 src/main/resources/assets/create/textures/item/copper_nugget.png create mode 100644 src/main/resources/assets/create/textures/item/crushed_brass.png create mode 100644 src/main/resources/assets/create/textures/item/crushed_copper.png create mode 100644 src/main/resources/assets/create/textures/item/crushed_zinc.png create mode 100644 src/main/resources/assets/create/textures/item/zinc_cube.png create mode 100644 src/main/resources/assets/create/textures/item/zinc_nugget.png diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index 7c4db20fe..d454cd82e 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -41,26 +41,32 @@ import net.minecraftforge.registries.IForgeRegistry; @EventBusSubscriber(value = Dist.CLIENT, bus = Bus.MOD) public enum AllItems { - __CURIOSITIES__(), - SYMMETRY_WAND(new SymmetryWandItem( - standardItemProperties().setTEISR(() -> () -> renderUsing(AllItemRenderers.SYMMETRY_WAND)))), - PLACEMENT_HANDGUN( - new BuilderGunItem(new Properties().setTEISR(() -> () -> renderUsing(AllItemRenderers.BUILDER_GUN)))), - DEFORESTER(new DeforesterItem( - standardItemProperties().setTEISR(() -> () -> renderUsing(AllItemRenderers.DEFORESTER)))), - __MATERIALS__(), + COPPER_INGOT(ingredient()), + ZINC_CUBE(ingredient()), + ANDESITE_ALLOY_CUBE(ingredient()), + BRASS_CUBE(ingredient()), + COPPER_NUGGET(ingredient()), + ZINC_NUGGET(ingredient()), + BRASS_NUGGET(ingredient()), IRON_SHEET(ingredient()), GOLD_SHEET(ingredient()), - ANDESITE_ALLOY_CUBE(ingredient()), - BLAZE_BRASS_CUBE(ingredient()), - CHORUS_CHROME_CUBE(ingredient(Rarity.UNCOMMON)), + BRASS_SHEET(ingredient()), + + BLAZE_BRASS_CUBE(new Item(new Properties())), + CHORUS_CHROME_CUBE(new Item(new Properties().rarity(Rarity.UNCOMMON))), SHADOW_STEEL_CUBE(new Item(new Properties().rarity(Rarity.UNCOMMON))), ROSE_QUARTZ(new Item(new Properties())), REFINED_ROSE_QUARTZ(new Item(new Properties())), CHROMATIC_COMPOUND_CUBE(new ChromaticCompoundCubeItem(new Properties().rarity(Rarity.UNCOMMON))), REFINED_RADIANCE_CUBE(new Item(new Properties().rarity(Rarity.UNCOMMON))), + CRUSHED_IRON(ingredient()), + CRUSHED_GOLD(ingredient()), + CRUSHED_COPPER(ingredient()), + CRUSHED_ZINC(ingredient()), + CRUSHED_BRASS(ingredient()), + // BLAZING_PICKAXE(new BlazingToolItem(1, -2.8F, standardProperties(), PICKAXE)), // BLAZING_SHOVEL(new BlazingToolItem(1.5F, -3.0F, standardProperties(), SHOVEL)), // BLAZING_AXE(new BlazingToolItem(5.0F, -3.0F, standardProperties(), AXE)), @@ -89,11 +95,8 @@ public enum AllItems { FLOUR(ingredient()), DOUGH(ingredient()), PROPELLER(ingredient()), - WRENCH(new WrenchItem(standardItemProperties().setTEISR(() -> () -> renderUsing(AllItemRenderers.WRENCH)))), - GOGGLES(new GogglesItem(standardItemProperties())), - - CRUSHED_IRON(ingredient()), - CRUSHED_GOLD(ingredient()), + WRENCH(new WrenchItem(standardItemProperties().setTEISR(() -> () -> renderUsing(AllItemRenderers.WRENCH))), true), + GOGGLES(new GogglesItem(standardItemProperties()), true), __LOGISTICS__(), CARDBOARD_BOX_1616(new CardboardBoxItem(standardItemProperties())), @@ -109,6 +112,15 @@ public enum AllItems { LOGISTICAL_CONTROLLER_CALCULATION(new LogisticalControllerItem(standardItemProperties(), Type.CALCULATION)), LOGISTICAL_CONTROLLER_TRANSACTIONS(new LogisticalControllerItem(standardItemProperties(), Type.TRANSACTIONS)), + __CURIOSITIES__(), + PLACEMENT_HANDGUN( + new BuilderGunItem(new Properties().setTEISR(() -> () -> renderUsing(AllItemRenderers.BUILDER_GUN))), true), + DEFORESTER( + new DeforesterItem(standardItemProperties().setTEISR(() -> () -> renderUsing(AllItemRenderers.DEFORESTER))), + true), + SYMMETRY_WAND(new SymmetryWandItem( + standardItemProperties().setTEISR(() -> () -> renderUsing(AllItemRenderers.SYMMETRY_WAND))), true), + ; private static class CategoryTracker { @@ -119,6 +131,7 @@ public enum AllItems { public Item item; public IModule module; + public boolean firstInCreativeTab; private AllItems() { CategoryTracker.currentModule = new IModule() { @@ -130,9 +143,14 @@ public enum AllItems { } private AllItems(Item item) { + this(item, false); + } + + private AllItems(Item item, boolean firstInCreativeTab) { this.item = item; this.item.setRegistryName(Create.ID, Lang.asId(name())); this.module = CategoryTracker.currentModule; + this.firstInCreativeTab = firstInCreativeTab; } public static Properties standardItemProperties() { @@ -155,7 +173,7 @@ public enum AllItems { continue; registry.register(item.get()); } - + AllBlocks.registerItemBlocks(registry); } diff --git a/src/main/java/com/simibubi/create/CreateItemGroup.java b/src/main/java/com/simibubi/create/CreateItemGroup.java index b15e55879..f8e8667ae 100644 --- a/src/main/java/com/simibubi/create/CreateItemGroup.java +++ b/src/main/java/com/simibubi/create/CreateItemGroup.java @@ -1,6 +1,7 @@ package com.simibubi.create; import com.simibubi.create.foundation.block.IWithoutBlockItem; +import com.simibubi.create.foundation.item.IAddedByOther; import net.minecraft.block.Block; import net.minecraft.item.ItemGroup; @@ -17,18 +18,15 @@ public final class CreateItemGroup extends ItemGroup { public ItemStack createIcon() { return new ItemStack(AllBlocks.COGWHEEL.get()); } - + @Override public void fill(NonNullList items) { - for (AllItems item : AllItems.values()) { - if (item.get() == null) - continue; - if (!item.module.isEnabled()) - continue; - - item.get().fillItemGroup(this, items); - } - + addItems(items, true); + addBlocks(items); + addItems(items, false); + } + + public void addBlocks(NonNullList items) { for (AllBlocks block : AllBlocks.values()) { if (block.get() == null) continue; @@ -36,10 +34,27 @@ public final class CreateItemGroup extends ItemGroup { continue; if (block.get() instanceof IWithoutBlockItem) continue; - + if (block.get() instanceof IAddedByOther) + continue; + block.get().asItem().fillItemGroup(this, items); for (Block alsoRegistered : block.alsoRegistered) alsoRegistered.asItem().fillItemGroup(this, items); } } + + public void addItems(NonNullList items, boolean prioritized) { + for (AllItems item : AllItems.values()) { + if (item.get() == null) + continue; + if (!item.module.isEnabled()) + continue; + if (item.firstInCreativeTab != prioritized) + continue; + if (item.get() instanceof IAddedByOther) + continue; + + item.get().fillItemGroup(this, items); + } + } } diff --git a/src/main/java/com/simibubi/create/foundation/item/IAddedByOther.java b/src/main/java/com/simibubi/create/foundation/item/IAddedByOther.java new file mode 100644 index 000000000..41f9ab346 --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/item/IAddedByOther.java @@ -0,0 +1,5 @@ +package com.simibubi.create.foundation.item; + +public interface IAddedByOther { + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltConnectorItem.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltConnectorItem.java index 201a6ae43..509373a90 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltConnectorItem.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltConnectorItem.java @@ -5,6 +5,7 @@ import java.util.List; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateConfig; +import com.simibubi.create.foundation.item.IAddedByOther; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Part; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope; @@ -23,7 +24,7 @@ import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BeltConnectorItem extends BlockItem { +public class BeltConnectorItem extends BlockItem implements IAddedByOther { public BeltConnectorItem(Properties properties) { super(AllBlocks.BELT.block, properties); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java index 8e887f94c..98c333d26 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java @@ -8,7 +8,10 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.item.BlockItemUseContext; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; @@ -66,6 +69,10 @@ public class CogWheelBlock extends ShaftBlock { return isLarge ? 1f : .75f; } + public void fillItemGroup(ItemGroup group, NonNullList items) { + items.add(new ItemStack(this)); + } + // IRotate @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java index a2e4af1d0..9e49dd1e7 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java @@ -1,12 +1,16 @@ package com.simibubi.create.modules.contraptions.relays.elementary; +import com.simibubi.create.AllItems; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.base.RotatedPillarKineticBlock; import net.minecraft.block.BlockState; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; @@ -43,6 +47,12 @@ public class ShaftBlock extends RotatedPillarKineticBlock { public float getParticleInitialRadius() { return 0f; } + + @Override + public void fillItemGroup(ItemGroup group, NonNullList items) { + super.fillItemGroup(group, items); + AllItems.BELT_CONNECTOR.get().fillItemGroup(group, items); + } // IRotate: diff --git a/src/main/java/com/simibubi/create/modules/logistics/management/LogisticalDialItem.java b/src/main/java/com/simibubi/create/modules/logistics/management/LogisticalDialItem.java index 6f18d9d19..c0abc264d 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/management/LogisticalDialItem.java +++ b/src/main/java/com/simibubi/create/modules/logistics/management/LogisticalDialItem.java @@ -2,6 +2,7 @@ package com.simibubi.create.modules.logistics.management; import java.util.UUID; +import com.simibubi.create.foundation.item.IAddedByOther; import com.simibubi.create.foundation.item.IItemWithColorHandler; import com.simibubi.create.modules.logistics.management.base.LogisticalActorTileEntity; @@ -17,7 +18,7 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.world.World; -public class LogisticalDialItem extends Item implements IItemWithColorHandler { +public class LogisticalDialItem extends Item implements IItemWithColorHandler, IAddedByOther { public LogisticalDialItem(Properties properties) { super(properties); diff --git a/src/main/java/com/simibubi/create/modules/logistics/management/base/LogisticalControllerItem.java b/src/main/java/com/simibubi/create/modules/logistics/management/base/LogisticalControllerItem.java index 9025ef0a5..351aa7489 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/management/base/LogisticalControllerItem.java +++ b/src/main/java/com/simibubi/create/modules/logistics/management/base/LogisticalControllerItem.java @@ -2,6 +2,7 @@ package com.simibubi.create.modules.logistics.management.base; import com.simibubi.create.AllBlocks; import com.simibubi.create.Create; +import com.simibubi.create.foundation.item.IAddedByOther; import com.simibubi.create.modules.logistics.management.base.LogisticalControllerBlock.Type; import net.minecraft.item.BlockItem; @@ -9,7 +10,7 @@ import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -public class LogisticalControllerItem extends BlockItem { +public class LogisticalControllerItem extends BlockItem implements IAddedByOther { private Type type; diff --git a/src/main/java/com/simibubi/create/modules/logistics/management/index/LogisticalIndexBlock.java b/src/main/java/com/simibubi/create/modules/logistics/management/index/LogisticalIndexBlock.java index 07551a48e..91a8b7de2 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/management/index/LogisticalIndexBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/management/index/LogisticalIndexBlock.java @@ -14,12 +14,14 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.BlockItemUseContext; +import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.state.StateContainer.Builder; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.Direction; import net.minecraft.util.Hand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.shapes.ISelectionContext; @@ -29,7 +31,8 @@ import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -public class LogisticalIndexBlock extends HorizontalBlock implements IBlockWithColorHandler, IWithTileEntity { +public class LogisticalIndexBlock extends HorizontalBlock + implements IBlockWithColorHandler, IWithTileEntity { public LogisticalIndexBlock() { super(Properties.from(Blocks.GRANITE)); @@ -49,6 +52,17 @@ public class LogisticalIndexBlock extends HorizontalBlock implements IBlockWithC super.fillStateContainer(builder); } + @Override + public void fillItemGroup(ItemGroup group, NonNullList items) { + super.fillItemGroup(group, items); + AllItems[] logisiticalItems = new AllItems[] { AllItems.LOGISTICAL_DIAL, AllItems.LOGISTICAL_CONTROLLER_STORAGE, + AllItems.LOGISTICAL_CONTROLLER_SUPPLY, AllItems.LOGISTICAL_CONTROLLER_REQUEST, + AllItems.LOGISTICAL_CONTROLLER_CALCULATION, AllItems.LOGISTICAL_CONTROLLER_TRANSACTIONS }; + for (AllItems item : logisiticalItems) { + item.get().fillItemGroup(group, items); + } + } + @Override public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT_MIPPED; @@ -85,14 +99,14 @@ public class LogisticalIndexBlock extends HorizontalBlock implements IBlockWithC public TileEntity createTileEntity(BlockState state, IBlockReader world) { return new LogisticalIndexTileEntity(); } - + @Override public boolean onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (AllItems.LOGISTICAL_DIAL.typeOf(player.getHeldItem(handIn))) { return false; } - + if (worldIn.isRemote) { return true; } else { diff --git a/src/main/resources/assets/create/lang/en_us.json b/src/main/resources/assets/create/lang/en_us.json index 7448852b4..536dd6d7f 100644 --- a/src/main/resources/assets/create/lang/en_us.json +++ b/src/main/resources/assets/create/lang/en_us.json @@ -29,6 +29,17 @@ "item.create.crushed_iron": "Crushed Iron Ore", "item.create.crushed_gold": "Crushed Gold Ore", + "item.create.brass_cube": "Brass", + "item.create.brass_sheet": "Brass Sheets", + "item.create.brass_nugget": "Brass Nugget", + "item.create.crushed_brass": "Crushed Brass", + "item.create.zinc_cube": "Zinc Bar", + "item.create.zinc_nugget": "Zinc Nugget", + "item.create.crushed_zinc": "Crushed Zinc", + "item.create.copper_ingot": "Copper Ingot", + "item.create.copper_nugget": "Copper Nugget", + "item.create.crushed_copper": "Crushed Copper", + "item.create.logistical_controller_supply": "Item Supply", "item.create.logistical_controller_request": "Item Request", "item.create.logistical_controller_storage": "Item Storage", diff --git a/src/main/resources/assets/create/models/item/brass_cube.json b/src/main/resources/assets/create/models/item/brass_cube.json new file mode 100644 index 000000000..474bfbe20 --- /dev/null +++ b/src/main/resources/assets/create/models/item/brass_cube.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "create:item/brass_cube" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/brass_nugget.json b/src/main/resources/assets/create/models/item/brass_nugget.json new file mode 100644 index 000000000..eebfc8949 --- /dev/null +++ b/src/main/resources/assets/create/models/item/brass_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "create:item/brass_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/brass_sheet.json b/src/main/resources/assets/create/models/item/brass_sheet.json new file mode 100644 index 000000000..b700cef46 --- /dev/null +++ b/src/main/resources/assets/create/models/item/brass_sheet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "create:item/brass_sheet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/copper_ingot.json b/src/main/resources/assets/create/models/item/copper_ingot.json new file mode 100644 index 000000000..864a88bd9 --- /dev/null +++ b/src/main/resources/assets/create/models/item/copper_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "create:item/copper_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/copper_nugget.json b/src/main/resources/assets/create/models/item/copper_nugget.json new file mode 100644 index 000000000..3fb9e5fb3 --- /dev/null +++ b/src/main/resources/assets/create/models/item/copper_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "create:item/copper_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/crushed_brass.json b/src/main/resources/assets/create/models/item/crushed_brass.json new file mode 100644 index 000000000..2a2dc706f --- /dev/null +++ b/src/main/resources/assets/create/models/item/crushed_brass.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "create:item/crushed_brass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/crushed_copper.json b/src/main/resources/assets/create/models/item/crushed_copper.json new file mode 100644 index 000000000..6dbd89981 --- /dev/null +++ b/src/main/resources/assets/create/models/item/crushed_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "create:item/crushed_copper" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/crushed_zinc.json b/src/main/resources/assets/create/models/item/crushed_zinc.json new file mode 100644 index 000000000..e1812eee5 --- /dev/null +++ b/src/main/resources/assets/create/models/item/crushed_zinc.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "create:item/crushed_zinc" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/zinc_cube.json b/src/main/resources/assets/create/models/item/zinc_cube.json new file mode 100644 index 000000000..1cbe79d1d --- /dev/null +++ b/src/main/resources/assets/create/models/item/zinc_cube.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "create:item/zinc_cube" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/zinc_nugget.json b/src/main/resources/assets/create/models/item/zinc_nugget.json new file mode 100644 index 000000000..311008064 --- /dev/null +++ b/src/main/resources/assets/create/models/item/zinc_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "create:item/zinc_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/item/andesite_alloy_cube.png b/src/main/resources/assets/create/textures/item/andesite_alloy_cube.png index b26d79fab4d6bfeaa240907e17b905d0bc9c1f29..eee0c85a415c416ad831d6709432f6fc5bd6559a 100644 GIT binary patch delta 697 zcmV;q0!IDk1NH@wNq@os01m zUTFvm*{T66VjzT|i6O=q;t$b77O_h94uDu3GAI^nZlha{268?1c&hR&`a z=H|XgR)m|*%z#DQ+1W;Y{VCBsFwl?4ySK<@a#&kS$dekT4sAvgM-md!Db&L1dpus- zcm=z=yYk+KVIq}2kiIxLNZXbrWHK2kx&sNo6ls*pWzf;lVHeIsHmkwVOW6CdXJ=@j zvGEMbC4YtP?sN8CR-ALW+;IR#oqYLPZEmk39*?7`DIggn66^NNR#))*Ph)R?8}Fwg z`1oN)(XXzq?r$TdQYop$&0E*3ww5l0LLq!!{Dh^&Ws%4lEzHLirLuQC9*>YHIg3yJ>%I5_!vm>~z( fOrJ6c%d+qb0Sb@(vDDUu00000NkvXXu0mjf3g$-y delta 424 zcmV;Z0ayO^1?K~hNq@rt01m?e$8V@)0000ObVXQnQ*UN;cVTj60B~VxZgehgWpp4k zE-@}P{Z0w!00044NkljcXG$3YthEA}$1WRThPSsU$Ro z^iK%J3L8QbSBj6&g@Fi$*Eo7_EGc#{5*J@OIlbqb=`;r5Uw;V0br6POc6PTx{LBM{ zVNfEv-8L-CLP|QobUKa9E*A7MDE0d;eBZ}t^omO52AZa=lq?ohoX=-?etClHx-bj_ zilU%gE_1n5Qs6jFM6x8Hf$?~P$KC@voqG%h19+YX+rGo>FJ zGEh~O1%|2P>RRSfJidoSa{qThp-|u(SJgUyYpbOrotBVH9)3TMP_0&?0=kgkHD0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TZ7{~&ti@{^2U0Tgfwy8$pwAQ0%P2d3BWzJ$dPGy`B7 zL7H5mV;Fva|HAO)eTbN>S+8UFn_#_;d&Zw5wYR)+8I zUNHOt8uI_&U!d3@hSP^mF)Z11nqkR?3qV64;lTtZq2S8i9tI{BE1;&Y41a!nVPIlr zVPN6p0b*_jVU<({kEGcQll$`-Vgd}{USxsNaPa!(bOurNOoksHwlQ!C`$0t+7{0yT z#BgZiW`;NKzB1f>_zo(H=7J07&w*)>OE?6)7(m_w8MtF!D#N<@D;O@_e9Z9dH9|88 zzzz8N{U?|{dlX^_2<)6chhgXD!(dxM8sEHp0mjGx#RbTwgKUOrglT^J;UgF$1GoX8 zkiB&C1=yJ&ue^MMu=VE6n_!LC9{vU6{JoX#{D20c4G^XvCTl yEe+-1(S)iA8Q?Jh0x&ZUHUKmLZW$Ti6axTR?c_L%4kFY50000vDpb#OMd=$2)AWR&Q@;Q?0(*G&HY-=9FA)Y?3_x;6VBS( zy=QrRUjO>P`qJcE|Lgzz{bBE1yqYx;Xx6#MY|A2dR!F#9HJ03^{Yp~rZUvv1GkXMY z#3f-?GnSU!r)(we?Wtj$dXPopUlZ$swHu9^8y5;5UUbx3f-k=2c)_1P$^{OKn0dq- zcvx6(JltF^sW->|_=j(Y-BOV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/item/brass_sheet.png b/src/main/resources/assets/create/textures/item/brass_sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..e2bfe58df9f6a7b906720dcc1bcea89860c3c3e4 GIT binary patch literal 498 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0f$LMK~y+TWBmXB zKLaHIXuwG*lRQA80cKDd0l)?@GMYoVm;mC%QxFaofMEbg10y3NlzoyRJu(*_NHdq8 zgh(I(tOleJF102UAd(hPJSkaY!!nSuBZ5dQ|EHw;WH ztPC97d<_5o{$Wtn=3=nY6KDAPT_2=Gsr0Rju#{eYwn5Pt?@pk@X(1}1KP1`Zw| z<`rOIVrF3wR7z%uuiV6tmmI_p6JYQk6joptfWXt|@4$wD6fpccz`(%D3baEAXoxx3 z79Ku`B_MSlK79e}0ec@g4CF;w8C+c57|eX@zzRSBr0MF-M+|R2d}R2^zz-E=U|72G zB1A88EWiwrmK1{9^y~vz3JjKPxBzrDA|^2m00CHReEt3t%tzJ)OCzut03|SZbdU$& o24G97pmdKr3Bv$|E?{5)05`6?Avc3JhyVZp07*qoM6N<$g3HLdy#N3J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/item/copper_ingot.png b/src/main/resources/assets/create/textures/item/copper_ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..4819b12c9d42706082f68709a72794f0adf725d8 GIT binary patch literal 504 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0gXvSK~y+TV;DN1 zT2uBv2t&DWzzC(W0%Q&8Gy51`T|C3Ee%dmI*6WYq`Y;SY)>N`}6T_eH-xxUfc^Urx z`p)q8=MRSeK-eD?3pWHzAZyB9HlKlogPVa@S{^L>@7E8YMxbV}0pA(^{rSc4VBao= z+^!i6#~*)WWCUq0-*bfF_ow>|%xs(t%ze zSA(Tlz$6g7y>@^>RL=!$GRP2SPEiIXR(1v^_Wum;Z=Yc}KW8$-hZ{Gbsu2Kgz~5g# z8E&qb!k`&m0Q3SI!-sq487|D5hM`G7LxVw3K^Dq`8u0baI|hCQMX)s uSPYjYWPloBk-MwNP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T9Ku$RDKML1wtxW0W|%mLhVeldq{hNP79@pm!Iix|47(T2 zXV7sj0kc6i!(1dRzz^onTC)_acG2P`U>XF#1^^W@rj|@%*mvkOSToG2FsD1&nS%Ks zHpsBU7vC|QxbT<}BnD5)jEsy7AZLNtw)#R~v9}*SGKBiMfDHz*uRZ(=7C(Oe5m++_ xfDHg?Mg}m0&;iU=7y#>qxqw_S(3y#W0RZ#P1Kz?j+U5WN002ovPDHLkV1kQnph*A# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/item/crushed_copper.png b/src/main/resources/assets/create/textures/item/crushed_copper.png new file mode 100644 index 0000000000000000000000000000000000000000..2adce76cfeecc3bdd6187e6da85124386edb0609 GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4OX5mjv*HQ$$$R;w`W#u;Pjfzt6|o_I9og+ ziSyd8|Be#V%@01>!NZVQQ=RwszwzYL2iqD9LZtW{UK#9R2%3?R{9%825%b}{i`6CW z*;nw0v42c#YcM&a<7UXPgkecQuoug^pI4v1PdKYkx24tWj(|jiG{a?{pbQoDa~r;2 zklgU>Zut9!5^PLiMN9?G2iO#{*)&bM_);ebK4H#g>-3M@$eefMtUJHNtV4SqwjGEq z$a|U9HhX%0qiOREgR=_Gj&V#MieMd6m^P;on5=p3>FZjBG0ZbFPtm z7BZvTVI3o*fON`@HsN%MKKp+sIE0$jQ{CL$*t{d_4Ac)CV$mu4dsCV%JXdwYK?SoD zKNSkzTx8#nCcq%gaH)qUfo&o4jI{;~*SL!rcQUBTPGHtBX=r3*FpEFq5@wzZ3Tg&V LS3j3^P6{9hl$12zaMjURv%f;7N1|GMS{a|Ku&qz1@@yAlP!6yBL84A=Z}qbOJm z#)ldXH-rhQ7p&QL_B)1Ozp@zQ9LyOW&t1jv{`P5xlbip5#eW#@J_PeYU~{Svs`W6N zVYYw($Yx}x!}uT!Qj_P-4U&Sm;Ox8K48N~?Gkn;whJjUcE0_(k8Rnu`7j`h;eQE?) z?V|%H!4@+zGC~Y!So@i=r0^ia=coU`nqf`_Y5sqck%3p539J$14Ul1zHvV9kwDT(? zNDY_(IR#`I$WB=xex5%Eh+?>Q?jM7>FALb<#e04-y#EUE`otYyAew=CzzlQ%GYB2P nY()l)AlqpIXl5`fU|;|M4oC0Uv3n#w00000NkvXXu0mjf(9)KD delta 368 zcmV-$0gwKb1F!>-Nq@rt01m?e$8V@)0003+NklE-o%$ z#-~r87%YXZfyF>z^O>&)YJ0|NlvADT@cC=}xW O0000o!`D#P!;e;Gc%dI~m7NlgQ6 z5mXz*0FY*oEg;PxTSb+18Dzvo7`E-)!%$FM!Z3UO60qhwZ+*3 z0UL1gA_)FhHi+TNwT4 z;^k-1R*(bTz%%i)5Y0e6@MuH^AcLSx6acdo k8NlO|>VRejqXGs70CNq~rDbU&`Tzg`07*qoM6N<$f@>SbIsgCw delta 346 zcmV-g0j2)=1DXSnNq@os01mAuaMqLqYgSTHVh9ThLooy;8bO)_ zxVacUeEr4%)4bs1Q?MLJ^OrAQ7(RUXz;ONgb%s@|RxyIa;eRfG*~r7q$*|}C4~ADy z9)LB2G>VCdF+6$lgn@^Lhe1FM9i#zd>%DvT7~Va<4Hn}Cs(tzF6<8nGfDLDEf;EGj z3Q`Etgskw@t5a7D#}Djc2ry9xi-FX?dix%106Y*~TwK76PoF+9m>a0TZ2&1`;TB~0 s^YuN0n6MyRPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0+~rfK~y+TZBsi) zn^6@0@i-SWEhjb_<#UTX; zYpg@D)>MMg#79&NB&c~C{}_|odrtTRfgU(~|9|d1-@WIY??MQHtE(%eSM8w zF30g&t%ke1J7lw2UQ>}=Q4}dB6ks{acdwmxgYjp(fHiNelh`j|J&qY-|9X zot?4|2XMJYaC(}M^=D-n5!Oj066E^HG}UUA*~y$vr`&ji;o)Z@91g=`v9R8$%&x93 zN$BUqwzf9V%}Mf&aghH{wiF|+P_xz8#l;09O|Y&WX;g~UY6aCrMh}S0U@*w5hnR$3 zC|OHO3nP`oO!PQZWzj|=Q=ho%>H{hki;P4jgup+^iVyoHPtkDz0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0d`45K~y+TrIWvE z0znYQ=Yk4pB4Tle5E7yUtB}+og@v|h0;X|aAn)P}*qx9E2neD@3LDWPhn2(_1W^w0 z52OiVak-hDHM?pP@`JsZ-J9>b;cm_f?#|&qShj6*`ZxScj^YtrcknNdIg@#zFb;6> z5#fBiQlt*hO&ut7L9rNxSPYto}kcsgQn$6!L1@6^C^GbzpFcFT#Xe3SYc|L%*P;>*W7CQ~q`EvOT zy`G>P<6_}KGI`C_62o9V2k3UoTXCmTCjp8v4hHwoZlA$y_O$;QagcBh;&J@e0PA&` zo`@oaE>!cgHBelAJs2aai*(eulYu_QzVCAucI7yn?Slr+`}h9ec*sEixfCe&GdcJH XTgj$_rNU}s0imj4PokKXI`9SUf_&RRVG(;t0Z-;|1a{VnC zwq{1FxZ&yPbfYGd1|G&tHdZ;0&tG4+8<;dRgoz*EY0PB1$-`xk)3Bn2h53e% oh~MN+)`-0hTnjERu(2^rxVd?I@PW+^K(8}+y85}Sb4q9e01;(?IRF3v literal 0 HcmV?d00001