From a8ea0f55e71e1e792ca9552c16d5af4bbab3841f Mon Sep 17 00:00:00 2001 From: gigabit101 Date: Fri, 9 Oct 2015 21:55:54 +0100 Subject: [PATCH] Removed a load of un needed junk from other versions of Gtech --- .../techreborn/blocks/BlockMetalShelf.java | 54 ----- .../techreborn/blocks/BlockWoodenshelf.java | 48 ---- .../machine/BlockAssemblingMachine.java | 87 -------- .../techreborn/blocks/machine/BlockLathe.java | 87 -------- .../machine/BlockPlateCuttingMachine.java | 87 -------- .../java/techreborn/client/GuiHandler.java | 21 -- .../container/ContainerAssemblingMachine.java | 55 ----- .../client/container/ContainerLathe.java | 54 ----- .../ContainerPlateCuttingMachine.java | 54 ----- .../client/gui/GuiAssemblingMachine.java | 58 ----- .../java/techreborn/client/gui/GuiLathe.java | 58 ----- .../client/gui/GuiPlateCuttingMachine.java | 59 ----- .../java/techreborn/compat/nei/NEIConfig.java | 12 - .../AssemblingMachineRecipeHandler.java | 59 ----- .../nei/recipes/LatheRecipeHandler.java | 54 ----- .../PlateCuttingMachineRecipeHandler.java | 53 ----- .../techreborn/compat/recipes/RecipesIC2.java | 129 +++++------ .../compat/recipes/RecipesIC2Classic.java | 128 +++++------ src/main/java/techreborn/init/ModBlocks.java | 28 +-- src/main/java/techreborn/init/ModItems.java | 130 +---------- src/main/java/techreborn/init/ModRecipes.java | 73 +++--- .../java/techreborn/items/ItemDustsTiny.java | 93 -------- src/main/java/techreborn/items/ItemParts.java | 3 +- src/main/java/techreborn/items/ItemRods.java | 81 ------- src/main/java/techreborn/pda/GuiManual.java | 5 - .../tiles/TileAssemblingMachine.java | 210 ----------------- src/main/java/techreborn/tiles/TileLathe.java | 210 ----------------- .../java/techreborn/tiles/TileMetalShelf.java | 137 ------------ .../tiles/TilePlateCuttingMachine.java | 211 ------------------ .../assets/techreborn/lang/en_US.lang | 127 ----------- .../textures/items/metalRod/brassRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/bronzeRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/copperRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/electrumRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/goldRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/invarRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/iridiumRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/ironRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/leadRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/nickelRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/platinumRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/silverRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/steelRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/tinRod.png | Bin 127 -> 0 bytes .../textures/items/metalRod/titaniumRod.png | Bin 127 -> 0 bytes .../items/metalRod/tungstensteelRod.png | Bin 127 -> 0 bytes .../items/tinyDust/tinyAlmandineDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyAluminumBrassDust.png | Bin 179 -> 0 bytes .../items/tinyDust/tinyAluminumDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyAlumiteDust.png | Bin 183 -> 0 bytes .../items/tinyDust/tinyAndraditeDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyAntimonyDust.png | Bin 166 -> 0 bytes .../items/tinyDust/tinyArditeDust.png | Bin 179 -> 0 bytes .../textures/items/tinyDust/tinyAshes.png | Bin 135 -> 0 bytes .../textures/items/tinyDust/tinyAshesDust.png | Bin 135 -> 0 bytes .../items/tinyDust/tinyBasaltDust.png | Bin 133 -> 0 bytes .../items/tinyDust/tinyBauxiteDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyBiotiteDust.png | Bin 133 -> 0 bytes .../textures/items/tinyDust/tinyBrassDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyBronzeDust.png | Bin 145 -> 0 bytes .../items/tinyDust/tinyCadmiumDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyCalciteDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinyCharcoalDust.png | Bin 133 -> 0 bytes .../items/tinyDust/tinyChromeDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyCinnabarDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinyCinnibarDust.png | Bin 136 -> 0 bytes .../textures/items/tinyDust/tinyClayDust.png | Bin 186 -> 0 bytes .../textures/items/tinyDust/tinyCoalDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinyCobaltDust.png | Bin 142 -> 0 bytes .../items/tinyDust/tinyCopperDust.png | Bin 141 -> 0 bytes .../items/tinyDust/tinyCupronickelDust.png | Bin 138 -> 0 bytes .../textures/items/tinyDust/tinyDarkAshes.png | Bin 133 -> 0 bytes .../items/tinyDust/tinyDarkAshesDust.png | Bin 133 -> 0 bytes .../items/tinyDust/tinyDarkIronDust.png | Bin 141 -> 0 bytes .../items/tinyDust/tinyDiamondDust.png | Bin 139 -> 0 bytes .../items/tinyDust/tinyElectrumDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyEmeraldDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinyEnderEyeDust.png | Bin 139 -> 0 bytes .../items/tinyDust/tinyEnderPearlDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinyEndstoneDust.png | Bin 138 -> 0 bytes .../textures/items/tinyDust/tinyFlintDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinyGalenaDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinyGlowstoneDust.png | Bin 138 -> 0 bytes .../textures/items/tinyDust/tinyGoldDust.png | Bin 145 -> 0 bytes .../items/tinyDust/tinyGraphiteDust.png | Bin 162 -> 0 bytes .../items/tinyDust/tinyGrossularDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyGunpowderDust.png | Bin 139 -> 0 bytes .../items/tinyDust/tinyIndiumDust.png | Bin 138 -> 0 bytes .../textures/items/tinyDust/tinyInvarDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyIridiumDust.png | Bin 138 -> 0 bytes .../textures/items/tinyDust/tinyIronDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyKanthalDust.png | Bin 138 -> 0 bytes .../textures/items/tinyDust/tinyLapisDust.png | Bin 136 -> 0 bytes .../textures/items/tinyDust/tinyLapizDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinyLazuriteDust.png | Bin 136 -> 0 bytes .../textures/items/tinyDust/tinyLeadDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyLimestoneDust.png | Bin 148 -> 0 bytes .../items/tinyDust/tinyLodestoneDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyMagnesiumDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyMagnetiteDust.png | Bin 201 -> 0 bytes .../items/tinyDust/tinyManganeseDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyManyullynDust.png | Bin 180 -> 0 bytes .../items/tinyDust/tinyMarbleDust.png | Bin 133 -> 0 bytes .../items/tinyDust/tinyMithrilDust.png | Bin 179 -> 0 bytes .../items/tinyDust/tinyNetherrackDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinyNichromeDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyNickelDust.png | Bin 433 -> 0 bytes .../items/tinyDust/tinyNikoliteDust.png | Bin 142 -> 0 bytes .../items/tinyDust/tinyObsidianDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyOsmiumDust.png | Bin 169 -> 0 bytes .../items/tinyDust/tinyPeridotDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinyPhosphorousDust.png | Bin 132 -> 0 bytes .../items/tinyDust/tinyPlatinumDust.png | Bin 138 -> 0 bytes .../tinyDust/tinyPotassiumFeldsparDust.png | Bin 133 -> 0 bytes .../items/tinyDust/tinyPyriteDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinyPyropeDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyRedGarnetDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyRedrockDust.png | Bin 133 -> 0 bytes .../items/tinyDust/tinyRedstoneDust.png | Bin 138 -> 0 bytes .../textures/items/tinyDust/tinyRubyDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinySaltpeterDust.png | Bin 133 -> 0 bytes .../items/tinyDust/tinySapphireDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinySiliconDust.png | Bin 133 -> 0 bytes .../items/tinyDust/tinySilverDust.png | Bin 173 -> 0 bytes .../items/tinyDust/tinySodaliteDust.png | Bin 136 -> 0 bytes .../items/tinyDust/tinySpessartineDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinySphaleriteDust.png | Bin 136 -> 0 bytes .../textures/items/tinyDust/tinySteelDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinySulfurDust.png | Bin 132 -> 0 bytes .../items/tinyDust/tinyTelluriumDust.png | Bin 194 -> 0 bytes .../items/tinyDust/tinyTeslatiteDust.png | Bin 142 -> 0 bytes .../items/tinyDust/tinyTetrahedriteDust.png | Bin 138 -> 0 bytes .../textures/items/tinyDust/tinyTinDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyTitaniumDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyTungstenDust.png | Bin 138 -> 0 bytes .../textures/items/tinyDust/tinyUvarovite.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyUvaroviteDust.png | Bin 138 -> 0 bytes .../items/tinyDust/tinyVinteumDust.png | Bin 167 -> 0 bytes .../items/tinyDust/tinyVoidstoneDust.png | Bin 162 -> 0 bytes .../items/tinyDust/tinyYellowGarnetDust.png | Bin 138 -> 0 bytes .../textures/items/tinyDust/tinyZincDust.png | Bin 138 -> 0 bytes 141 files changed, 139 insertions(+), 2326 deletions(-) delete mode 100644 src/main/java/techreborn/blocks/BlockMetalShelf.java delete mode 100644 src/main/java/techreborn/blocks/BlockWoodenshelf.java delete mode 100644 src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java delete mode 100644 src/main/java/techreborn/blocks/machine/BlockLathe.java delete mode 100644 src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java delete mode 100644 src/main/java/techreborn/client/container/ContainerAssemblingMachine.java delete mode 100644 src/main/java/techreborn/client/container/ContainerLathe.java delete mode 100644 src/main/java/techreborn/client/container/ContainerPlateCuttingMachine.java delete mode 100644 src/main/java/techreborn/client/gui/GuiAssemblingMachine.java delete mode 100644 src/main/java/techreborn/client/gui/GuiLathe.java delete mode 100644 src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java delete mode 100644 src/main/java/techreborn/compat/nei/recipes/AssemblingMachineRecipeHandler.java delete mode 100644 src/main/java/techreborn/compat/nei/recipes/LatheRecipeHandler.java delete mode 100644 src/main/java/techreborn/compat/nei/recipes/PlateCuttingMachineRecipeHandler.java delete mode 100644 src/main/java/techreborn/items/ItemDustsTiny.java delete mode 100644 src/main/java/techreborn/items/ItemRods.java delete mode 100644 src/main/java/techreborn/tiles/TileAssemblingMachine.java delete mode 100644 src/main/java/techreborn/tiles/TileLathe.java delete mode 100644 src/main/java/techreborn/tiles/TileMetalShelf.java delete mode 100644 src/main/java/techreborn/tiles/TilePlateCuttingMachine.java delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/brassRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/bronzeRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/copperRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/electrumRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/goldRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/invarRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/iridiumRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/ironRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/leadRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/nickelRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/platinumRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/silverRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/steelRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/tinRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/titaniumRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/metalRod/tungstensteelRod.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAlmandineDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAluminumBrassDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAluminumDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAlumiteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAndraditeDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAntimonyDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyArditeDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAshes.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAshesDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyBasaltDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyBauxiteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyBiotiteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyBrassDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyBronzeDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCadmiumDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCalciteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCharcoalDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyChromeDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCinnabarDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCinnibarDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyClayDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCoalDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCobaltDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCopperDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCupronickelDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyDarkAshes.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyDarkAshesDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyDarkIronDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyDiamondDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyElectrumDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyEmeraldDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyEnderEyeDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyEnderPearlDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyEndstoneDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyFlintDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyGalenaDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyGlowstoneDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyGoldDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyGraphiteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyGrossularDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyGunpowderDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyIndiumDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyInvarDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyIridiumDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyIronDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyKanthalDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLapisDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLapizDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLazuriteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLeadDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLimestoneDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLodestoneDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyMagnesiumDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyMagnetiteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyManganeseDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyManyullynDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyMarbleDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyMithrilDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyNetherrackDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyNichromeDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyNickelDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyNikoliteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyObsidianDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyOsmiumDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyPeridotDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyPhosphorousDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyPlatinumDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyPotassiumFeldsparDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyPyriteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyPyropeDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyRedGarnetDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyRedrockDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyRedstoneDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyRubyDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinySaltpeterDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinySapphireDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinySiliconDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinySilverDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinySodaliteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinySpessartineDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinySphaleriteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinySteelDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinySulfurDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyTelluriumDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyTeslatiteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyTetrahedriteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyTinDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyTitaniumDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyTungstenDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyUvarovite.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyUvaroviteDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyVinteumDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyVoidstoneDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyYellowGarnetDust.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/tinyDust/tinyZincDust.png diff --git a/src/main/java/techreborn/blocks/BlockMetalShelf.java b/src/main/java/techreborn/blocks/BlockMetalShelf.java deleted file mode 100644 index c3eccfa27..000000000 --- a/src/main/java/techreborn/blocks/BlockMetalShelf.java +++ /dev/null @@ -1,54 +0,0 @@ -package techreborn.blocks; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -public class BlockMetalShelf extends BlockMachineBase { - - @SideOnly(Side.CLIENT) - private IIcon iconFrontEmpty; - - @SideOnly(Side.CLIENT) - private IIcon iconFrontBooks; - - @SideOnly(Side.CLIENT) - private IIcon iconFrontCans; - - @SideOnly(Side.CLIENT) - private IIcon iconFrontPaper; - - @SideOnly(Side.CLIENT) - private IIcon iconTop; - - @SideOnly(Side.CLIENT) - private IIcon iconBottom; - - public BlockMetalShelf(Material material) { - super(material); - setBlockName("techreborn.metalshelf"); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister icon) { - this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); - this.iconFrontEmpty = icon.registerIcon("techreborn:machine/metal_shelf_empty"); - this.iconTop = icon.registerIcon("techreborn:machine/machine_top"); - this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); - } - - @Override - public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { - int metadata = getTileRotation((World) blockAccess, x, y, z); - return metadata == 0 && side == 3 ? this.iconFrontEmpty - : side == 1 ? this.iconTop : - side == 0 ? this.iconBottom : (side == 0 ? this.iconTop - : (side == metadata ? this.iconFrontEmpty : this.blockIcon)); - } - -} diff --git a/src/main/java/techreborn/blocks/BlockWoodenshelf.java b/src/main/java/techreborn/blocks/BlockWoodenshelf.java deleted file mode 100644 index 4ee6aacfb..000000000 --- a/src/main/java/techreborn/blocks/BlockWoodenshelf.java +++ /dev/null @@ -1,48 +0,0 @@ -package techreborn.blocks; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -public class BlockWoodenshelf extends BlockMachineBase { - - @SideOnly(Side.CLIENT) - private IIcon iconFront; - - @SideOnly(Side.CLIENT) - private IIcon iconTop; - - @SideOnly(Side.CLIENT) - private IIcon iconBottom; - - public BlockWoodenshelf(Material material) { - super(material); - setBlockName("techreborn.woodenshelf"); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister icon) { - this.blockIcon = icon.registerIcon("techreborn:machine/wood_shelf_side"); - this.iconFront = icon.registerIcon("techreborn:machine/wood_shelf_empty"); - this.iconTop = icon.registerIcon("techreborn:machine/wood_shelf_side"); - this.iconBottom = icon.registerIcon("techreborn:machine/wood_shelf_side"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { - int metadata = getTileRotation(blockAccess, x, y, z); - if (side == metadata && blockAccess.getBlockMetadata(x, y, z) == 1) { - return this.iconFront; - } - return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : - side == 0 ? this.iconBottom : (side == 0 ? this.iconTop - : (side == metadata ? this.iconFront : this.blockIcon)); - } - -} diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java deleted file mode 100644 index ec7a2dbea..000000000 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ /dev/null @@ -1,87 +0,0 @@ -package techreborn.blocks.machine; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ic2.api.item.IC2Items; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import techreborn.Core; -import techreborn.blocks.BlockMachineBase; -import techreborn.client.GuiHandler; -import techreborn.tiles.TileAssemblingMachine; - -import java.util.Random; - -public class BlockAssemblingMachine extends BlockMachineBase { - - @SideOnly(Side.CLIENT) - private IIcon iconFront; - - @SideOnly(Side.CLIENT) - private IIcon iconTop; - - @SideOnly(Side.CLIENT) - private IIcon iconFrontOn; - - @SideOnly(Side.CLIENT) - private IIcon iconBottom; - - public BlockAssemblingMachine(Material material) { - super(material); - setBlockName("techreborn.assemblingmachine"); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister icon) { - this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); - this.iconFront = icon.registerIcon("techreborn:machine/assembling_machine_front_off"); - this.iconFrontOn = icon.registerIcon("techreborn:machine/assembling_machine_front_on"); - this.iconTop = icon.registerIcon("techreborn:machine/assembling_machine_top"); - this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); - } - - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TileAssemblingMachine(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, - EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.assemblingmachineID, world, x, y, - z); - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { - int metadata = getTileRotation(blockAccess, x, y, z); - if (side == metadata && blockAccess.getBlockMetadata(x, y, z) == 1) { - return this.iconFrontOn; - } - return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : - side == 0 ? this.iconBottom : (side == 0 ? this.iconTop - : (side == metadata ? this.iconFront : this.blockIcon)); - } - - @Override - public IIcon getIcon(int side, int meta) { - if(side == 1){ - return this.iconTop; - } else if(side == 3){ - return this.iconFront; - } else { - return this.blockIcon; - } - } -} diff --git a/src/main/java/techreborn/blocks/machine/BlockLathe.java b/src/main/java/techreborn/blocks/machine/BlockLathe.java deleted file mode 100644 index 42b70252e..000000000 --- a/src/main/java/techreborn/blocks/machine/BlockLathe.java +++ /dev/null @@ -1,87 +0,0 @@ -package techreborn.blocks.machine; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ic2.api.item.IC2Items; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import techreborn.Core; -import techreborn.blocks.BlockMachineBase; -import techreborn.client.GuiHandler; -import techreborn.tiles.TileLathe; - -import java.util.Random; - -public class BlockLathe extends BlockMachineBase { - - @SideOnly(Side.CLIENT) - private IIcon iconFront; - - @SideOnly(Side.CLIENT) - private IIcon iconFrontOn; - - @SideOnly(Side.CLIENT) - private IIcon iconTop; - - @SideOnly(Side.CLIENT) - private IIcon iconBottom; - - public BlockLathe(Material material) { - super(material); - setBlockName("techreborn.lathe"); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister icon) { - this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); - this.iconFront = icon.registerIcon("techreborn:machine/lathe_front_off"); - this.iconFrontOn = icon.registerIcon("techreborn:machine/lathe_front_on"); - this.iconTop = icon.registerIcon("techreborn:machine/machine_top"); - this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); - } - - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TileLathe(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, - EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.latheID, world, x, y, - z); - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { - int metadata = getTileRotation(blockAccess, x, y, z); - if (side == metadata && blockAccess.getBlockMetadata(x, y, z) == 1) { - return this.iconFrontOn; - } - return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : - side == 0 ? this.iconBottom : (side == 0 ? this.iconTop - : (side == metadata ? this.iconFront : this.blockIcon)); - } - - @Override - public IIcon getIcon(int side, int meta) { - if(side == 1){ - return this.iconTop; - } else if(side == 3){ - return this.iconFront; - } else { - return this.blockIcon; - } - } -} diff --git a/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java b/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java deleted file mode 100644 index 1a4481839..000000000 --- a/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java +++ /dev/null @@ -1,87 +0,0 @@ -package techreborn.blocks.machine; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ic2.api.item.IC2Items; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import techreborn.Core; -import techreborn.blocks.BlockMachineBase; -import techreborn.client.GuiHandler; -import techreborn.tiles.TilePlateCuttingMachine; - -import java.util.Random; - -public class BlockPlateCuttingMachine extends BlockMachineBase { - - @SideOnly(Side.CLIENT) - private IIcon iconFront; - - @SideOnly(Side.CLIENT) - private IIcon iconFrontOn; - - @SideOnly(Side.CLIENT) - private IIcon iconTop; - - @SideOnly(Side.CLIENT) - private IIcon iconBottom; - - public BlockPlateCuttingMachine(Material material) { - super(material); - setBlockName("techreborn.platecuttingmachine"); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister icon) { - this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); - this.iconFront = icon.registerIcon("techreborn:machine/plate_cutting_machine_front_off"); - this.iconFrontOn = icon.registerIcon("techreborn:machine/plate_cutting_machine_front_on"); - this.iconTop = icon.registerIcon("techreborn:machine/machine_top"); - this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); - } - - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TilePlateCuttingMachine(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, - EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.platecuttingmachineID, world, x, y, - z); - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { - int metadata = getTileRotation(blockAccess, x, y, z); - if (side == metadata && blockAccess.getBlockMetadata(x, y, z) == 1) { - return this.iconFrontOn; - } - return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : - side == 0 ? this.iconBottom : (side == 0 ? this.iconTop - : (side == metadata ? this.iconFront : this.blockIcon)); - } - - @Override - public IIcon getIcon(int side, int meta) { - if(side == 1){ - return this.iconTop; - } else if(side == 3){ - return this.iconFront; - } else { - return this.blockIcon; - } - } -} diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index f4e34aa8a..2d88bc6f4 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -25,9 +25,6 @@ public class GuiHandler implements IGuiHandler { public static final int matterfabID = 9; public static final int pdaID = 10; public static final int chunkloaderID = 11; - public static final int assemblingmachineID = 12; - public static final int latheID = 13; - public static final int platecuttingmachineID = 14; public static final int dieselGeneratorID = 15; public static final int industrialElectrolyzerID = 16; public static final int aesuID = 17; @@ -88,15 +85,6 @@ public class GuiHandler implements IGuiHandler { } else if (ID == chunkloaderID) { return new ContainerChunkloader( (TileChunkLoader) world.getTileEntity(x, y, z), player); - } else if (ID == assemblingmachineID) { - return new ContainerAssemblingMachine( - (TileAssemblingMachine) world.getTileEntity(x, y, z), player); - } else if (ID == latheID) { - return new ContainerLathe( - (TileLathe) world.getTileEntity(x, y, z), player); - } else if (ID == platecuttingmachineID) { - return new ContainerPlateCuttingMachine( - (TilePlateCuttingMachine) world.getTileEntity(x, y, z), player); } else if (ID == dieselGeneratorID) { return new ContainerDieselGenerator( (TileDieselGenerator) world.getTileEntity(x, y, z), player); @@ -176,15 +164,6 @@ public class GuiHandler implements IGuiHandler { } else if (ID == chunkloaderID) { return new GuiChunkLoader(player, (TileChunkLoader) world.getTileEntity(x, y, z)); - } else if (ID == assemblingmachineID) { - return new GuiAssemblingMachine(player, - (TileAssemblingMachine) world.getTileEntity(x, y, z)); - } else if (ID == latheID) { - return new GuiLathe(player, - (TileLathe) world.getTileEntity(x, y, z)); - } else if (ID == platecuttingmachineID) { - return new GuiPlateCuttingMachine(player, - (TilePlateCuttingMachine) world.getTileEntity(x, y, z)); } else if (ID == dieselGeneratorID) { return new GuiDieselGenerator(player, (TileDieselGenerator) world.getTileEntity(x, y, z)); diff --git a/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java b/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java deleted file mode 100644 index 20f793226..000000000 --- a/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java +++ /dev/null @@ -1,55 +0,0 @@ -package techreborn.client.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import techreborn.client.SlotOutput; -import techreborn.tiles.TileAssemblingMachine; - -public class ContainerAssemblingMachine extends ContainerCrafting { - - EntityPlayer player; - - TileAssemblingMachine tile; - - @Override - public boolean canInteractWith(EntityPlayer player) { - return true; - } - - public int tickTime; - - public ContainerAssemblingMachine(TileAssemblingMachine tileAssemblingMachine, - EntityPlayer player) { - super(tileAssemblingMachine.crafter); - tile = tileAssemblingMachine; - this.player = player; - - // input - this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 0, 47, 17)); - this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 1, 65, 17)); - // outputs - this.addSlotToContainer(new SlotOutput(tileAssemblingMachine.inventory, 2, 116, 35)); - // power - this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 3, 56, 53)); - // upgrades - this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 4, 152, 8)); - this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 5, 152, 26)); - this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 6, 152, 44)); - this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 7, 152, 62)); - - int i; - - for (i = 0; i < 3; ++i) { - for (int j = 0; j < 9; ++j) { - this.addSlotToContainer(new Slot(player.inventory, j + i * 9 - + 9, 8 + j * 18, 84 + i * 18)); - } - } - - for (i = 0; i < 9; ++i) { - this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, - 142)); - } - } - -} diff --git a/src/main/java/techreborn/client/container/ContainerLathe.java b/src/main/java/techreborn/client/container/ContainerLathe.java deleted file mode 100644 index 0c54bdaa5..000000000 --- a/src/main/java/techreborn/client/container/ContainerLathe.java +++ /dev/null @@ -1,54 +0,0 @@ -package techreborn.client.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import techreborn.client.SlotOutput; -import techreborn.tiles.TileLathe; - -public class ContainerLathe extends ContainerCrafting { - - EntityPlayer player; - - TileLathe tile; - - @Override - public boolean canInteractWith(EntityPlayer player) { - return true; - } - - public int tickTime; - - public ContainerLathe(TileLathe tilelathe, - EntityPlayer player) { - super(tilelathe.crafter); - tile = tilelathe; - this.player = player; - - // input - this.addSlotToContainer(new Slot(tilelathe.inventory, 0, 56, 17)); - // outputs - this.addSlotToContainer(new SlotOutput(tilelathe.inventory, 1, 116, 35)); - // power - this.addSlotToContainer(new Slot(tilelathe.inventory, 2, 56, 53)); - // upgrades - this.addSlotToContainer(new Slot(tilelathe.inventory, 3, 152, 8)); - this.addSlotToContainer(new Slot(tilelathe.inventory, 4, 152, 26)); - this.addSlotToContainer(new Slot(tilelathe.inventory, 5, 152, 44)); - this.addSlotToContainer(new Slot(tilelathe.inventory, 6, 152, 62)); - - int i; - - for (i = 0; i < 3; ++i) { - for (int j = 0; j < 9; ++j) { - this.addSlotToContainer(new Slot(player.inventory, j + i * 9 - + 9, 8 + j * 18, 84 + i * 18)); - } - } - - for (i = 0; i < 9; ++i) { - this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, - 142)); - } - } - -} diff --git a/src/main/java/techreborn/client/container/ContainerPlateCuttingMachine.java b/src/main/java/techreborn/client/container/ContainerPlateCuttingMachine.java deleted file mode 100644 index 6507333be..000000000 --- a/src/main/java/techreborn/client/container/ContainerPlateCuttingMachine.java +++ /dev/null @@ -1,54 +0,0 @@ -package techreborn.client.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import techreborn.client.SlotOutput; -import techreborn.tiles.TilePlateCuttingMachine; - -public class ContainerPlateCuttingMachine extends ContainerCrafting { - - EntityPlayer player; - - TilePlateCuttingMachine platecuttingmachine; - - @Override - public boolean canInteractWith(EntityPlayer player) { - return true; - } - - public int tickTime; - - public ContainerPlateCuttingMachine(TilePlateCuttingMachine tileplatecuttingmachine, - EntityPlayer player) { - super(tileplatecuttingmachine.crafter); - platecuttingmachine = tileplatecuttingmachine; - this.player = player; - - // input - this.addSlotToContainer(new Slot(tileplatecuttingmachine.inventory, 0, 56, 17)); - // outputs - this.addSlotToContainer(new SlotOutput(tileplatecuttingmachine.inventory, 1, 116, 35)); - // power - this.addSlotToContainer(new Slot(tileplatecuttingmachine.inventory, 2, 56, 53)); - // upgrades - this.addSlotToContainer(new Slot(tileplatecuttingmachine.inventory, 3, 152, 8)); - this.addSlotToContainer(new Slot(tileplatecuttingmachine.inventory, 4, 152, 26)); - this.addSlotToContainer(new Slot(tileplatecuttingmachine.inventory, 5, 152, 44)); - this.addSlotToContainer(new Slot(tileplatecuttingmachine.inventory, 6, 152, 62)); - - int i; - - for (i = 0; i < 3; ++i) { - for (int j = 0; j < 9; ++j) { - this.addSlotToContainer(new Slot(player.inventory, j + i * 9 - + 9, 8 + j * 18, 84 + i * 18)); - } - } - - for (i = 0; i < 9; ++i) { - this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, - 142)); - } - } - -} diff --git a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java deleted file mode 100644 index 6efb89f8d..000000000 --- a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java +++ /dev/null @@ -1,58 +0,0 @@ -package techreborn.client.gui; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import techreborn.client.container.ContainerAssemblingMachine; -import techreborn.tiles.TileAssemblingMachine; - -public class GuiAssemblingMachine extends GuiContainer { - - private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/assembling_machine.png"); - - TileAssemblingMachine assemblingmachine; - ContainerAssemblingMachine containerAssemblingMachine; - - public GuiAssemblingMachine(EntityPlayer player, TileAssemblingMachine tileassemblinmachine) { - super(new ContainerAssemblingMachine(tileassemblinmachine, player)); - containerAssemblingMachine = (ContainerAssemblingMachine) this.inventorySlots; - this.xSize = 176; - this.ySize = 167; - assemblingmachine = tileassemblinmachine; - } - - @Override - public void initGui() { - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; - super.initGui(); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - this.mc.getTextureManager().bindTexture(texture); - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); - - int j = 0; - - j = assemblingmachine.getProgressScaled(20); - if (j > 0) { - this.drawTexturedModalRect(k + 86, l + 34, 176, 14, j + 1, 16); - } - - j = assemblingmachine.getEnergyScaled(12); - if (j > 0) { - this.drawTexturedModalRect(k + 56, l + 36 + 12 - j, 176, 12 - j, 14, j + 2); - } - } - - protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String name = StatCollector.translateToLocal("tile.techreborn.assemblinmachine.name"); - this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); - this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); - } -} diff --git a/src/main/java/techreborn/client/gui/GuiLathe.java b/src/main/java/techreborn/client/gui/GuiLathe.java deleted file mode 100644 index f052382d0..000000000 --- a/src/main/java/techreborn/client/gui/GuiLathe.java +++ /dev/null @@ -1,58 +0,0 @@ -package techreborn.client.gui; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import techreborn.client.container.ContainerLathe; -import techreborn.tiles.TileLathe; - -public class GuiLathe extends GuiContainer { - - private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/lathe.png"); - - TileLathe lathe; - ContainerLathe containerLathe; - - public GuiLathe(EntityPlayer player, TileLathe tilelathe) { - super(new ContainerLathe(tilelathe, player)); - containerLathe = (ContainerLathe) this.inventorySlots; - this.xSize = 176; - this.ySize = 167; - lathe = tilelathe; - } - - @Override - public void initGui() { - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; - super.initGui(); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - this.mc.getTextureManager().bindTexture(texture); - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); - - int j = 0; - - j = lathe.getProgressScaled(20); - if (j > 0) { - this.drawTexturedModalRect(k + 80, l + 34, 176, 14, j, 16); - } - - j = lathe.getEnergyScaled(12); - if (j > 0) { - this.drawTexturedModalRect(k + 56, l + 36 + 12 - j, 176, 12 - j, 14, j + 2); - } - } - - protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String name = StatCollector.translateToLocal("tile.techreborn.lathe.name"); - this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); - this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); - } -} diff --git a/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java b/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java deleted file mode 100644 index 0a12fe903..000000000 --- a/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java +++ /dev/null @@ -1,59 +0,0 @@ -package techreborn.client.gui; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import techreborn.client.container.ContainerPlateCuttingMachine; -import techreborn.tiles.TilePlateCuttingMachine; - -public class GuiPlateCuttingMachine extends GuiContainer { - - private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/plate_cutting_machine.png"); - - TilePlateCuttingMachine platecuttingmachine; - - ContainerPlateCuttingMachine containerPlateCuttingMachine; - - public GuiPlateCuttingMachine(EntityPlayer player, TilePlateCuttingMachine tileplatecuttingmachine) { - super(new ContainerPlateCuttingMachine(tileplatecuttingmachine, player)); - containerPlateCuttingMachine = (ContainerPlateCuttingMachine) this.inventorySlots; - this.xSize = 176; - this.ySize = 167; - platecuttingmachine = tileplatecuttingmachine; - } - - @Override - public void initGui() { - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; - super.initGui(); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - this.mc.getTextureManager().bindTexture(texture); - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); - - int j = 0; - - j = platecuttingmachine.getProgressScaled(20); - if (j > 0) { - this.drawTexturedModalRect(k + 83, l + 34, 176, 14, j, 16); - } - - j = platecuttingmachine.getEnergyScaled(12); - if (j > 0) { - this.drawTexturedModalRect(k + 56, l + 36 + 12 - j, 176, 12 - j, 14, j + 2); - } - } - - protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String name = StatCollector.translateToLocal("tile.techreborn.platecuttingmachine.name"); - this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); - this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); - } -} diff --git a/src/main/java/techreborn/compat/nei/NEIConfig.java b/src/main/java/techreborn/compat/nei/NEIConfig.java index 852115a61..227f49e84 100644 --- a/src/main/java/techreborn/compat/nei/NEIConfig.java +++ b/src/main/java/techreborn/compat/nei/NEIConfig.java @@ -31,22 +31,10 @@ public class NEIConfig implements IConfigureNEI { API.registerUsageHandler(alloy); API.registerRecipeHandler(alloy); - AssemblingMachineRecipeHandler assembling = new AssemblingMachineRecipeHandler(); - API.registerUsageHandler(assembling); - API.registerRecipeHandler(assembling); - - LatheRecipeHandler lathe = new LatheRecipeHandler(); - API.registerUsageHandler(lathe); - API.registerRecipeHandler(lathe); - IndustrialSawmillRecipeHandler sawmill = new IndustrialSawmillRecipeHandler(); API.registerUsageHandler(sawmill); API.registerRecipeHandler(sawmill); - PlateCuttingMachineRecipeHandler plate = new PlateCuttingMachineRecipeHandler(); - API.registerUsageHandler(plate); - API.registerRecipeHandler(plate); - ChemicalReactorRecipeHandler chem = new ChemicalReactorRecipeHandler(); API.registerUsageHandler(chem); API.registerRecipeHandler(chem); diff --git a/src/main/java/techreborn/compat/nei/recipes/AssemblingMachineRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/AssemblingMachineRecipeHandler.java deleted file mode 100644 index 52bd030a3..000000000 --- a/src/main/java/techreborn/compat/nei/recipes/AssemblingMachineRecipeHandler.java +++ /dev/null @@ -1,59 +0,0 @@ -package techreborn.compat.nei.recipes; - -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; -import net.minecraft.client.gui.inventory.GuiContainer; -import techreborn.api.recipe.IBaseRecipeType; -import techreborn.client.gui.GuiAssemblingMachine; -import techreborn.lib.Reference; -import techreborn.util.ItemUtils; - -import java.awt.*; -import java.util.List; - -public class AssemblingMachineRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { - @Override - public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { - int offset = 4; - if (recipeType.getInputs().size() > 0) { - PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 47 - offset, 17 - offset, false); - input.add(pStack); - } - if (recipeType.getInputs().size() > 1) { - PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 65 - offset, 17 - offset, false); - input.add(pStack2); - } - - if (recipeType.getOutputsSize() > 0) { - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 116 - offset, 35 - offset, false); - outputs.add(pStack3); - } - - } - - @Override - public String getRecipeName() { - return Reference.assemblingMachineRecipe; - } - - @Override - public String getGuiTexture() { - return "techreborn:textures/gui/assembling_machine.png"; - } - - @Override - public Class getGuiClass() { - return GuiAssemblingMachine.class; - } - - @Override - public INeiBaseRecipe getNeiBaseRecipe() { - return this; - } - - @Override - public void loadTransferRects() { - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( - new Rectangle(80, 20, 20, 20), getNeiBaseRecipe().getRecipeName(), new Object[0])); - } -} diff --git a/src/main/java/techreborn/compat/nei/recipes/LatheRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/LatheRecipeHandler.java deleted file mode 100644 index f451a2438..000000000 --- a/src/main/java/techreborn/compat/nei/recipes/LatheRecipeHandler.java +++ /dev/null @@ -1,54 +0,0 @@ -package techreborn.compat.nei.recipes; - -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; -import net.minecraft.client.gui.inventory.GuiContainer; -import techreborn.api.recipe.IBaseRecipeType; -import techreborn.client.gui.GuiLathe; -import techreborn.lib.Reference; -import techreborn.util.ItemUtils; - -import java.awt.*; -import java.util.List; - -public class LatheRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { - @Override - public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { - int offset = 4; - if (recipeType.getInputs().size() > 0) { - PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 56 - offset, 17 - offset, false); - input.add(pStack); - } - - if (recipeType.getOutputsSize() > 0) { - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 116 - offset, 35 - offset, false); - outputs.add(pStack3); - } - } - - @Override - public String getRecipeName() { - return Reference.latheRecipe; - } - - @Override - public String getGuiTexture() { - return "techreborn:textures/gui/lathe.png"; - } - - @Override - public Class getGuiClass() { - return GuiLathe.class; - } - - @Override - public INeiBaseRecipe getNeiBaseRecipe() { - return this; - } - - @Override - public void loadTransferRects() { - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( - new Rectangle(75, 20, 25, 20), getNeiBaseRecipe().getRecipeName(), new Object[0])); - } -} diff --git a/src/main/java/techreborn/compat/nei/recipes/PlateCuttingMachineRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/PlateCuttingMachineRecipeHandler.java deleted file mode 100644 index 33e779efa..000000000 --- a/src/main/java/techreborn/compat/nei/recipes/PlateCuttingMachineRecipeHandler.java +++ /dev/null @@ -1,53 +0,0 @@ -package techreborn.compat.nei.recipes; - -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; -import net.minecraft.client.gui.inventory.GuiContainer; -import techreborn.api.recipe.IBaseRecipeType; -import techreborn.client.gui.GuiPlateCuttingMachine; -import techreborn.lib.Reference; -import techreborn.util.ItemUtils; - -import java.awt.*; -import java.util.List; - -public class PlateCuttingMachineRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { - @Override - public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { - int offset = 4; - if (recipeType.getInputs().size() > 0) { - PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 56 - offset, 17 - offset, false); - input.add(pStack); - } - if (recipeType.getOutputsSize() > 0) { - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 116 - offset, 35 - offset, false); - outputs.add(pStack3); - } - } - - @Override - public String getRecipeName() { - return Reference.plateCuttingMachineRecipe; - } - - @Override - public String getGuiTexture() { - return "techreborn:textures/gui/plate_cutting_machine.png"; - } - - @Override - public Class getGuiClass() { - return GuiPlateCuttingMachine.class; - } - - @Override - public INeiBaseRecipe getNeiBaseRecipe() { - return this; - } - - @Override - public void loadTransferRects() { - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( - new Rectangle(75, 20, 20, 20), getNeiBaseRecipe().getRecipeName(), new Object[0])); - } -} diff --git a/src/main/java/techreborn/compat/recipes/RecipesIC2.java b/src/main/java/techreborn/compat/recipes/RecipesIC2.java index 1b82355ad..055a9d5da 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesIC2.java +++ b/src/main/java/techreborn/compat/recipes/RecipesIC2.java @@ -262,13 +262,6 @@ public class RecipesIC2 implements ICompatModule { 'I', "plateIron", 'F', IC2Items.getItem("ironFurnace")); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AssemblyMachine), - "CPC", "SBS", "CSC", - 'S', "plateSteel", - 'C', "circuitBasic", - 'B', IC2Items.getItem("machine"), - 'P', "craftingPiston"); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ChemicalReactor), "IMI", "CPC", "IEI", 'I', "plateInvar", @@ -285,22 +278,6 @@ public class RecipesIC2 implements ICompatModule { 'P', IC2Items.getItem("compressor"), 'E', IC2Items.getItem("extractor")); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.lathe), - "SLS", "GBG", "SCS", - 'S', "plateSteel", - 'C', "circuitAdvanced", - 'G', "gearSteel", - 'B', IC2Items.getItem("advancedMachine"), - 'L', IC2Items.getItem("LathingTool")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.platecuttingmachine), - "SCS", "GDG", "SBS", - 'S', "plateSteel", - 'C', "circuitAdvanced", - 'G', "gearSteel", - 'B', IC2Items.getItem("advancedMachine"), - 'D', new ItemStack(ModItems.parts, 1, 9)); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.RollingMachine), "PCP", "MBM", "PCP", 'P', "craftingPiston", @@ -490,7 +467,7 @@ public class RecipesIC2 implements ICompatModule { RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("phosphorous", 5), new ItemStack(IC2Items.getItem("cell").getItem(), 3), ItemCells.getCellByName("calcium", 3), null, null, null, 1280, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("ashes", 1), IC2Items.getItem("cell"), ItemCells.getCellByName("carbon"), null, null, null, 80, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.redstone, 10), new ItemStack(IC2Items.getItem("cell").getItem(), 4), ItemCells.getCellByName("silicon", 1), ItemDusts.getDustByName("pyrite", 3), ItemDusts.getDustByName("ruby", 1), ItemCells.getCellByName("mercury", 3), 6800, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16), new ItemStack(IC2Items.getItem("cell").getItem(), 2), ItemCells.getCellByName("helium3", 1), ItemCells.getCellByName("helium"), ItemDustsTiny.getTinyDustByName("Tungsten", 1), new ItemStack(Blocks.sand, 12), 4800, 5)); + RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16), new ItemStack(IC2Items.getItem("cell").getItem(), 2), ItemCells.getCellByName("helium3", 1), ItemCells.getCellByName("helium"), ItemDustsSmall.getSmallDustByName("Tungsten", 1), new ItemStack(Blocks.sand, 12), 4800, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("cinnabar", 2), IC2Items.getItem("cell"), ItemCells.getCellByName("mercury", 1), ItemDusts.getDustByName("sulfur", 1), null, null, 80, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("flint", 1), null, IC2Items.getItem("silicondioxideDust"), null, null, null, 160, 5)); @@ -503,7 +480,7 @@ public class RecipesIC2 implements ICompatModule { //Lava Cell Byproducts ItemStack lavaCells = IC2Items.getItem("lavaCell"); lavaCells.stackSize = 8; - RecipeHandler.addRecipe(new CentrifugeRecipe(lavaCells, null, ItemNuggets.getNuggetByName("electrum", 4), ItemIngots.getIngotByName("copper", 2), ItemDustsTiny.getTinyDustByName("Tungsten", 1), ItemIngots.getIngotByName("tin", 17), 6000, 5)); + RecipeHandler.addRecipe(new CentrifugeRecipe(lavaCells, null, ItemNuggets.getNuggetByName("electrum", 4), ItemIngots.getIngotByName("copper", 2), ItemDustsSmall.getSmallDustByName("Tungsten", 1), ItemIngots.getIngotByName("tin", 17), 6000, 5)); //IndustrialGrinderRecipes RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.coal_ore, 1), IC2Items.getItem("waterCell"), null, new ItemStack(Items.coal, 1), ItemDustsSmall.getSmallDustByName("Coal", 6), ItemDustsSmall.getSmallDustByName("Coal", 2), IC2Items.getItem("cell"), 100, 120)); @@ -1390,25 +1367,25 @@ public class RecipesIC2 implements ICompatModule { //Ore Washing Plant NBTTagCompound liquidAmount = new NBTTagCompound(); liquidAmount.setInteger("amount", 1000); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedAluminum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum", 1), ItemDustsTiny.getTinyDustByName("Aluminum", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedArdite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Ardite", 1), ItemDustsTiny.getTinyDustByName("Ardite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedBauxite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Bauxite", 1), ItemDustsTiny.getTinyDustByName("Bauxite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCadmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cadmium", 1), ItemDustsTiny.getTinyDustByName("Cadmium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCinnabar"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cinnabar", 1), ItemDustsTiny.getTinyDustByName("Cinnabar", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCobalt"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cobalt", 1), ItemDustsTiny.getTinyDustByName("Cobalt", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedDarkIron"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("DarkIron", 1), ItemDustsTiny.getTinyDustByName("DarkIron", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIndium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Indium", 1), ItemDustsTiny.getTinyDustByName("Indium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedNickel"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Nickel", 1), ItemDustsTiny.getTinyDustByName("Nickel", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedOsmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Osmium", 1), ItemDustsTiny.getTinyDustByName("Osmium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPyrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Pyrite", 1), ItemDustsTiny.getTinyDustByName("Pyrite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedSphalerite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Sphalerite", 1), ItemDustsTiny.getTinyDustByName("Sphalerite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tetrahedrite", 1), ItemDustsTiny.getTinyDustByName("Tetrahedrite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedGalena"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Galena", 1), ItemDustsTiny.getTinyDustByName("Galena", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedAluminum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum", 1), ItemDustsSmall.getSmallDustByName("Aluminum", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedArdite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Ardite", 1), ItemDustsSmall.getSmallDustByName("Ardite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedBauxite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Bauxite", 1), ItemDustsSmall.getSmallDustByName("Bauxite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCadmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cadmium", 1), ItemDustsSmall.getSmallDustByName("Cadmium", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCinnabar"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cinnabar", 1), ItemDustsSmall.getSmallDustByName("Cinnabar", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCobalt"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cobalt", 1), ItemDustsSmall.getSmallDustByName("Cobalt", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedDarkIron"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("DarkIron", 1), ItemDustsSmall.getSmallDustByName("DarkIron", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIndium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Indium", 1), ItemDustsSmall.getSmallDustByName("Indium", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedNickel"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Nickel", 1), ItemDustsSmall.getSmallDustByName("Nickel", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedOsmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Osmium", 1), ItemDustsSmall.getSmallDustByName("Osmium", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPyrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Pyrite", 1), ItemDustsSmall.getSmallDustByName("Pyrite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedSphalerite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Sphalerite", 1), ItemDustsSmall.getSmallDustByName("Sphalerite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tetrahedrite", 1), ItemDustsSmall.getSmallDustByName("Tetrahedrite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedGalena"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Galena", 1), ItemDustsSmall.getSmallDustByName("Galena", 2), IC2Items.getItem("stoneDust")); if (!Loader.isModLoaded("aobd")) { - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPlatinum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Platinum", 1), ItemDustsTiny.getTinyDustByName("Platinum", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIridium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Iridium", 1), ItemDustsTiny.getTinyDustByName("Iridium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTungsten"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tungsten", 1), ItemDustsTiny.getTinyDustByName("Tungsten", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPlatinum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Platinum", 1), ItemDustsSmall.getSmallDustByName("Platinum", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIridium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Iridium", 1), ItemDustsSmall.getSmallDustByName("Iridium", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTungsten"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tungsten", 1), ItemDustsSmall.getSmallDustByName("Tungsten", 2), IC2Items.getItem("stoneDust")); } } @@ -1451,44 +1428,44 @@ public class RecipesIC2 implements ICompatModule { NBTTagCompound galenaHeat = new NBTTagCompound(); galenaHeat.setInteger("minHeat", 2500); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedAluminum"), aluminumHeat, ItemDustsTiny.getTinyDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedArdite"), arditeHeat, ItemDustsTiny.getTinyDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedBauxite"), bauxiteHeat, ItemDustsTiny.getTinyDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCadmium"), cadmiumHeat, ItemDustsTiny.getTinyDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCinnabar"), cinnabarHeat, ItemDustsTiny.getTinyDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCobalt"), cobaltHeat, ItemDustsTiny.getTinyDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedDarkIron"), darkIronHeat, ItemDustsTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIndium"), indiumHeat, ItemDustsTiny.getTinyDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedNickel"), nickelHeat, ItemDustsTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedOsmium"), osmiumHeat, ItemDustsTiny.getTinyDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPyrite"), pyriteHeat, ItemDustsTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedSphalerite"), sphaleriteHeat, ItemDustsTiny.getTinyDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), tetrahedriteHeat, ItemDustsTiny.getTinyDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedGalena"), galenaHeat, ItemDustsTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedAluminum"), aluminumHeat, ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedArdite"), arditeHeat, ItemDustsSmall.getSmallDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedBauxite"), bauxiteHeat, ItemDustsSmall.getSmallDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCadmium"), cadmiumHeat, ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCinnabar"), cinnabarHeat, ItemDustsSmall.getSmallDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCobalt"), cobaltHeat, ItemDustsSmall.getSmallDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedDarkIron"), darkIronHeat, ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIndium"), indiumHeat, ItemDustsSmall.getSmallDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedNickel"), nickelHeat, ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedOsmium"), osmiumHeat, ItemDustsSmall.getSmallDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPyrite"), pyriteHeat, ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedSphalerite"), sphaleriteHeat, ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), tetrahedriteHeat, ItemDustsSmall.getSmallDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedGalena"), galenaHeat, ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedAluminum"), aluminumHeat, ItemDustsTiny.getTinyDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedArdite"), arditeHeat, ItemDustsTiny.getTinyDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedBauxite"), bauxiteHeat, ItemDustsTiny.getTinyDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCadmium"), cadmiumHeat, ItemDustsTiny.getTinyDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCinnabar"), cinnabarHeat, ItemDustsTiny.getTinyDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCobalt"), cobaltHeat, ItemDustsTiny.getTinyDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedDarkIron"), darkIronHeat, ItemDustsTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIndium"), indiumHeat, ItemDustsTiny.getTinyDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedNickel"), nickelHeat, ItemDustsTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedOsmium"), osmiumHeat, ItemDustsTiny.getTinyDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPyrite"), pyriteHeat, ItemDustsTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedSphalerite"), sphaleriteHeat, ItemDustsTiny.getTinyDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTetrahedrite"), tetrahedriteHeat, ItemDustsTiny.getTinyDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedGalena"), galenaHeat, ItemDustsTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedAluminum"), aluminumHeat, ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedArdite"), arditeHeat, ItemDustsSmall.getSmallDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedBauxite"), bauxiteHeat, ItemDustsSmall.getSmallDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCadmium"), cadmiumHeat, ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCinnabar"), cinnabarHeat, ItemDustsSmall.getSmallDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCobalt"), cobaltHeat, ItemDustsSmall.getSmallDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedDarkIron"), darkIronHeat, ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIndium"), indiumHeat, ItemDustsSmall.getSmallDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedNickel"), nickelHeat, ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedOsmium"), osmiumHeat, ItemDustsSmall.getSmallDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPyrite"), pyriteHeat, ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedSphalerite"), sphaleriteHeat, ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTetrahedrite"), tetrahedriteHeat, ItemDustsSmall.getSmallDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedGalena"), galenaHeat, ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1)); if (!Loader.isModLoaded("aobd")) { - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIridium"), iridiumHeat, ItemDustsTiny.getTinyDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPlatinum"), platinumHeat, ItemDustsTiny.getTinyDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTungsten"), tungstenHeat, ItemDustsTiny.getTinyDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIridium"), iridiumHeat, ItemDustsSmall.getSmallDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPlatinum"), platinumHeat, ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTungsten"), tungstenHeat, ItemDustsSmall.getSmallDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIridium"), iridiumHeat, ItemDustsTiny.getTinyDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPlatinum"), platinumHeat, ItemDustsTiny.getTinyDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTungsten"), tungstenHeat, ItemDustsTiny.getTinyDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIridium"), iridiumHeat, ItemDustsSmall.getSmallDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPlatinum"), platinumHeat, ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTungsten"), tungstenHeat, ItemDustsSmall.getSmallDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1)); } } diff --git a/src/main/java/techreborn/compat/recipes/RecipesIC2Classic.java b/src/main/java/techreborn/compat/recipes/RecipesIC2Classic.java index a0a519733..eb4d027a2 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesIC2Classic.java +++ b/src/main/java/techreborn/compat/recipes/RecipesIC2Classic.java @@ -258,13 +258,6 @@ public class RecipesIC2Classic implements ICompatModule { 'I', "plateIron", 'F', IC2Items.getItem("ironFurnace")); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AssemblyMachine), - "CPC", "SBS", "CSC", - 'S', "plateSteel", - 'C', "circuitBasic", - 'B', IC2Items.getItem("machine"), - 'P', "craftingPiston"); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ChemicalReactor), "IMI", "CPC", "IEI", 'I', "plateInvar", @@ -281,21 +274,6 @@ public class RecipesIC2Classic implements ICompatModule { 'P', IC2Items.getItem("compressor"), 'E', IC2Items.getItem("extractor")); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.lathe), - "SCS", "GBG", "SCS", - 'S', "plateSteel", - 'C', "circuitAdvanced", - 'G', "gearSteel", - 'B', IC2Items.getItem("advancedMachine")); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.platecuttingmachine), - "SCS", "GDG", "SBS", - 'S', "plateSteel", - 'C', "circuitAdvanced", - 'G', "gearSteel", - 'B', IC2Items.getItem("advancedMachine"), - 'D', new ItemStack(ModItems.parts, 1, 9)); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.RollingMachine), "PCP", "MBM", "PCP", 'P', "craftingPiston", @@ -481,7 +459,7 @@ public class RecipesIC2Classic implements ICompatModule { RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("phosphorous", 5), new ItemStack(IC2Items.getItem("cell").getItem(), 3), ItemCells.getCellByName("calcium", 3), null, null, null, 1280, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("ashes", 1), IC2Items.getItem("cell"), ItemCells.getCellByName("carbon"), null, null, null, 80, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.redstone, 10), new ItemStack(IC2Items.getItem("cell").getItem(), 4), ItemCells.getCellByName("silicon", 1), ItemDusts.getDustByName("pyrite", 3), ItemDusts.getDustByName("ruby", 1), ItemCells.getCellByName("mercury", 3), 6800, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16), new ItemStack(IC2Items.getItem("cell").getItem(), 2), ItemCells.getCellByName("helium3", 1), ItemCells.getCellByName("helium"), ItemDustsTiny.getTinyDustByName("Tungsten", 1), new ItemStack(Blocks.sand, 12), 4800, 5)); + RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16), new ItemStack(IC2Items.getItem("cell").getItem(), 2), ItemCells.getCellByName("helium3", 1), ItemCells.getCellByName("helium"), ItemDustsSmall.getSmallDustByName("Tungsten", 1), new ItemStack(Blocks.sand, 12), 4800, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("cinnabar", 2), IC2Items.getItem("cell"), ItemCells.getCellByName("mercury", 1), ItemDusts.getDustByName("sulfur", 1), null, null, 80, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("flint", 1), null, IC2Items.getItem("silicondioxideDust"), null, null, null, 160, 5)); @@ -494,7 +472,7 @@ public class RecipesIC2Classic implements ICompatModule { //Lava Cell Byproducts ItemStack lavaCells = IC2Items.getItem("lavaCell"); lavaCells.stackSize = 8; - RecipeHandler.addRecipe(new CentrifugeRecipe(lavaCells, null, ItemNuggets.getNuggetByName("electrum", 4), ItemIngots.getIngotByName("copper", 2), ItemDustsTiny.getTinyDustByName("Tungsten", 1), ItemIngots.getIngotByName("tin", 17), 6000, 5)); + RecipeHandler.addRecipe(new CentrifugeRecipe(lavaCells, null, ItemNuggets.getNuggetByName("electrum", 4), ItemIngots.getIngotByName("copper", 2), ItemDustsSmall.getSmallDustByName("Tungsten", 1), ItemIngots.getIngotByName("tin", 17), 6000, 5)); //IndustrialGrinderRecipes RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.coal_ore, 1), IC2Items.getItem("waterCell"), null, new ItemStack(Items.coal, 1), ItemDustsSmall.getSmallDustByName("Coal", 6), ItemDustsSmall.getSmallDustByName("Coal", 2), IC2Items.getItem("cell"), 100, 120)); @@ -1370,25 +1348,25 @@ public class RecipesIC2Classic implements ICompatModule { //Ore Washing Plant NBTTagCompound liquidAmount = new NBTTagCompound(); liquidAmount.setInteger("amount", 1000); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedAluminum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum", 1), ItemDustsTiny.getTinyDustByName("Aluminum", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedArdite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Ardite", 1), ItemDustsTiny.getTinyDustByName("Ardite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedBauxite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Bauxite", 1), ItemDustsTiny.getTinyDustByName("Bauxite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCadmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cadmium", 1), ItemDustsTiny.getTinyDustByName("Cadmium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCinnabar"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cinnabar", 1), ItemDustsTiny.getTinyDustByName("Cinnabar", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCobalt"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cobalt", 1), ItemDustsTiny.getTinyDustByName("Cobalt", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedDarkIron"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("DarkIron", 1), ItemDustsTiny.getTinyDustByName("DarkIron", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIndium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Indium", 1), ItemDustsTiny.getTinyDustByName("Indium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedNickel"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Nickel", 1), ItemDustsTiny.getTinyDustByName("Nickel", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedOsmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Osmium", 1), ItemDustsTiny.getTinyDustByName("Osmium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPyrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Pyrite", 1), ItemDustsTiny.getTinyDustByName("Pyrite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedSphalerite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Sphalerite", 1), ItemDustsTiny.getTinyDustByName("Sphalerite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tetrahedrite", 1), ItemDustsTiny.getTinyDustByName("Tetrahedrite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedGalena"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Galena", 1), ItemDustsTiny.getTinyDustByName("Galena", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedAluminum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum", 1), ItemDustsSmall.getSmallDustByName("Aluminum", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedArdite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Ardite", 1), ItemDustsSmall.getSmallDustByName("Ardite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedBauxite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Bauxite", 1), ItemDustsSmall.getSmallDustByName("Bauxite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCadmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cadmium", 1), ItemDustsSmall.getSmallDustByName("Cadmium", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCinnabar"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cinnabar", 1), ItemDustsSmall.getSmallDustByName("Cinnabar", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCobalt"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cobalt", 1), ItemDustsSmall.getSmallDustByName("Cobalt", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedDarkIron"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("DarkIron", 1), ItemDustsSmall.getSmallDustByName("DarkIron", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIndium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Indium", 1), ItemDustsSmall.getSmallDustByName("Indium", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedNickel"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Nickel", 1), ItemDustsSmall.getSmallDustByName("Nickel", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedOsmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Osmium", 1), ItemDustsSmall.getSmallDustByName("Osmium", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPyrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Pyrite", 1), ItemDustsSmall.getSmallDustByName("Pyrite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedSphalerite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Sphalerite", 1), ItemDustsSmall.getSmallDustByName("Sphalerite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tetrahedrite", 1), ItemDustsSmall.getSmallDustByName("Tetrahedrite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedGalena"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Galena", 1), ItemDustsSmall.getSmallDustByName("Galena", 2), IC2Items.getItem("stoneDust")); if (!Loader.isModLoaded("aobd")) { - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPlatinum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Platinum", 1), ItemDustsTiny.getTinyDustByName("Platinum", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIridium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Iridium", 1), ItemDustsTiny.getTinyDustByName("Iridium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTungsten"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tungsten", 1), ItemDustsTiny.getTinyDustByName("Tungsten", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPlatinum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Platinum", 1), ItemDustsSmall.getSmallDustByName("Platinum", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIridium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Iridium", 1), ItemDustsSmall.getSmallDustByName("Iridium", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTungsten"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tungsten", 1), ItemDustsSmall.getSmallDustByName("Tungsten", 2), IC2Items.getItem("stoneDust")); } } @@ -1431,44 +1409,44 @@ public class RecipesIC2Classic implements ICompatModule { NBTTagCompound galenaHeat = new NBTTagCompound(); galenaHeat.setInteger("minHeat", 2500); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedAluminum"), aluminumHeat, ItemDustsTiny.getTinyDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedArdite"), arditeHeat, ItemDustsTiny.getTinyDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedBauxite"), bauxiteHeat, ItemDustsTiny.getTinyDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCadmium"), cadmiumHeat, ItemDustsTiny.getTinyDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCinnabar"), cinnabarHeat, ItemDustsTiny.getTinyDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCobalt"), cobaltHeat, ItemDustsTiny.getTinyDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedDarkIron"), darkIronHeat, ItemDustsTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIndium"), indiumHeat, ItemDustsTiny.getTinyDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedNickel"), nickelHeat, ItemDustsTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedOsmium"), osmiumHeat, ItemDustsTiny.getTinyDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPyrite"), pyriteHeat, ItemDustsTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedSphalerite"), sphaleriteHeat, ItemDustsTiny.getTinyDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), tetrahedriteHeat, ItemDustsTiny.getTinyDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedGalena"), galenaHeat, ItemDustsTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedAluminum"), aluminumHeat, ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedArdite"), arditeHeat, ItemDustsSmall.getSmallDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedBauxite"), bauxiteHeat, ItemDustsSmall.getSmallDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCadmium"), cadmiumHeat, ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCinnabar"), cinnabarHeat, ItemDustsSmall.getSmallDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCobalt"), cobaltHeat, ItemDustsSmall.getSmallDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedDarkIron"), darkIronHeat, ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIndium"), indiumHeat, ItemDustsSmall.getSmallDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedNickel"), nickelHeat, ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedOsmium"), osmiumHeat, ItemDustsSmall.getSmallDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPyrite"), pyriteHeat, ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedSphalerite"), sphaleriteHeat, ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), tetrahedriteHeat, ItemDustsSmall.getSmallDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedGalena"), galenaHeat, ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedAluminum"), aluminumHeat, ItemDustsTiny.getTinyDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedArdite"), arditeHeat, ItemDustsTiny.getTinyDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedBauxite"), bauxiteHeat, ItemDustsTiny.getTinyDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCadmium"), cadmiumHeat, ItemDustsTiny.getTinyDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCinnabar"), cinnabarHeat, ItemDustsTiny.getTinyDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCobalt"), cobaltHeat, ItemDustsTiny.getTinyDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedDarkIron"), darkIronHeat, ItemDustsTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIndium"), indiumHeat, ItemDustsTiny.getTinyDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedNickel"), nickelHeat, ItemDustsTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedOsmium"), osmiumHeat, ItemDustsTiny.getTinyDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPyrite"), pyriteHeat, ItemDustsTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedSphalerite"), sphaleriteHeat, ItemDustsTiny.getTinyDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTetrahedrite"), tetrahedriteHeat, ItemDustsTiny.getTinyDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedGalena"), galenaHeat, ItemDustsTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedAluminum"), aluminumHeat, ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedArdite"), arditeHeat, ItemDustsSmall.getSmallDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedBauxite"), bauxiteHeat, ItemDustsSmall.getSmallDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCadmium"), cadmiumHeat, ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCinnabar"), cinnabarHeat, ItemDustsSmall.getSmallDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCobalt"), cobaltHeat, ItemDustsSmall.getSmallDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedDarkIron"), darkIronHeat, ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIndium"), indiumHeat, ItemDustsSmall.getSmallDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedNickel"), nickelHeat, ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedOsmium"), osmiumHeat, ItemDustsSmall.getSmallDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPyrite"), pyriteHeat, ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedSphalerite"), sphaleriteHeat, ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTetrahedrite"), tetrahedriteHeat, ItemDustsSmall.getSmallDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedGalena"), galenaHeat, ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1)); if (!Loader.isModLoaded("aobd")) { - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIridium"), iridiumHeat, ItemDustsTiny.getTinyDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPlatinum"), platinumHeat, ItemDustsTiny.getTinyDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTungsten"), tungstenHeat, ItemDustsTiny.getTinyDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIridium"), iridiumHeat, ItemDustsSmall.getSmallDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPlatinum"), platinumHeat, ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTungsten"), tungstenHeat, ItemDustsSmall.getSmallDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIridium"), iridiumHeat, ItemDustsTiny.getTinyDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPlatinum"), platinumHeat, ItemDustsTiny.getTinyDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTungsten"), tungstenHeat, ItemDustsTiny.getTinyDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIridium"), iridiumHeat, ItemDustsSmall.getSmallDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPlatinum"), platinumHeat, ItemDustsSmall.getSmallDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTungsten"), tungstenHeat, ItemDustsSmall.getSmallDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1)); } } diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 3d29167dd..452f344f8 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -38,7 +38,6 @@ public class ModBlocks { public static Block HighAdvancedMachineBlock; public static Block Dragoneggenergysiphoner; public static Block Magicenergeyconverter; - public static Block AssemblyMachine; public static Block DieselGenerator; public static Block IndustrialElectrolyzer; public static Block MagicalAbsorber; @@ -46,14 +45,10 @@ public class ModBlocks { public static Block Gasturbine; public static Block AlloyFurnace; public static Block ChemicalReactor; - public static Block lathe; - public static Block platecuttingmachine; public static Block Idsu; public static Block Aesu; public static Block Lesu; public static Block Supercondensator; - public static Block Woodenshelf; - public static Block Metalshelf; public static Block LesuStorage; public static Block Distillationtower; public static Block ElectricCraftingTable; @@ -147,10 +142,10 @@ public class ModBlocks { Magicenergeyconverter = new BlockMagicEnergyConverter(Material.rock); GameRegistry.registerBlock(Magicenergeyconverter, "magicenergyconverter"); - - AssemblyMachine = new BlockAssemblingMachine(Material.rock); - GameRegistry.registerBlock(AssemblyMachine, "assemblymachine"); - GameRegistry.registerTileEntity(TileAssemblingMachine.class, "TileAssemblyMachineTR"); + //NOT NEEDED +// AssemblyMachine = new BlockAssemblingMachine(Material.rock); +// GameRegistry.registerBlock(AssemblyMachine, "assemblymachine"); +// GameRegistry.registerTileEntity(TileAssemblingMachine.class, "TileAssemblyMachineTR"); DieselGenerator = new BlockDieselGenerator(Material.rock); GameRegistry.registerBlock(DieselGenerator, "dieselgenerator"); @@ -179,14 +174,6 @@ public class ModBlocks { GameRegistry.registerBlock(ChemicalReactor, "chemicalreactor"); GameRegistry.registerTileEntity(TileChemicalReactor.class, "TileChemicalReactorTR"); - lathe = new BlockLathe(Material.rock); - GameRegistry.registerBlock(lathe, "lathe"); - GameRegistry.registerTileEntity(TileLathe.class, "TileLatheTR"); - - platecuttingmachine = new BlockPlateCuttingMachine(Material.rock); - GameRegistry.registerBlock(platecuttingmachine, "platecuttingmachine"); - GameRegistry.registerTileEntity(TilePlateCuttingMachine.class, "TilePlateCuttingMachineTR"); - Idsu = new BlockIDSU(Material.rock); GameRegistry.registerBlock(Idsu, "idsu"); GameRegistry.registerTileEntity(TileIDSU.class, "TileIDSUTR"); @@ -202,13 +189,6 @@ public class ModBlocks { Supercondensator = new BlockSupercondensator(Material.rock); GameRegistry.registerBlock(Supercondensator, "supercondensator"); - Woodenshelf = new BlockWoodenshelf(Material.wood); - GameRegistry.registerBlock(Woodenshelf, "woodenshelf"); - - Metalshelf = new BlockMetalShelf(Material.rock); - GameRegistry.registerBlock(Metalshelf, "metalshelf"); - GameRegistry.registerTileEntity(TileMetalShelf.class, "TileMetalShelfTR"); - LesuStorage = new BlockLesuStorage(Material.rock); GameRegistry.registerBlock(LesuStorage, "lesustorage"); GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR"); diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 04cd81fc4..a5ef00a95 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -32,8 +32,6 @@ public class ModItems { @Deprecated public static Item smallDusts; @Deprecated - public static Item tinyDusts; - @Deprecated public static Item parts; @Deprecated public static Item cells; @@ -46,7 +44,6 @@ public class ModItems { public static Item manuel; public static Item uuMatter; public static Item plate; - public static Item rods; public static Item crushedOre; public static Item purifiedCrushedOre; public static Item cloakingDevice; @@ -74,9 +71,7 @@ public class ModItems { public static Item bucketSodiumpersulfate; public static Item bucketTritium; public static Item bucketWolframium; - - public static Item hammerIron; - public static Item hammerDiamond; + public static Item upgrades; @@ -89,14 +84,10 @@ public class ModItems { GameRegistry.registerItem(dusts, "dust"); smallDusts = new ItemDustsSmall(); GameRegistry.registerItem(smallDusts, "smallDust"); - tinyDusts = new ItemDustsTiny(); - GameRegistry.registerItem(tinyDusts, "tinyDust"); plate = new ItemPlates(); GameRegistry.registerItem(plate, "plates"); nuggets = new ItemNuggets(); GameRegistry.registerItem(nuggets, "nuggets"); - rods = new ItemRods(); - GameRegistry.registerItem(rods, "rods"); crushedOre = new ItemCrushedOre(); GameRegistry.registerItem(crushedOre, "crushedore"); purifiedCrushedOre = new ItemPurifiedCrushedOre(); @@ -125,14 +116,6 @@ public class ModItems { upgrades = new ItemUpgrade(); GameRegistry.registerItem(upgrades, "upgrades"); - hammerIron = new ItemHammer(80); - hammerIron.setUnlocalizedName("hammerIron").setContainerItem(hammerIron); - GameRegistry.registerItem(hammerIron, "hammerIron"); - - hammerDiamond = new ItemHammer(200); - hammerDiamond.setUnlocalizedName("hammerDiamond").setContainerItem(hammerDiamond); - GameRegistry.registerItem(hammerDiamond, "hammerDiamond"); - cloakingDevice = new ItemCloakingDevice(); GameRegistry.registerItem(cloakingDevice, "cloakingdevice"); @@ -477,99 +460,6 @@ public class ModItems { OreDictionary.registerOre("dustSmallYellowGarnet", ItemDustsSmall.getSmallDustByName("YellowGarnet")); OreDictionary.registerOre("dustSmallZinc", ItemDustsSmall.getSmallDustByName("Zinc")); - // Tiny Dusts - OreDictionary.registerOre("dustTinyAlmandine", ItemDustsTiny.getTinyDustByName("Almandine")); - OreDictionary.registerOre("dustTinyAluminumBrass", ItemDustsTiny.getTinyDustByName("AluminumBrass")); - OreDictionary.registerOre("dustTinyAluminum", ItemDustsTiny.getTinyDustByName("Aluminum")); - OreDictionary.registerOre("dustTinyAluminium", ItemDustsTiny.getTinyDustByName("Aluminum")); - OreDictionary.registerOre("dustTinyAlumite", ItemDustsTiny.getTinyDustByName("Alumite")); - OreDictionary.registerOre("dustTinyAndradite", ItemDustsTiny.getTinyDustByName("Andradite")); - OreDictionary.registerOre("dustTinyAntimony", ItemDustsTiny.getTinyDustByName("Antimony")); - OreDictionary.registerOre("dustTinyArdite", ItemDustsTiny.getTinyDustByName("Ardite")); - OreDictionary.registerOre("dustTinyAsh", ItemDustsTiny.getTinyDustByName("Ashes")); - OreDictionary.registerOre("dustTinyBasalt", ItemDustsTiny.getTinyDustByName("Basalt")); - OreDictionary.registerOre("dustTinyBauxite", ItemDustsTiny.getTinyDustByName("Bauxite")); - OreDictionary.registerOre("dustTinyBiotite", ItemDustsTiny.getTinyDustByName("Biotite")); - OreDictionary.registerOre("dustTinyBrass", ItemDustsTiny.getTinyDustByName("Brass")); - OreDictionary.registerOre("dustTinyBronze", ItemDustsTiny.getTinyDustByName("Bronze")); - OreDictionary.registerOre("dustTinyCadmium", ItemDustsTiny.getTinyDustByName("Cadmium")); - OreDictionary.registerOre("dustTinyCalcite", ItemDustsTiny.getTinyDustByName("Calcite")); - OreDictionary.registerOre("dustTinyCharcoal", ItemDustsTiny.getTinyDustByName("Charcoal")); - OreDictionary.registerOre("dustTinyChrome", ItemDustsTiny.getTinyDustByName("Chrome")); - OreDictionary.registerOre("dustTinyCinnabar", ItemDustsTiny.getTinyDustByName("Cinnabar")); - OreDictionary.registerOre("dustTinyClay", ItemDustsTiny.getTinyDustByName("Clay")); - OreDictionary.registerOre("dustTinyCoal", ItemDustsTiny.getTinyDustByName("Coal")); - OreDictionary.registerOre("dustTinyCobalt", ItemDustsTiny.getTinyDustByName("Cobalt")); - OreDictionary.registerOre("dustTinyCopper", ItemDustsTiny.getTinyDustByName("Copper")); - OreDictionary.registerOre("dustTinyCupronickel", ItemDustsTiny.getTinyDustByName("Cupronickel")); - OreDictionary.registerOre("dustTinyDarkAsh", ItemDustsTiny.getTinyDustByName("DarkAshes")); - OreDictionary.registerOre("dustTinyDarkIron", ItemDustsTiny.getTinyDustByName("DarkIron")); - OreDictionary.registerOre("dustTinyDiamond", ItemDustsTiny.getTinyDustByName("Diamond")); - OreDictionary.registerOre("dustTinyElectrum", ItemDustsTiny.getTinyDustByName("Electrum")); - OreDictionary.registerOre("dustTinyEmerald", ItemDustsTiny.getTinyDustByName("Emerald")); - OreDictionary.registerOre("dustTinyEnderEye", ItemDustsTiny.getTinyDustByName("EnderEye")); - OreDictionary.registerOre("dustTinyEnderPearl", ItemDustsTiny.getTinyDustByName("EnderPearl")); - OreDictionary.registerOre("dustTinyEndstone", ItemDustsTiny.getTinyDustByName("Endstone")); - OreDictionary.registerOre("dustTinyFlint", ItemDustsTiny.getTinyDustByName("Flint")); - OreDictionary.registerOre("dustTinyGalena", ItemDustsTiny.getTinyDustByName("Galena")); - OreDictionary.registerOre("dustTinyGlowstone", ItemDustsTiny.getTinyDustByName("Glowstone")); - OreDictionary.registerOre("dustTinyGold", ItemDustsTiny.getTinyDustByName("Gold")); - OreDictionary.registerOre("dustTinyGraphite", ItemDustsTiny.getTinyDustByName("Graphite")); - OreDictionary.registerOre("dustTinyGrossular", ItemDustsTiny.getTinyDustByName("Grossular")); - OreDictionary.registerOre("dustTinyGunpowder", ItemDustsTiny.getTinyDustByName("Gunpowder")); - OreDictionary.registerOre("dustTinyIndium", ItemDustsTiny.getTinyDustByName("Indium")); - OreDictionary.registerOre("dustTinyInvar", ItemDustsTiny.getTinyDustByName("Invar")); - OreDictionary.registerOre("dustTinyIridium", ItemDustsTiny.getTinyDustByName("Iridium")); - OreDictionary.registerOre("dustTinyIron", ItemDustsTiny.getTinyDustByName("Iron")); - OreDictionary.registerOre("dustTinyKanthal", ItemDustsTiny.getTinyDustByName("Kanthal")); - OreDictionary.registerOre("dustTinyLapis", ItemDustsTiny.getTinyDustByName("Lapis")); - OreDictionary.registerOre("dustTinyLazurite", ItemDustsTiny.getTinyDustByName("Lazurite")); - OreDictionary.registerOre("dustTinyLead", ItemDustsTiny.getTinyDustByName("Lead")); - OreDictionary.registerOre("dustTinyLimestone", ItemDustsTiny.getTinyDustByName("Limestone")); - OreDictionary.registerOre("dustTinyLodestone", ItemDustsTiny.getTinyDustByName("Lodestone")); - OreDictionary.registerOre("dustTinyMagnesium", ItemDustsTiny.getTinyDustByName("Magnesium")); - OreDictionary.registerOre("dustTinyMagnetite", ItemDustsTiny.getTinyDustByName("Magnetite")); - OreDictionary.registerOre("dustTinyManganese", ItemDustsTiny.getTinyDustByName("Manganese")); - OreDictionary.registerOre("dustTinyManyullyn", ItemDustsTiny.getTinyDustByName("Manyullyn")); - OreDictionary.registerOre("dustTinyMarble", ItemDustsTiny.getTinyDustByName("Marble")); - OreDictionary.registerOre("dustTinyMithril", ItemDustsTiny.getTinyDustByName("Mithril")); - OreDictionary.registerOre("dustTinyNetherrack", ItemDustsTiny.getTinyDustByName("Netherrack")); - OreDictionary.registerOre("dustTinyNichrome", ItemDustsTiny.getTinyDustByName("Nichrome")); - OreDictionary.registerOre("dustTinyNickel", ItemDustsTiny.getTinyDustByName("Nickel")); - OreDictionary.registerOre("dustTinyObsidian", ItemDustsTiny.getTinyDustByName("Obsidian")); - OreDictionary.registerOre("dustTinyOsmium", ItemDustsTiny.getTinyDustByName("Osmium")); - OreDictionary.registerOre("dustTinyPeridot", ItemDustsTiny.getTinyDustByName("Peridot")); - OreDictionary.registerOre("dustTinyPhosphorous", ItemDustsTiny.getTinyDustByName("Phosphorous")); - OreDictionary.registerOre("dustTinyPlatinum", ItemDustsTiny.getTinyDustByName("Platinum")); - OreDictionary.registerOre("dustTinyPotassiumFeldspar", ItemDustsTiny.getTinyDustByName("PotassiumFeldspar")); - OreDictionary.registerOre("dustTinyPyrite", ItemDustsTiny.getTinyDustByName("Pyrite")); - OreDictionary.registerOre("dustTinyPyrope", ItemDustsTiny.getTinyDustByName("Pyrope")); - OreDictionary.registerOre("dustTinyRedGarnet", ItemDustsTiny.getTinyDustByName("RedGarnet")); - OreDictionary.registerOre("dustTinyRedrock", ItemDustsTiny.getTinyDustByName("Redrock")); - OreDictionary.registerOre("dustTinyRedstone", ItemDustsTiny.getTinyDustByName("Redstone")); - OreDictionary.registerOre("dustTinyRuby", ItemDustsTiny.getTinyDustByName("Ruby")); - OreDictionary.registerOre("dustTinySaltpeter", ItemDustsTiny.getTinyDustByName("Saltpeter")); - OreDictionary.registerOre("dustTinySapphire", ItemDustsTiny.getTinyDustByName("Sapphire")); - OreDictionary.registerOre("dustTinySilver", ItemDustsTiny.getTinyDustByName("Silver")); - OreDictionary.registerOre("dustTinySilicon", ItemDustsTiny.getTinyDustByName("Silicon")); - OreDictionary.registerOre("dustTinySodalite", ItemDustsTiny.getTinyDustByName("Sodalite")); - OreDictionary.registerOre("dustTinySpessartine", ItemDustsTiny.getTinyDustByName("Spessartine")); - OreDictionary.registerOre("dustTinySphalerite", ItemDustsTiny.getTinyDustByName("Sphalerite")); - OreDictionary.registerOre("dustTinySteel", ItemDustsTiny.getTinyDustByName("Steel")); - OreDictionary.registerOre("dustTinySulfur", ItemDustsTiny.getTinyDustByName("Sulfur")); - OreDictionary.registerOre("dustTinyTellurium", ItemDustsTiny.getTinyDustByName("Tellurium")); - OreDictionary.registerOre("dustTinyTeslatite", ItemDustsTiny.getTinyDustByName("Teslatite")); - OreDictionary.registerOre("dustTinyTetrahedrite", ItemDustsTiny.getTinyDustByName("Tetrahedrite")); - OreDictionary.registerOre("dustTinyCopper", ItemDustsTiny.getTinyDustByName("Copper")); - OreDictionary.registerOre("dustTinyTin", ItemDustsTiny.getTinyDustByName("Tin")); - OreDictionary.registerOre("dustTinyTitanium", ItemDustsTiny.getTinyDustByName("Titanium")); - OreDictionary.registerOre("dustTinyTungsten", ItemDustsTiny.getTinyDustByName("Tungsten")); - OreDictionary.registerOre("dustTinyUvarovite", ItemDustsTiny.getTinyDustByName("Uvarovite")); - OreDictionary.registerOre("dustTinyVinteum", ItemDustsTiny.getTinyDustByName("Vinteum")); - OreDictionary.registerOre("dustTinyVoidstone", ItemDustsTiny.getTinyDustByName("Voidstone")); - OreDictionary.registerOre("dustTinyYellowGarnet", ItemDustsTiny.getTinyDustByName("YellowGarnet")); - OreDictionary.registerOre("dustTinyZinc", ItemDustsTiny.getTinyDustByName("Zinc")); - // Ingots OreDictionary.registerOre("ingotAluminum", ItemIngots.getIngotByName("aluminum")); OreDictionary.registerOre("ingotAluminium", ItemIngots.getIngotByName("aluminum")); @@ -668,24 +558,6 @@ public class ModItems { OreDictionary.registerOre("plateYellowGarnet", ItemPlates.getPlateByName("yellowGarnet")); OreDictionary.registerOre("plateZinc", ItemPlates.getPlateByName("zinc")); - // Rods - OreDictionary.registerOre("stickBrass", ItemRods.getRodByName("brass")); - OreDictionary.registerOre("stickBronze", ItemRods.getRodByName("bronze")); - OreDictionary.registerOre("stickCopper", ItemRods.getRodByName("copper")); - OreDictionary.registerOre("stickElectrum", ItemRods.getRodByName("electrum")); - OreDictionary.registerOre("stickGold", ItemRods.getRodByName("gold")); - OreDictionary.registerOre("stickInvar", ItemRods.getRodByName("invar")); - OreDictionary.registerOre("stickIridium", ItemRods.getRodByName("iridium")); - OreDictionary.registerOre("stickIron", ItemRods.getRodByName("iron")); - OreDictionary.registerOre("stickLead", ItemRods.getRodByName("lead")); - OreDictionary.registerOre("stickNickel", ItemRods.getRodByName("nickel")); - OreDictionary.registerOre("stickPlatinum", ItemRods.getRodByName("platinum")); - OreDictionary.registerOre("stickSilver", ItemRods.getRodByName("silver")); - OreDictionary.registerOre("stickSteel", ItemRods.getRodByName("steel")); - OreDictionary.registerOre("stickTin", ItemRods.getRodByName("tin")); - OreDictionary.registerOre("stickTitanium", ItemRods.getRodByName("titanium")); - OreDictionary.registerOre("stickTungstensteel", ItemRods.getRodByName("tungstensteel")); - // Crushed Ore OreDictionary.registerOre("crushedAluminum", ItemCrushedOre.getCrushedOreByName("Aluminum")); OreDictionary.registerOre("crushedAluminium", ItemCrushedOre.getCrushedOreByName("Aluminum")); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 3bbdd3c84..da26d5d88 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -28,12 +28,10 @@ import techreborn.config.ConfigTechReborn; import techreborn.items.ItemCells; import techreborn.items.ItemDusts; import techreborn.items.ItemDustsSmall; -import techreborn.items.ItemDustsTiny; import techreborn.items.ItemGems; import techreborn.items.ItemIngots; import techreborn.items.ItemParts; import techreborn.items.ItemPlates; -import techreborn.items.ItemRods; import techreborn.util.CraftingHelper; import techreborn.util.LogHelper; import techreborn.util.OreUtil; @@ -48,7 +46,6 @@ public class public static void init() { addShapelessRecipes(); addGeneralShapedRecipes(); - addHammerRecipes(); addMachineRecipes(); addSmeltingRecipes(); @@ -260,9 +257,9 @@ public class for (String name : ItemDustsSmall.types) { GameRegistry.addShapelessRecipe(ItemDustsSmall.getSmallDustByName(name, 4), ItemDusts.getDustByName(name)); - GameRegistry.addShapelessRecipe(ItemDustsTiny.getTinyDustByName(name, 9), ItemDusts.getDustByName(name)); +// GameRegistry.addShapelessRecipe(ItemDustsTiny.getTinyDustByName(name, 9), ItemDusts.getDustByName(name)); GameRegistry.addShapelessRecipe(ItemDusts.getDustByName(name, 1), ItemDustsSmall.getSmallDustByName(name), ItemDustsSmall.getSmallDustByName(name), ItemDustsSmall.getSmallDustByName(name), ItemDustsSmall.getSmallDustByName(name)); - GameRegistry.addShapelessRecipe(ItemDusts.getDustByName(name, 1), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name)); +// GameRegistry.addShapelessRecipe(ItemDusts.getDustByName(name, 1), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name), ItemDustsTiny.getTinyDustByName(name)); } @@ -304,17 +301,6 @@ public class 'L', "blockLapis", 'C', "circuitBasic"); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Woodenshelf), - "WWW", "A A", "WWW", - 'W', "plankWood", - 'A', "plateAluminum"); - - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Metalshelf), - "III", "A A", "III", - 'I', "plateIron", - 'A', "plateAluminum"); - - TechRebornAPI.addRollingMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil"), "NCN", "C C", "NCN", 'N', ItemIngots.getIngotByName("cupronickel"), @@ -329,12 +315,6 @@ public class LogHelper.info("Smelting Recipes Added"); } - static void addHammerRecipes() { - ItemStack hammerIron = new ItemStack(ModItems.hammerIron, 1, OreDictionary.WILDCARD_VALUE); - ItemStack hammerDiamond = new ItemStack(ModItems.hammerDiamond, 1, OreDictionary.WILDCARD_VALUE); - - } - static void addAlloySmelterRecipes() { //Bronze RecipeHandler.addRecipe(new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemIngots.getIngotByName("tin", 1), ItemIngots.getIngotByName("bronze", 4), 200, 16)); @@ -480,22 +460,23 @@ public class static void addLatheRecipes() { //Metal Rods - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("brass", 1), ItemRods.getRodByName("brass", 1), 300, 16)); - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("bronze", 1), ItemRods.getRodByName("bronze", 1), 380, 16)); - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("copper", 1), ItemRods.getRodByName("copper", 1), 300, 16)); - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("electrum", 1), ItemRods.getRodByName("electrum", 1), 740, 16)); - RecipeHandler.addRecipe(new LatheRecipe(new ItemStack(Items.gold_ingot), ItemRods.getRodByName("gold", 1), 980, 16)); - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("invar", 1), ItemRods.getRodByName("invar", 1), 280, 16)); - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("iridium", 1), ItemRods.getRodByName("iridium", 1), 960, 16)); - RecipeHandler.addRecipe(new LatheRecipe(new ItemStack(Items.iron_ingot), ItemRods.getRodByName("iron", 1), 280, 16)); - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("lead", 1), ItemRods.getRodByName("lead", 1), 1020, 16)); - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("nickel", 1), ItemRods.getRodByName("nickel", 1), 280, 16)); - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("platinum", 1), ItemRods.getRodByName("platinum", 1), 960, 16)); - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("silver", 1), ItemRods.getRodByName("silver", 1), 520, 16)); - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("steel", 1), ItemRods.getRodByName("steel", 1), 280, 16)); - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("tin", 1), ItemRods.getRodByName("tin", 1), 580, 16)); - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("titanium", 1), ItemRods.getRodByName("titanium", 1), 240, 16)); - RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("tungstensteel", 1), ItemRods.getRodByName("tungstensteel", 1), 580, 16)); + //NOT NEEDED +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("brass", 1), ItemRods.getRodByName("brass", 1), 300, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("bronze", 1), ItemRods.getRodByName("bronze", 1), 380, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("copper", 1), ItemRods.getRodByName("copper", 1), 300, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("electrum", 1), ItemRods.getRodByName("electrum", 1), 740, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(new ItemStack(Items.gold_ingot), ItemRods.getRodByName("gold", 1), 980, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("invar", 1), ItemRods.getRodByName("invar", 1), 280, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("iridium", 1), ItemRods.getRodByName("iridium", 1), 960, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(new ItemStack(Items.iron_ingot), ItemRods.getRodByName("iron", 1), 280, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("lead", 1), ItemRods.getRodByName("lead", 1), 1020, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("nickel", 1), ItemRods.getRodByName("nickel", 1), 280, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("platinum", 1), ItemRods.getRodByName("platinum", 1), 960, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("silver", 1), ItemRods.getRodByName("silver", 1), 520, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("steel", 1), ItemRods.getRodByName("steel", 1), 280, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("tin", 1), ItemRods.getRodByName("tin", 1), 580, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("titanium", 1), ItemRods.getRodByName("titanium", 1), 240, 16)); +// RecipeHandler.addRecipe(new LatheRecipe(ItemIngots.getIngotByName("tungstensteel", 1), ItemRods.getRodByName("tungstensteel", 1), 580, 16)); //Laser Focus RecipeHandler.addRecipe(new LatheRecipe(ItemPlates.getPlateByName("ruby", 1), ItemParts.getPartByName("laserFocus", 1), 10, 16)); @@ -661,22 +642,22 @@ public class static void addBlastFurnaceRecipes() { RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDusts.getDustByName("titanium"), null, ItemIngots.getIngotByName("titanium"), null, 3600, 120, 1500)); RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("titanium", 4), null, ItemIngots.getIngotByName("titanium"), null, 3600, 120, 1500)); - RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("titanium", 9), null, ItemIngots.getIngotByName("titanium"), null, 3600, 120, 1500)); +// RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("titanium", 9), null, ItemIngots.getIngotByName("titanium"), null, 3600, 120, 1500)); RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDusts.getDustByName("aluminum"), null, ItemIngots.getIngotByName("aluminum"), null, 2200, 120, 1700)); RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("aluminum", 4), null, ItemIngots.getIngotByName("aluminum"), null, 2200, 120, 1700)); - RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("aluminum", 9), null, ItemIngots.getIngotByName("aluminum"), null, 2200, 120, 1700)); +// RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("aluminum", 9), null, ItemIngots.getIngotByName("aluminum"), null, 2200, 120, 1700)); RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDusts.getDustByName("kanthal"), null, ItemIngots.getIngotByName("kanthal"), null, 5500, 120, 2500)); RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("kanthal", 4), null, ItemIngots.getIngotByName("kanthal"), null, 5500, 120, 2500)); - RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("kanthal", 9), null, ItemIngots.getIngotByName("kanthal"), null, 5500, 120, 2500)); +// RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("kanthal", 9), null, ItemIngots.getIngotByName("kanthal"), null, 5500, 120, 2500)); RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDusts.getDustByName("tungsten"), null, ItemIngots.getIngotByName("tungsten"), null, 18000, 120, 2500)); RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("tungsten", 4), null, ItemIngots.getIngotByName("tungsten"), null, 18000, 120, 2500)); - RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("tungsten", 9), null, ItemIngots.getIngotByName("tungsten"), null, 18000, 120, 2500)); +// RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("tungsten", 9), null, ItemIngots.getIngotByName("tungsten"), null, 18000, 120, 2500)); RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDusts.getDustByName("chrome"), null, ItemIngots.getIngotByName("chrome"), null, 4420, 120, 1700)); RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("chrome", 4), null, ItemIngots.getIngotByName("chrome"), null, 4420, 120, 1700)); - RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("chrome", 9), null, ItemIngots.getIngotByName("chrome"), null, 4420, 120, 1700)); +// RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("chrome", 9), null, ItemIngots.getIngotByName("chrome"), null, 4420, 120, 1700)); RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDusts.getDustByName("steel"), null, ItemIngots.getIngotByName("steel"), null, 2800, 120, 1000)); RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("steel", 4), null, ItemIngots.getIngotByName("steel"), null, 2800, 120, 1000)); - RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("steel", 9), null, ItemIngots.getIngotByName("steel"), null, 2800, 120, 1000)); +// RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("steel", 9), null, ItemIngots.getIngotByName("steel"), null, 2800, 120, 1000)); RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDusts.getDustByName("galena", 2), null, ItemIngots.getIngotByName("silver"), ItemIngots.getIngotByName("lead"), 80, 120, 1500)); @@ -1009,7 +990,7 @@ public class RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.magma_cream, 1), null, new ItemStack(Items.blaze_powder, 1), new ItemStack(Items.slime_ball, 1), null, null, 2500, 5)); //Dust Byproducts - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("platinum", 1), null, ItemDustsTiny.getTinyDustByName("Iridium", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), null, null, 3000, 5)); +// RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("platinum", 1), null, ItemDustsTiny.getTinyDustByName("Iridium", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), null, null, 3000, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("electrum", 2), null, ItemDusts.getDustByName("silver", 1), ItemDusts.getDustByName("gold", 1), null, null, 2400, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("invar", 3), null, ItemDusts.getDustByName("iron", 2), ItemDusts.getDustByName("nickel", 1), null, null, 1340, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("marble", 8), null, ItemDusts.getDustByName("magnesium", 1), ItemDusts.getDustByName("calcite", 7), null, null, 1280, 5)); @@ -1032,7 +1013,7 @@ public class RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.glowstone_dust, 16), RecipeUtils.getEmptyCell(1), ItemCells.getCellByName("helium", 1, false), ItemDusts.getDustByName("gold", 8), new ItemStack(Items.redstone), null, 25000, 20)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16), RecipeUtils.getEmptyCell(2), ItemCells.getCellByName("helium3", 1, false), ItemCells.getCellByName("helium", 1, false), ItemDustsTiny.getTinyDustByName("Tungsten"), new ItemStack(Blocks.sand, 12), 4800, 5)); +// RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16), RecipeUtils.getEmptyCell(2), ItemCells.getCellByName("helium3", 1, false), ItemCells.getCellByName("helium", 1, false), ItemDustsTiny.getTinyDustByName("Tungsten"), new ItemStack(Blocks.sand, 12), 4800, 5)); } static void addIndustrialGrinderRecipes() { diff --git a/src/main/java/techreborn/items/ItemDustsTiny.java b/src/main/java/techreborn/items/ItemDustsTiny.java deleted file mode 100644 index 6a3dc72fb..000000000 --- a/src/main/java/techreborn/items/ItemDustsTiny.java +++ /dev/null @@ -1,93 +0,0 @@ -package techreborn.items; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import techreborn.client.TechRebornCreativeTabMisc; -import techreborn.init.ModItems; - -import java.security.InvalidParameterException; -import java.util.List; - -public class ItemDustsTiny extends ItemTR { - - public static ItemStack getTinyDustByName(String name, int count) { - for (int i = 0; i < types.length; i++) { - if (types[i].equalsIgnoreCase(name)) { - return new ItemStack(ModItems.tinyDusts, count, i); - } - } - throw new InvalidParameterException("The gem " + name + " could not be found."); - } - - public static ItemStack getTinyDustByName(String name) { - return getTinyDustByName(name, 1); - } - - public static final String[] types = new String[] - {"Almandine", "AluminumBrass", "Aluminum", "Alumite", "Andradite", - "Antimony", "Ardite", "Ashes", "Basalt", "Bauxite", "Biotite", - "Brass", "Bronze", "Cadmium", "Calcite", "Charcoal", "Chrome", - "Cinnabar", "Clay", "Coal", "Cobalt", "Copper", "Cupronickel", - "DarkAshes", "DarkIron", "Diamond", "Electrum", "Emerald", - "EnderEye", "EnderPearl", "Endstone", "Flint", "Glowstone", "Gold", "Graphite", - "Grossular", "Gunpowder", "Indium", "Invar", "Iridium", "Iron", "Kanthal", "Lapis", "Lazurite", - "Lead", "Limestone", "Lodestone", "Magnesium", "Magnetite", "Manganese", - "Manyullyn", "Marble", "Mithril", "Netherrack", "Nichrome", "Nickel", - "Obsidian", "Osmium", "Peridot", "Phosphorous", "Platinum", "PotassiumFeldspar", - "Pyrite", "Pyrope", "RedGarnet", "Redrock", "Redstone", "Ruby", "Saltpeter", - "Sapphire", "Silicon", "Silver", "Sodalite", "Spessartine", "Sphalerite", - "Steel", "Sulfur", "Tellurium", "Teslatite", "Tetrahedrite", "Tin", - "Titanium", "Tungsten", "Uvarovite", "Vinteum", "Voidstone", "YellowGarnet", - "Zinc", "Galena"}; - - private IIcon[] textures; - - public ItemDustsTiny() { - setUnlocalizedName("techreborn.dusttiny"); - setHasSubtypes(true); - setCreativeTab(TechRebornCreativeTabMisc.instance); - } - - @Override - // Registers Textures For All Dusts - public void registerIcons(IIconRegister iconRegister) { - textures = new IIcon[types.length]; - - for (int i = 0; i < types.length; ++i) { - textures[i] = iconRegister.registerIcon("techreborn:" + "tinyDust/tiny" - + types[i] + "Dust"); - } - } - - @Override - // Adds Texture what match's meta data - public IIcon getIconFromDamage(int meta) { - if (meta < 0 || meta >= textures.length) { - meta = 0; - } - - return textures[meta]; - } - - @Override - // gets Unlocalized Name depending on meta data - public String getUnlocalizedName(ItemStack itemStack) { - int meta = itemStack.getItemDamage(); - if (meta < 0 || meta >= types.length) { - meta = 0; - } - - return super.getUnlocalizedName() + "." + types[meta]; - } - - // Adds Dusts SubItems To Creative Tab - public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { - for (int meta = 0; meta < types.length; ++meta) { - list.add(new ItemStack(item, 1, meta)); - } - } - -} diff --git a/src/main/java/techreborn/items/ItemParts.java b/src/main/java/techreborn/items/ItemParts.java index 5415dbfc7..b4d90290d 100644 --- a/src/main/java/techreborn/items/ItemParts.java +++ b/src/main/java/techreborn/items/ItemParts.java @@ -36,11 +36,10 @@ public class ItemParts extends Item { "heliumCoolantSimple", "HeliumCoolantTriple", "HeliumCoolantSix", "NaKCoolantSimple", "NaKCoolantTriple", "NaKCoolantSix", "cupronickelHeatingCoil", "nichromeHeatingCoil", "kanthalHeatingCoil", - "bronzeGear", "ironGear", "titaniumGear", "steelGear", "tungstensteelGear", "laserFocus", "ductTape", "lazuriteChunk", "iridiumAlloyIngot", "rockCutterBlade", "superConductor", "thoriumCell", "doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell", "quadPlutoniumCell", "destructoPack", "iridiumNeutronReflector", "massHoleDevice", "computerMonitor" - , "machineParts", ""}; + ,"machineParts"}; private IIcon[] textures; diff --git a/src/main/java/techreborn/items/ItemRods.java b/src/main/java/techreborn/items/ItemRods.java deleted file mode 100644 index c7e0d9f7b..000000000 --- a/src/main/java/techreborn/items/ItemRods.java +++ /dev/null @@ -1,81 +0,0 @@ -package techreborn.items; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import techreborn.client.TechRebornCreativeTabMisc; -import techreborn.init.ModItems; - -import java.security.InvalidParameterException; -import java.util.List; - -public class ItemRods extends Item { - - public static ItemStack getRodByName(String name, int count) { - for (int i = 0; i < types.length; i++) { - if (types[i].equalsIgnoreCase(name)) { - return new ItemStack(ModItems.rods, count, i); - } - } - throw new InvalidParameterException("The rod " + name + " could not be found."); - } - - public static ItemStack getRodByName(String name) { - return getRodByName(name, 1); - } - - public static final String[] types = new String[] - {"brass", "bronze", "copper", "electrum", "gold", "invar", - "iridium", "iron", "lead", "nickel", "platinum", - "silver", "steel", "tin", "titanium", "tungstensteel"}; - - private IIcon[] textures; - - public ItemRods() { - setCreativeTab(TechRebornCreativeTabMisc.instance); - setHasSubtypes(true); - setUnlocalizedName("techreborn.rod"); - } - - @Override - // Registers Textures For All Dusts - public void registerIcons(IIconRegister iconRegister) { - textures = new IIcon[types.length]; - - for (int i = 0; i < types.length; ++i) { - textures[i] = iconRegister.registerIcon("techreborn:" + "metalRod/" - + types[i] + "Rod"); - } - } - - @Override - // Adds Texture what match's meta data - public IIcon getIconFromDamage(int meta) { - if (meta < 0 || meta >= textures.length) { - meta = 0; - } - - return textures[meta]; - } - - @Override - // gets Unlocalized Name depending on meta data - public String getUnlocalizedName(ItemStack itemStack) { - int meta = itemStack.getItemDamage(); - if (meta < 0 || meta >= types.length) { - meta = 0; - } - - return super.getUnlocalizedName() + "." + types[meta]; - } - - // Adds Dusts SubItems To Creative Tab - public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { - for (int meta = 0; meta < types.length; ++meta) { - list.add(new ItemStack(item, 1, meta)); - } - } - -} diff --git a/src/main/java/techreborn/pda/GuiManual.java b/src/main/java/techreborn/pda/GuiManual.java index 48f89cd03..7e52f1487 100644 --- a/src/main/java/techreborn/pda/GuiManual.java +++ b/src/main/java/techreborn/pda/GuiManual.java @@ -59,7 +59,6 @@ public class GuiManual extends GuiScreen{ pageCollection.addPage(new CraftingInfoPage("POWER_STORAGE_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Aesu), "")); pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.AlloyFurnace), "")); pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.AlloySmelter), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.AssemblyMachine), "")); pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.BlastFurnace), "")); pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.centrifuge), "")); pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.chargeBench), "")); @@ -80,7 +79,6 @@ public class GuiManual extends GuiScreen{ pageCollection.addPage(new CraftingInfoPage("POWER_STORAGE_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Idsu), "")); pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.ImplosionCompressor), "")); pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.IndustrialElectrolyzer), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.lathe), "")); pageCollection.addPage(new CraftingInfoPage("POWER_STORAGE_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Lesu), "")); pageCollection.addPage(new CraftingInfoPage("POWER_STORAGE_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.LesuStorage), "")); pageCollection.addPage(new CraftingInfoPage("POWER_GENERATION_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.LightningRod), "")); @@ -88,16 +86,13 @@ public class GuiManual extends GuiScreen{ pageCollection.addPage(new CraftingInfoPage("POWER_GENERATION_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.MagicalAbsorber), "")); pageCollection.addPage(new CraftingInfoPage("POWER_GENERATION_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Magicenergeyconverter), "")); pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.MatterFabricator), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Metalshelf), "")); pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.PlasmaGenerator), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.platecuttingmachine), "")); pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.quantumChest), "")); pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.quantumTank), "")); pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.RollingMachine), "")); pageCollection.addPage(new CraftingInfoPage("POWER_GENERATION_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Semifluidgenerator), "")); pageCollection.addPage(new CraftingInfoPage("POWER_GENERATION_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.thermalGenerator), "")); pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.VacuumFreezer), "")); - pageCollection.addPage(new CraftingInfoPage("MACHINES_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.Woodenshelf), "")); pageCollection.addPage(new CraftingInfoPage("TOOLS_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModItems.advancedDrill), "")); pageCollection.addPage(new CraftingInfoPage("TOOLS_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModItems.cloakingDevice), "")); diff --git a/src/main/java/techreborn/tiles/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/TileAssemblingMachine.java deleted file mode 100644 index 7a40766ff..000000000 --- a/src/main/java/techreborn/tiles/TileAssemblingMachine.java +++ /dev/null @@ -1,210 +0,0 @@ -package techreborn.tiles; - -import ic2.api.energy.tile.IEnergyTile; -import ic2.api.tile.IWrenchable; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import techreborn.api.recipe.RecipeCrafter; -import techreborn.init.ModBlocks; -import techreborn.lib.Reference; -import techreborn.powerSystem.TilePowerAcceptor; -import techreborn.util.Inventory; - -public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, IEnergyTile, IInventory, ISidedInventory { - - public int tickTime; - public Inventory inventory = new Inventory(8, "TileAssemblingMachine", 64); - public RecipeCrafter crafter; - - public TileAssemblingMachine() { - super(2); - //Input slots - int[] inputs = new int[2]; - inputs[0] = 0; - inputs[1] = 1; - int[] outputs = new int[1]; - outputs[0] = 2; - crafter = new RecipeCrafter(Reference.assemblingMachineRecipe, this, 2, 2, inventory, inputs, outputs); - } - - @Override - public void updateEntity() { - super.updateEntity(); - crafter.updateEntity(); - } - - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } - - @Override - public short getFacing() { - return 0; - } - - @Override - public void setFacing(short facing) { - } - - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) { - return true; - } - return false; - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.AssemblyMachine, 1); - } - - public boolean isComplete() { - return false; - } - - @Override - public void readFromNBT(NBTTagCompound tagCompound) { - super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); - crafter.readFromNBT(tagCompound); - } - - @Override - public void writeToNBT(NBTTagCompound tagCompound) { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); - crafter.writeToNBT(tagCompound); - } - - - @Override - public int getSizeInventory() { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) { - return inventory.decrStackSize(slot, amount); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public String getInventoryName() { - return inventory.getInventoryName(); - } - - @Override - public boolean hasCustomInventoryName() { - return inventory.hasCustomInventoryName(); - } - - @Override - public int getInventoryStackLimit() { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return inventory.isUseableByPlayer(player); - } - - @Override - public void openInventory() { - inventory.openInventory(); - } - - @Override - public void closeInventory() { - inventory.closeInventory(); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) { - return inventory.isItemValidForSlot(slot, stack); - } - - // ISidedInventory - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return side == ForgeDirection.DOWN.ordinal() ? new int[]{0, 1, 2} : new int[]{0, 1, 2}; - } - - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) { - if (slotIndex == 2) - return false; - return isItemValidForSlot(slotIndex, itemStack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemStack, int side) { - return slotIndex == 2; - } - -// @Override -// public void addWailaInfo(List info) -// { -// super.addWailaInfo(info); -// info.add("Power Stored " + energy.getEnergyStored() +" EU"); -// if(crafter.currentRecipe !=null){ -// info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t"); -// } -// } - - public int getProgressScaled(int scale) { - if (crafter.currentTickTime != 0) { - return crafter.currentTickTime * scale / crafter.currentNeededTicks; - } - return 0; - } - - @Override - public double getMaxPower() { - return 10000; - } - - @Override - public boolean canAcceptEnergy(ForgeDirection direction) { - return true; - } - - @Override - public boolean canProvideEnergy(ForgeDirection direction) { - return false; - } - - @Override - public double getMaxOutput() { - return 0; - } - - @Override - public double getMaxInput() { - return 128; - } -} diff --git a/src/main/java/techreborn/tiles/TileLathe.java b/src/main/java/techreborn/tiles/TileLathe.java deleted file mode 100644 index 463f980dc..000000000 --- a/src/main/java/techreborn/tiles/TileLathe.java +++ /dev/null @@ -1,210 +0,0 @@ -package techreborn.tiles; - -import ic2.api.energy.tile.IEnergyTile; -import ic2.api.tile.IWrenchable; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import techreborn.api.recipe.RecipeCrafter; -import techreborn.init.ModBlocks; -import techreborn.lib.Reference; -import techreborn.powerSystem.TilePowerAcceptor; -import techreborn.util.Inventory; - -public class TileLathe extends TilePowerAcceptor implements IWrenchable, IEnergyTile, IInventory, ISidedInventory { - - public int tickTime; - public Inventory inventory = new Inventory(7, "TileLathe", 64); - public RecipeCrafter crafter; - - public TileLathe() { - super(2); - //TODO configs - //Input slots - int[] inputs = new int[1]; - inputs[0] = 0; - int[] outputs = new int[1]; - outputs[0] = 1; - crafter = new RecipeCrafter(Reference.latheRecipe, this, 1, 1, inventory, inputs, outputs); - } - - @Override - public void updateEntity() { - super.updateEntity(); - crafter.updateEntity(); - } - - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } - - @Override - public short getFacing() { - return 0; - } - - @Override - public void setFacing(short facing) { - } - - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) { - return true; - } - return false; - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.lathe, 1); - } - - public boolean isComplete() { - return false; - } - - @Override - public void readFromNBT(NBTTagCompound tagCompound) { - super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); - crafter.readFromNBT(tagCompound); - } - - @Override - public void writeToNBT(NBTTagCompound tagCompound) { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); - crafter.writeToNBT(tagCompound); - } - - @Override - public int getSizeInventory() { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) { - return inventory.decrStackSize(slot, amount); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public String getInventoryName() { - return inventory.getInventoryName(); - } - - @Override - public boolean hasCustomInventoryName() { - return inventory.hasCustomInventoryName(); - } - - @Override - public int getInventoryStackLimit() { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return inventory.isUseableByPlayer(player); - } - - @Override - public void openInventory() { - inventory.openInventory(); - } - - @Override - public void closeInventory() { - inventory.closeInventory(); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) { - return inventory.isItemValidForSlot(slot, stack); - } - - // ISidedInventory - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return side == ForgeDirection.DOWN.ordinal() ? new int[]{0, 1} : new int[]{0, 1}; - } - - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) { - if (slotIndex == 1) - return false; - return isItemValidForSlot(slotIndex, itemStack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemStack, int side) { - return slotIndex == 1; - } - -// @Override -// public void addWailaInfo(List info) -// { -// super.addWailaInfo(info); -// info.add("Power Stored " + energy.getEnergyStored() +" EU"); -// if(crafter.currentRecipe !=null){ -// info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t"); -// } -// } - - public int getProgressScaled(int scale) { - if (crafter.currentTickTime != 0) { - return crafter.currentTickTime * scale / crafter.currentNeededTicks; - } - return 0; - } - - - @Override - public double getMaxPower() { - return 10000; - } - - @Override - public boolean canAcceptEnergy(ForgeDirection direction) { - return true; - } - - @Override - public boolean canProvideEnergy(ForgeDirection direction) { - return false; - } - - @Override - public double getMaxOutput() { - return 0; - } - - @Override - public double getMaxInput() { - return 32; - } -} diff --git a/src/main/java/techreborn/tiles/TileMetalShelf.java b/src/main/java/techreborn/tiles/TileMetalShelf.java deleted file mode 100644 index 23f7aafdd..000000000 --- a/src/main/java/techreborn/tiles/TileMetalShelf.java +++ /dev/null @@ -1,137 +0,0 @@ -package techreborn.tiles; - -import ic2.api.tile.IWrenchable; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import techreborn.init.ModBlocks; -import techreborn.util.Inventory; - -public class TileMetalShelf extends TileMachineBase implements IWrenchable, IInventory { - - public Inventory inventory = new Inventory(1, "TileMetalShelf", 64); - public boolean isEmpty; - public boolean hasBooks; - public boolean hasCans; - public boolean hasPaper; - - public TileMetalShelf() { - - } - - @Override - public void updateEntity() { - super.updateEntity(); - } - - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } - - @Override - public short getFacing() { - return 0; - } - - @Override - public void setFacing(short facing) { - } - - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) { - return true; - } - return false; - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.Metalshelf, 1); - } - - public boolean isComplete() { - return false; - } - - @Override - public void readFromNBT(NBTTagCompound tagCompound) { - super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); - - } - - @Override - public void writeToNBT(NBTTagCompound tagCompound) { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); - - } - - @Override - public int getSizeInventory() { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) { - return inventory.decrStackSize(slot, amount); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public String getInventoryName() { - return inventory.getInventoryName(); - } - - @Override - public boolean hasCustomInventoryName() { - return inventory.hasCustomInventoryName(); - } - - @Override - public int getInventoryStackLimit() { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return inventory.isUseableByPlayer(player); - } - - @Override - public void openInventory() { - inventory.openInventory(); - } - - @Override - public void closeInventory() { - inventory.closeInventory(); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) { - return inventory.isItemValidForSlot(slot, stack); - } -} diff --git a/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java b/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java deleted file mode 100644 index a5fd90a7d..000000000 --- a/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java +++ /dev/null @@ -1,211 +0,0 @@ -package techreborn.tiles; - -import ic2.api.energy.tile.IEnergyTile; -import ic2.api.tile.IWrenchable; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import techreborn.api.recipe.RecipeCrafter; -import techreborn.init.ModBlocks; -import techreborn.lib.Reference; -import techreborn.powerSystem.TilePowerAcceptor; -import techreborn.util.Inventory; - -public class TilePlateCuttingMachine extends TilePowerAcceptor implements IWrenchable, IEnergyTile, IInventory, ISidedInventory { - - public int tickTime; - public Inventory inventory = new Inventory(7, "TilePlateCuttingMachine", 64); - public RecipeCrafter crafter; - - public TilePlateCuttingMachine() { - super(2); - //TODO configs - //Input slots - int[] inputs = new int[1]; - inputs[0] = 0; - int[] outputs = new int[1]; - outputs[0] = 1; - crafter = new RecipeCrafter(Reference.plateCuttingMachineRecipe, this, 1, 1, inventory, inputs, outputs); - } - - @Override - public void updateEntity() { - super.updateEntity(); - crafter.updateEntity(); - } - - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } - - @Override - public short getFacing() { - return 0; - } - - @Override - public void setFacing(short facing) { - } - - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) { - return true; - } - return false; - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.platecuttingmachine, 1); - } - - public boolean isComplete() { - return false; - } - - @Override - public void readFromNBT(NBTTagCompound tagCompound) { - super.readFromNBT(tagCompound); - inventory.readFromNBT(tagCompound); - crafter.readFromNBT(tagCompound); - } - - @Override - public void writeToNBT(NBTTagCompound tagCompound) { - super.writeToNBT(tagCompound); - inventory.writeToNBT(tagCompound); - crafter.writeToNBT(tagCompound); - } - -// @Override -// public void addWailaInfo(List info) -// { -// super.addWailaInfo(info); -// info.add("Power Stored " + energy.getEnergyStored() +" EU"); -// if(crafter.currentRecipe !=null){ -// info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t"); -// } -// } - - - @Override - public int getSizeInventory() { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) { - return inventory.decrStackSize(slot, amount); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public String getInventoryName() { - return inventory.getInventoryName(); - } - - @Override - public boolean hasCustomInventoryName() { - return inventory.hasCustomInventoryName(); - } - - @Override - public int getInventoryStackLimit() { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return inventory.isUseableByPlayer(player); - } - - @Override - public void openInventory() { - inventory.openInventory(); - } - - @Override - public void closeInventory() { - inventory.closeInventory(); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) { - return inventory.isItemValidForSlot(slot, stack); - } - - // ISidedInventory - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return side == ForgeDirection.DOWN.ordinal() ? new int[]{0, 1} : new int[]{0, 1}; - } - - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) { - if (slotIndex == 1) - return false; - return isItemValidForSlot(slotIndex, itemStack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemStack, int side) { - return slotIndex == 1; - } - - public int getProgressScaled(int scale) { - if (crafter.currentTickTime != 0) { - return crafter.currentTickTime * scale / crafter.currentNeededTicks; - } - return 0; - } - - - @Override - public double getMaxPower() { - return 10000; - } - - @Override - public boolean canAcceptEnergy(ForgeDirection direction) { - return true; - } - - @Override - public boolean canProvideEnergy(ForgeDirection direction) { - return false; - } - - @Override - public double getMaxOutput() { - return 0; - } - - @Override - public double getMaxInput() { - return 64; - } -} diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 67c06d520..b6d90296c 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -20,22 +20,16 @@ tile.techreborn.implosioncompressor.name=Implosion Compressor tile.techreborn.grinder.name=Industrial Grinder tile.techreborn.chunkloader.name=Industrial Chunkloader tile.techreborn.magicenergyconverter.name=Magic Energy Converter -tile.techreborn.assemblingmachine.name=Assembling Machine tile.techreborn.dieselgenerator.name=Diesel Generator tile.techreborn.industrialelectrolyzer.name=Industrial Electrolyzer tile.techreborn.magicenergyabsorber.name=Magic Energy Absorber tile.techreborn.semifluidgenerator.name=Semifluid Generator tile.techreborn.alloyfurnace.name=Iron Alloy Furnace tile.techreborn.chemicalreactor.name=Chemical Reactor -tile.techreborn.lathe.name=Electric Lathe -tile.techreborn.platecuttingmachine.name=Plate Cutting Machine tile.techreborn.dragoneggsiphoner.name=Dragon Egg Energy Siphon tile.techreborn.idsu.name=IDSU tile.techreborn.aesu.name=AESU tile.techreborn.lesu.name=LESU -tile.techreborn.supercondensator.name=Supercondensator -tile.techreborn.woodenshelf.name=Wooden Shelf -tile.techreborn.metalshelf.name=Metal Shelf tile.techreborn.lesustorage.name=LESU Block tile.techreborn.distillationtower.name=Distillation Tower tile.techreborn.electriccraftingtable.name=Electric Autocrafting Table @@ -74,7 +68,6 @@ tile.techreborn.ore.Cassiterite.name=Cassiterite Ore tile.techreborn.ore.Lead.name=Lead Ore tile.techreborn.ore.Silver.name=Silver Ore - #Storage tile.techreborn.storage.silver.name=Block of Silver tile.techreborn.storage.aluminum.name=Block of Aluminum @@ -334,98 +327,6 @@ item.techreborn.dustsmall.YellowGarnet.name=Small Pile of Yellow Garnet Dust item.techreborn.dustsmall.Zinc.name=Small Pile of Zinc Dust item.techreborn.dustsmall.Galena.name=Small Pile of Galena Dust - -#Tiny Dusts -item.techreborn.dusttiny.Almandine.name=Tiny Pile of Almandine Dust -item.techreborn.dusttiny.AluminumBrass.name=Tiny Pile of Aluminum Brass Dust -item.techreborn.dusttiny.Aluminum.name=Tiny Pile of Aluminum Dust -item.techreborn.dusttiny.Alumite.name=Tiny Pile of Alumite Dust -item.techreborn.dusttiny.Andradite.name=Tiny Pile of Andradite Dust -item.techreborn.dusttiny.Antimony.name=Tiny Pile of Antimony Dust -item.techreborn.dusttiny.Ardite.name=Tiny Pile of Ardite Dust -item.techreborn.dusttiny.Ashes.name=Tiny Pile of Ashes -item.techreborn.dusttiny.Basalt.name=Tiny Pile of Basalt Dust -item.techreborn.dusttiny.Bauxite.name=Tiny Pile of Bauxite Dust -item.techreborn.dusttiny.Biotite.name=Tiny Pile of Biotite Dust -item.techreborn.dusttiny.Brass.name=Tiny Pile of Brass Dust -item.techreborn.dusttiny.Bronze.name=Tiny Pile of Bronze Dust -item.techreborn.dusttiny.Cadmium.name=Tiny Pile of Cadmium Dust -item.techreborn.dusttiny.Calcite.name=Tiny Pile of Calcite Dust -item.techreborn.dusttiny.Charcoal.name=Tiny Pile of Charcoal Dust -item.techreborn.dusttiny.Chrome.name=Tiny Pile of Chrome Dust -item.techreborn.dusttiny.Cinnabar.name=Tiny Pile of Cinnabar Dust -item.techreborn.dusttiny.Clay.name=Tiny Pile of Clay Dust -item.techreborn.dusttiny.Coal.name=Tiny Pile of Coal Dust -item.techreborn.dusttiny.Cobalt.name=Tiny Pile of Cobalt Dust -item.techreborn.dusttiny.Copper.name=Tiny Pile of Copper Dust -item.techreborn.dusttiny.Cupronickel.name=Tiny Pile of Cupronickel Dust -item.techreborn.dusttiny.DarkAshes.name=Tiny Pile of Dark Ashes -item.techreborn.dusttiny.DarkIron.name=Tiny Pile of Dark Iron Dust -item.techreborn.dusttiny.Diamond.name=Tiny Pile of Diamond Dust -item.techreborn.dusttiny.Electrum.name=Tiny Pile of Electrum Dust -item.techreborn.dusttiny.Emerald.name=Tiny Pile of Emerald Dust -item.techreborn.dusttiny.EnderEye.name=Tiny Pile of Ender Eye Dust -item.techreborn.dusttiny.EnderPearl.name=Tiny Pile of Ender Pearl Dust -item.techreborn.dusttiny.Endstone.name=Tiny Pile of Endstone Dust -item.techreborn.dusttiny.Flint.name=Tiny Pile of Flint Dust -item.techreborn.dusttiny.Glowstone.name=Tiny Pile of Glowstone Dust -item.techreborn.dusttiny.Gold.name=Tiny Pile of Gold Dust -item.techreborn.dusttiny.Graphite.name=Tiny Pile of Graphite Dust -item.techreborn.dusttiny.Grossular.name=Tiny Pile of Grossular Dust -item.techreborn.dusttiny.Gunpowder.name=Tiny Pile of Gunpowder -item.techreborn.dusttiny.Indium.name=Tiny Pile of Indium Dust -item.techreborn.dusttiny.Invar.name=Tiny Pile of Invar Dust -item.techreborn.dusttiny.Iridium.name=Tiny Pile of Iridium Dust -item.techreborn.dusttiny.Iron.name=Tiny Pile of Iron Dust -item.techreborn.dusttiny.Kanthal.name=Tiny Pile of Kanthal Dust -item.techreborn.dusttiny.Lapis.name=Tiny Pile of Lapis Lazuli Dust -item.techreborn.dusttiny.Lazurite.name=Tiny Pile of Lazurite Dust -item.techreborn.dusttiny.Lead.name=Tiny Pile of Lead Dust -item.techreborn.dusttiny.Limestone.name=Tiny Pile of Limestone Dust -item.techreborn.dusttiny.Lodestone.name=Tiny Pile of Lodestone -item.techreborn.dusttiny.Magnesium.name=Tiny Pile of Magnesium Dust -item.techreborn.dusttiny.Magnetite.name=Tiny Pile of Magnetite Dust -item.techreborn.dusttiny.Manganese.name=Tiny Pile of Manganese Dust -item.techreborn.dusttiny.Manyullyn.name=Tiny Pile of Manyullyn Dust -item.techreborn.dusttiny.Marble.name=Tiny Pile of Marble Dust -item.techreborn.dusttiny.Mithril.name=Tiny Pile of Mithril Dust -item.techreborn.dusttiny.Netherrack.name=Tiny Pile of Netherrack Dust -item.techreborn.dusttiny.Nichrome.name=Tiny Pile of Nichrome Dust -item.techreborn.dusttiny.Nickel.name=Tiny Pile of Nickel Dust -item.techreborn.dusttiny.Obsidian.name=Tiny Pile of Obsidian Dust -item.techreborn.dusttiny.Osmium.name=Tiny Pile of Osmium Dust -item.techreborn.dusttiny.Peridot.name=Tiny Pile of Peridot -item.techreborn.dusttiny.Phosphorous.name=Tiny Pile of Phosphorous Dust -item.techreborn.dusttiny.Platinum.name=Tiny Pile of Platinum Dust -item.techreborn.dusttiny.PotassiumFeldspar.name=Tiny Pile of Potassium Feldspar Dust -item.techreborn.dusttiny.Pyrite.name=Tiny Pile of Pyrite Dust -item.techreborn.dusttiny.Pyrope.name=Tiny Pile of Pyrope Dust -item.techreborn.dusttiny.RedGarnet.name=Tiny Pile of Red Garnet Dust -item.techreborn.dusttiny.Redrock.name=Tiny Pile of Red Rock Dust -item.techreborn.dusttiny.Redstone.name=Tiny Pile of Redstone -item.techreborn.dusttiny.Ruby.name=Tiny Pile of Ruby Dust -item.techreborn.dusttiny.Saltpeter.name=Tiny Pile of Saltpeter Dust -item.techreborn.dusttiny.Sapphire.name=Tiny Pile of Sapphire Dust -item.techreborn.dusttiny.Silicon.name=Tiny Pile of Silicon Dust -item.techreborn.dusttiny.Silver.name=Tiny Pile of Silver Dust -item.techreborn.dusttiny.Sodalite.name=Tiny Pile of Sodalite Dust -item.techreborn.dusttiny.Spessartine.name=Tiny Pile of Spessartine Dust -item.techreborn.dusttiny.Sphalerite.name=Tiny Pile of Sphalerite Dust -item.techreborn.dusttiny.Steel.name=Tiny Pile of Steel Dust -item.techreborn.dusttiny.Sulfur.name=Tiny Pile of Sulfur Dust -item.techreborn.dusttiny.Tellurium.name=Tiny Pile of Tellurium Dust -item.techreborn.dusttiny.Teslatite.name=Tiny Pile of Teslatite Dust -item.techreborn.dusttiny.Tetrahedrite.name=Tiny Pile of Tetrahedrite Dust -item.techreborn.dusttiny.Tin.name=Tiny Pile of Tin Dust -item.techreborn.dusttiny.Titanium.name=Tiny Pile of Titanium Dust -item.techreborn.dusttiny.Tungsten.name=Tiny Pile of Tungsten Dust -item.techreborn.dusttiny.Uvarovite.name=Tiny Pile of Uvarovite Dust -item.techreborn.dusttiny.Vinteum.name=Tiny Pile of Vinteum Dust -item.techreborn.dusttiny.Voidstone.name=Tiny Pile of Voidstone Dust -item.techreborn.dusttiny.YellowGarnet.name=Tiny Pile of Yellow Garnet Dust -item.techreborn.dusttiny.Zinc.name=Tiny Pile of Zinc Dust -item.techreborn.dusttiny.Galena.name=Tiny Pile of Galena Dust - #Cells item.techreborn.cell.Berylium.name=Berylium Cell item.techreborn.cell.biomass.name=Biomass Cell @@ -503,7 +404,6 @@ item.techreborn.ingot.hotTungstensteel.name=Hot Tungstensteel Ingot item.techreborn.ingot.tungstensteel.name=Tungstensteel Ingot item.techreborn.ingot.zinc.name=Zinc Ingot - #Nuggets item.techreborn.nuggets.aluminum.name=Aluminum Nugget item.techreborn.nuggets.antimony.name=Antimony Nugget @@ -526,26 +426,6 @@ item.techreborn.nuggets.titanium.name=Titanium Nugget item.techreborn.nuggets.tungsten.name=Tungsten Nugget item.techreborn.nuggets.zinc.name=Zinc Nugget - -#Metal Rod -item.techreborn.rod.brass.name=Brass Rod -item.techreborn.rod.bronze.name=Bronze Rod -item.techreborn.rod.copper.name=Copper Rod -item.techreborn.rod.electrum.name=Electrum Rod -item.techreborn.rod.gold.name=Gold Rod -item.techreborn.rod.invar.name=Invar Rod -item.techreborn.rod.iridium.name=Iridium Rod -item.techreborn.rod.iron.name=Iron Rod -item.techreborn.rod.lead.name=Lead Rod -item.techreborn.rod.nickel.name=Nickel Rod -item.techreborn.rod.platinum.name=Platinum Rod -item.techreborn.rod.silver.name=Silver Rod -item.techreborn.rod.steel.name=Steel Rod -item.techreborn.rod.tin.name=Tin Rod -item.techreborn.rod.titanium.name=Titanium Rod -item.techreborn.rod.tungstensteel.name=Tungstensteel Rod - - #Crushed Ore item.techreborn.crushedore.Aluminum.name=Crushed Aluminum Ore item.techreborn.crushedore.Ardite.name=Crushed Ardite Ore @@ -565,7 +445,6 @@ item.techreborn.crushedore.Tetrahedrite.name=Crushed Tetrahedrite Ore item.techreborn.crushedore.Tungsten.name=Purified Crushed Tungsten Ore item.techreborn.crushedore.Galena.name=Crushed Galena Ore - #Purified Crushed Ore item.techreborn.purifiedcrushedore.Aluminum.name=Purified Crushed Aluminum Ore item.techreborn.purifiedcrushedore.Ardite.name=Purified Crushed Ardite Ore @@ -585,7 +464,6 @@ item.techreborn.purifiedcrushedore.Tetrahedrite.name=Purified Crushed Tetrahedri item.techreborn.purifiedcrushedore.Tungsten.name=Purified Crushed Tungsten Ore item.techreborn.purifiedcrushedore.Galena.name=Purified Crushed Galena Ore - #Plates item.techreborn.plate.aluminum.name=Aluminum Plate item.techreborn.plate.batteryAlloy.name=Battery Alloy Plate @@ -625,7 +503,6 @@ item.techreborn.plate.tungstensteel.name=Tungstensteel Plate item.techreborn.plate.yellowGarnet.name=Yellow Garnet Plate item.techreborn.plate.zinc.name=Zinc Plate - #Parts item.techreborn.part.advancedCircuitParts.name=Advanced Circuit Parts item.techreborn.part.basicCircuitBoard.name=Basic Circuit Board @@ -647,9 +524,6 @@ item.techreborn.part.NaKCoolantSix.name=360k NaK Coolant Cell item.techreborn.part.cupronickelHeatingCoil.name=Cupronickel Heating Coil item.techreborn.part.nichromeHeatingCoil.name=Nichrome Heating Coil item.techreborn.part.kanthalHeatingCoil.name=Kanthal Heating Coil -item.techreborn.part.bronzeGear.name=Bronze Gear -item.techreborn.part.ironGear.name=Iron Gear -item.techreborn.part.titaniumGear.name=Titanium Gear item.techreborn.part.steelGear.name=Steel Gear item.techreborn.part.tungstensteelGear.name=Tungstensteel Gear item.techreborn.part.laserFocus.name=Laser Focus @@ -670,7 +544,6 @@ item.techreborn.part.massHoleDevice.name=Mass Hole Device item.techreborn.part.computerMonitor.name=Computer Monitor item.techreborn.part.machineParts.name=Machine Parts - #Tools item.techreborn.rockcutter.name=Rockcutter item.techreborn.lithiumbatpack.name=Lithium Batpack diff --git a/src/main/resources/assets/techreborn/textures/items/metalRod/brassRod.png b/src/main/resources/assets/techreborn/textures/items/metalRod/brassRod.png deleted file mode 100644 index 26b8159ffeb32bc4683707af8214c77c7d3c4a89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=9c5a{k|@@_(=O|6^g{ zZaPbVLX0Ire!&b5&u*jvIdYyZjv*Cs$p=_xuq@ya)o4B`sI|anBg3HpHb;|e#!b~s V%NMns@dB!3@O1TaS?83{1OP#7B?bTh diff --git a/src/main/resources/assets/techreborn/textures/items/metalRod/bronzeRod.png b/src/main/resources/assets/techreborn/textures/items/metalRod/bronzeRod.png deleted file mode 100644 index be8f2624d2a1b4cb8ce4440a804ffe80867d0ad3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=9UqT+73Fb|&y$$l_!@pBj@Sj7*Y|Je1LTZ%K{!zjpmbrS_^zOG8_tEb2Q0j+*Hl9 Ud{NsOFQ7^WPgg&ebxsLQ0F6f?(EtDd diff --git a/src/main/resources/assets/techreborn/textures/items/metalRod/copperRod.png b/src/main/resources/assets/techreborn/textures/items/metalRod/copperRod.png deleted file mode 100644 index facc37ed84651b1e65034bfbd024798872b14f49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=5pa4cFya9;k6X*&nyB zv_u&w#8?vK7tG-B>_!@pBj@Sj7*Y|Je1LTZ%K{!zjpmbrS_^zOG8_tEb2Q0j+*Hl9 Ud{NsOFQ7^WPgg&ebxsLQ0KwcNZU6uP diff --git a/src/main/resources/assets/techreborn/textures/items/metalRod/electrumRod.png b/src/main/resources/assets/techreborn/textures/items/metalRod/electrumRod.png deleted file mode 100644 index 24277b710bac0f273a1a28cb5ba7f27e40e6964f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1##a^{qS+k=P$dzeLpuR zq4_LOh_NKdFPOpM*^M+HN6yp5F{C0c`2gz-mIXYb8qFsKwHEknWH=PS=4g`5xT%_H U`J%QnUO<%$p00i_>zopr08gbTp8x;= diff --git a/src/main/resources/assets/techreborn/textures/items/metalRod/goldRod.png b/src/main/resources/assets/techreborn/textures/items/metalRod/goldRod.png deleted file mode 100644 index 7cfb945b4c50b93ddaa318896eef4a8d1a7914dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=0&AG3;Bz@a{Upl>-cH z&APjQLX0Ire!&b5&u*jvIdYyZjv*Cs$p=_xuq@z7)o4B`ptZnhBg3HpHb;|e#(6?a Vk%kk+>wqd5JYD@<);T3K0RXOLA@TqK diff --git a/src/main/resources/assets/techreborn/textures/items/metalRod/invarRod.png b/src/main/resources/assets/techreborn/textures/items/metalRod/invarRod.png deleted file mode 100644 index ed7444db734f855a66261376e0781b582276d2d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=0~QuE`m`*@Yn`Rnbd$ zbq#?+j3q&S!3+-1ZlnP@a-J@ZAr*1S2UusYEZ`BZwZLa1!=V5+N0V&EP1Q`x U7qy-70;**2boFyt=akR{05>@yk^lez diff --git a/src/main/resources/assets/techreborn/textures/items/metalRod/iridiumRod.png b/src/main/resources/assets/techreborn/textures/items/metalRod/iridiumRod.png deleted file mode 100644 index 880b73b6f59532c767a2a92235243d228da20851..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=4fp&RxEI`GyS}_Uze{ zQChtdD8yJ2<$ diff --git a/src/main/resources/assets/techreborn/textures/items/metalRod/ironRod.png b/src/main/resources/assets/techreborn/textures/items/metalRod/ironRod.png deleted file mode 100644 index 73e0d295872f19a5eacd357f8f47bee2e3f18047..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=8ucMP+r(?Y)y`%w1?C zc!?h<#8?vK7tG-B>_!@pBj@Sj7*Y|Je1LTZ%K{!zjpmbrS_^zOG8_tEb2Q0j+*Hl9 Ud{NsOFQ7^WPgg&ebxsLQ0KC^DRsaA1 diff --git a/src/main/resources/assets/techreborn/textures/items/metalRod/leadRod.png b/src/main/resources/assets/techreborn/textures/items/metalRod/leadRod.png deleted file mode 100644 index 701c948bf44191e79a25a2efadae6561fff780f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=2Q>Cay9z-g1sXita0x z*ogpz7)yfuf*Bm1-ADs+Nz(R@-+Yk|*3hC=~tjwacRo2r?X UFKRpE1ysr4>FVdQ&MBb@0K?iKApigX diff --git a/src/main/resources/assets/techreborn/textures/items/metalRod/nickelRod.png b/src/main/resources/assets/techreborn/textures/items/metalRod/nickelRod.png deleted file mode 100644 index 9fe9ee4b91a5922bcd8c82661c2595e792c01b4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=8w^D>bInXsv71+0k^X zT;n`Yh_NKdFPOpM*^M+HN6yp5F{C0c`2eeg=mH)=jpmD-S_(cJ84d-oshVUn?&4=U U{;EJA52%vC)78&qol`;+0Ffaf!TG+OAPo1;lK8W4$S;_|;n|HeAV<#A#WAEJF8KiK43-5vq8iO71+^CVY-BhTz~*R@&A6$W VY5AhIGhRTI44$rjF6*2Ung9jMCy)RD diff --git a/src/main/resources/assets/techreborn/textures/items/metalRod/steelRod.png b/src/main/resources/assets/techreborn/textures/items/metalRod/steelRod.png deleted file mode 100644 index 047e7faa5e0ed55892d0308ad8f6106f59769c46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=6M_miD$T?ry$80g=B8 z%glj7j3q&S!3+-1ZlnP@a-J@ZAr*1S2UusYEZ`BZwZLa1!=V5+N0V&EP1Q`x U7qy-70;**2boFyt=akR{02sU>NdN!< diff --git a/src/main/resources/assets/techreborn/textures/items/metalRod/tinRod.png b/src/main/resources/assets/techreborn/textures/items/metalRod/tinRod.png deleted file mode 100644 index f95ac0286670da021a42ad938900652ea1f7e918..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=3r$Zr!(U-_fH-&z?Q| zH8n&XD8yJ2_!@pBj@Sj7*Y|Je1LTZ%K{!zjpmbrS_^zOG8_tEb2Q0j+*Hl9 Ud{NsOFQ7^WPgg&ebxsLQ0Lwcgj{pDw diff --git a/src/main/resources/assets/techreborn/textures/items/metalRod/tungstensteelRod.png b/src/main/resources/assets/techreborn/textures/items/metalRod/tungstensteelRod.png deleted file mode 100644 index f661575f0667d56275a6c2d654ea2ee2832423c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=76QUIND9LY9dlj`^P& zBl3Ylj3q&S!3+-1ZlnP@a-J@ZAr*1S2UusYEZ`BZwZLa1!=V5+N0V&EP1Q`x U7qy-70;**2boFyt=akR{0POD|zW@LL diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAlmandineDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAlmandineDust.png deleted file mode 100644 index d3040635736d9f7ff2e7b02478b8bd76c8eca952..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=0%{7_NcI^9&5f85n*t zFx>O6G6G64l?3?(Gcc4*K5GHwDS5g$hE&8QD@YqiJ4m{n3TPAw?wGKlYn9@RgBdwG c4vSVYOmAh1eE9CDI#4x(r>mdKI;Vst09z3y4FCWD diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAluminumBrassDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAluminumBrassDust.png deleted file mode 100644 index 1a3358d068ddef83330a6676a74f766a182e73f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VE0B)!X83R={m5jkNBjI1 zmPyVml$cW_F|R~&a*p_-GRZ|{Qad^nrsj%I%afR%FaGn*;)$`(6oA^8N`m}=#*|Gy zYXRixdb&7vPQb0(+9L+MY=o;eP7YZ(~) XT^Lp{O!syIYGm+q^>bP0l+XkK=W{u_ diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAluminumDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAluminumDust.png deleted file mode 100644 index 4ac5f1d8d8fd49465d2f15be63606e17445ef794..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=3w-J_6DDJKy#^`hM`q zk0+mhUx`mW4wPUj3GxeOU?`h>)&j^=@^o$&?u7HF(JTXgVKzH fE0(A@ELzDh_YG6gL_sTlplSwBS3j3^P6siArjj7PUG+WCdvhO$W(UjscA#sT~snJT@rJIJjbo dio>Fn40GQw6-^Yh;s>f`@O1TaS?83{1OS%1B&q-a diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAntimonyDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAntimonyDust.png deleted file mode 100644 index cbc1afb54bbdd3c57fdb105ddb323f4f8e9b1249..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHF4e$wZ1=4GGec8D8E0A2j=j*0@ zUpMXly7|D@EeF5uI{J10$?peFeLr~m`{A?SPhR{k{e(v!sDZg8$S)X3|0+9j4@jwc zx;TbZ#3d_8Z?JNZG*nmQ`DVVCGokI)I^)g+w#6GaGITCuVyIrkdOp&-@jp-lgQu&X J%Q~loCIE1XLxTVS diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyArditeDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyArditeDust.png deleted file mode 100644 index b8aef3c38c32f6ee18371dc210530d70833fdc12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VE0B)!X86*@kjucZM~mT- zCqp&^!~b~<(-;`i85mL+7;+dG5*Qd_85p7&7$O-M!WkGQTK4e)wK0_h`2me7n|#&+ z$kX+7aSW-5OJ1P;AkF!yv9V#{q7OGCEhBaa)VQUog{g_jxv2=o+0`*B%nxH=@O;Iv U@M_Dp13--op00i_>zopr0EEjcTL1t6 diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAshes.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyAshes.png deleted file mode 100644 index 8eeb0fb73bc292e040cb9c1dd2ec6217ffba6c98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=8{H@%8ofK(eZ;s=U11 zf8vEWpeR#GkY6wZL)qlB7C@eor;B4qMO?Ciw1KpPq}! diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyBauxiteDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyBauxiteDust.png deleted file mode 100644 index 80c1ee3e221a4bc2258ce8988cf2a0878bb12374..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=3}vTYPs!88F{C0cSwY%B(?N2TV?d)wYR7~Cj}1yQ4z5_D d;;?8X!`wGaMH2 diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyBrassDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyBrassDust.png deleted file mode 100644 index e5f13550e64522585b8a292615524e3bbc47460e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=80Sg3$ZT4Bxgh{M^Ox z{}8`M(5`Dh38s=DzhDN2vdL#HfIKBn7srr_xMT%s15F3XRgM9TBB>n{0z5V-%{aJX eiHgIbl?-#=FcnP{wBiST z=gRcXm+D?^usHU9K^{<=sU*lRn1P{e@>vTYPubJOF{C0cSwY%B(?K%JGoZ07xMM;< lRhQC?gDaM(9B`0gVAyHKbZ1-dgfO6T22WQ%mvv4FO#tswD diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCadmiumDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCadmiumDust.png deleted file mode 100644 index be94553883617ebd86add76e55d5a24dc2c99bcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=4Ze3`$y7Ms{J*`Ev@o z4z@3QA*cP#6ez(|666=mz)&{%tOby#2)Sm diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCalciteDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCalciteDust.png deleted file mode 100644 index b65b315929c707ec97684460051812b3a0721d12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=71VlmpT3ja7R#RUg^Y z8(3xg7bwb9666=mz)&{%tOby#?CIhdQW2M|AZ?)OAgSdS&?u1FF=0aYW~CViS1eIE c;2_1o(Cg1+X!}3e8K|7W)78&qol`;+0O5WpTL1t6 diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCharcoalDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCharcoalDust.png deleted file mode 100644 index 98b130a79be60c3bcfff9ea42510f6f4fc061ccc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=50GATBO0DJdE8^h6&} zh^ZvVFPMR$Z1PzPAWzxT#WAEJE?Gg^K+{1|%P)X2J-uVXgw30kW*l6xMCE{k6a&MA W4@~wP)md6VLenB diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCinnibarDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCinnibarDust.png deleted file mode 100644 index 0daaf286e77cd35318036b025d541f41395f2119..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=0};oIsSQ%$2UnHO-uV z=ewkXKvAZWAirP+hO)_LEr2{_PZ!6KinwG2X#-6MNiDyCMuF6h2@|?EE6q5#Vu{KD b2Pp=IUVkP-+yBYVK;;acu6{1-oD!M<>LenB diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyClayDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyClayDust.png deleted file mode 100644 index bc92c2b459f5a39fc9fd3d480f9ef9ed8b31a584..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Wq?nJE0C_JZLO*Au5amW?wD9w z)l^g0U0T^Rck#LjlNVN0ca&5#0%iLrF6f;!r=xdzd+#)$`mPDHwx=EC0cvJ03GxFO z_N(m3Js_p)>Eakt5tqC`JK?$8)6XA@HYt9Nv~1ZCF+;G%EzGWtQ7lbOMbJ?pA!UIi a14CXL!`sIEq$akr~Kslz8AirP+hO)_LEr2{_PZ!6KinwG2=?xYRl6jf|jX|j$6Fjmu kDbG0g;*rt;2Pp=IMUHx3vIVCg!0KC8`2><{9 diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCopperDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyCopperDust.png deleted file mode 100644 index 33cfee8afb930e4b798d649b6a1b0a8d3d602294..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU1=8h?qCiyTB0f7zc6OND z;#k$?Nm}>o)K>xJm`Z~Df*BafCZDwc@{~MX978JNk`<&4G#wFn3|q>XPG!n1vWwlhU0HVzWxG=GL;1R1v4;|O+IS@ gad5>F6^BJD88&ZaI=+9F)=7|&p00i_>zopr0Jpj(8~^|S diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyDiamondDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyDiamondDust.png deleted file mode 100644 index 5662c8a04735c27740890f6eca35e4ac82502df4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=5#4d;p>cU%ou~_U-xi z@Bjb*f7XpPY)78&qol`;+0A*_};{X5v diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyElectrumDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyElectrumDust.png deleted file mode 100644 index 3fa1796137fc7750e454eb9533eb4cdb9a2bc052..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=80Z%?6^!uXjCrclhOp zlV83+D?6@t2`Ir-666=mz)&{%tOby#-T5(gvCil3IQNjRL716DD+TR+@2e#S)bR c4pIyZz5Yyww*Qlzfyx;?UHx3vIVCg!0AAH2!Tw(BbP0l+XkKWrQV= diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyEnderPearlDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyEnderPearlDust.png deleted file mode 100644 index a8801632a94267d9aced3632861bd59bd361bb8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=0p{>w(BK6NNV{7Gzz44OqkHUS!u?>6-!hO cI7l%t^!hUy+Wt>=1}bOpboFyt=akR{0O z)Sdh0=2#a=10|SBg8YIR7|JG}wE*&zJY5_^D&mqAqzyD3Bv&~GG>W8lObGDUpfuy) fiX|!zi&iqseZy2VQP7GXsG7mk)z4*}Q$iB}aJecJ diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyFlintDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyFlintDust.png deleted file mode 100644 index 36c0f9feaeb9297e519470eb98b1df7ee82bee5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=51*7CEakt5tpnWZJ_BOspS{YD3IDQVM6z2r5OiTEKxb& aAjQDY>(69p`#;$kq}$Wg&t;ucLK6T`As~+c diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyGalenaDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyGalenaDust.png deleted file mode 100644 index efee25adbaf41a02d0b168e7cc3fadeef2be4d49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=7l#HbA7#<*dQws>SWm zYjTgTe~DWM4fcaObCeV kRGM*c#S)bR4pIyZM@5*qx1DV{1ys)9>FVdQ&MBb@093;<%K!iX diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyGraphiteDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyGraphiteDust.png deleted file mode 100644 index b6a03fbcb4a8734ebc0185bbe97045d8dfef2640..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHF3h)VW1=4Ze3=$F&ii(O#N=nMg z$|@=<>gwwH`uc{3hDJt4CMG5p78aG2m8)Ny_XAZkl?3?(Gcc4*K5GHwsd~CNhE&8Q zD@YrtJ4l92R^*v>`xRe8+l$VnjR|avySo`WmoYKeRIxl>%o?Ep)WG2B>gTe~DWM4f Dtbr&5 diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyGrossularDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyGrossularDust.png deleted file mode 100644 index 9e60d3e3e47ff6eeb4bb64296c7bddbfa6d0e9a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=3~K3>%|BFVdQ&MBb@0G?DfucfQ-I1DJYD@<);T3K0RY;oC8q!Y diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyIndiumDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyIndiumDust.png deleted file mode 100644 index ee0d8f0956fb19e6da9bd5fe9afb6d42d66e3c5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=4Ze47vtp&h7yf4HKu% z-?DlCjsIP)AAk}}B|(0{3=CzH&sqR^N}eu`Ar*1S3epDB4w7jn0~!rPJ0=uFbt%p` gn31F7uxKU2K`y5Me^ndnfvOoiUHx3vIVCg!0Dwm*MF0Q* diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyInvarDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyInvarDust.png deleted file mode 100644 index 3841f8fd5382f42bf5b5f803720487a7c17208a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=7=c^MPpgHx2>~7(lx7@U fu|&mT(MpE7Z|4RWo?H`njxgN@xNA`4lL` diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyIridiumDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyIridiumDust.png deleted file mode 100644 index 060ab38707ed9f8a4d5f01960fc6a1846746971e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=3f*;O^bK4<0;t^ytx> zH*cPap4|eJU@8gn3ua&_n|#&+$W!ukaSW-5OIDCJ&~%VoF d6^BJD8RouWDw-&0#Sc`?;OXk;vd$@?2>``*D^dUe diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyKanthalDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyKanthalDust.png deleted file mode 100644 index ac144e2ff516cc8b25f5214183dca212a0b0e805..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=6<<6adka3zJ`5U;Ogs zs;}>E&2jqI3Y1_f3GxeOU?`h>)&j^=@^o$&?u7HF(JTXgVKzH fE0(A@ELzDh_YG6gL_sTlplSwBS3j3^P6)&j^=_H=O!sfbHfkT%eCkks-EXcS28m@uJxv(k)%E0(An caFAkP==EnZwEds#3{=kG>FVdQ&MBb@02uWqEC2ui diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLapizDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLapizDust.png deleted file mode 100644 index b7814e07f75a6ed0d8cd934ea7c264e1f5c9966a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=6NEXMo7U;G&(`WoPRv zuYb%t4isf73GxeOU?`h>)&j^=_H=O!sfbHfkT%eCkks-EXcS28m@uJxv(k)%E0(An caFAkP==EnZwEds#3{=kG>FVdQ&MBb@02uWqEC2ui diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLazuriteDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLazuriteDust.png deleted file mode 100644 index 44a8fec763b3f2779ee19453a1285bac2342ee9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=75UbAX61bunMYa-qia zEO+nK0!5ihg8YIR7|JG}wE*&zJzX3_D&mqAqzyD3B(?kk8U<22CQRtwtTf}`iX|!s c9HbZ+di|LUZT}}b1C=v)y85}Sb4q9e0GtaXod5s; diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLeadDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLeadDust.png deleted file mode 100644 index 7e07a5d7419ede9141a0ced6c74492e7b4931181..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=4c-dO)NkXre4=sv=~r zA!2)|!>AA_!Bi6D7tFv=HuGIa6`Q!HhRL4vSVYysl+l9wwAz1XRx8>FVdQ&MBb@09V5?#Q*>R diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLodestoneDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyLodestoneDust.png deleted file mode 100644 index 7326cab97dcff923173f06f88cc471eb73d7ca18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=4Ze4DIdhOO`CzvSrJT z9XlRBeq1SaaS>30sU*lRn1P{e@>vTYPs!88F{C0cSwY%B(?N2TV?d)wYR7~Cj}1yQ h4z5_D;;?8X!`wGaMH2fGMC!fDN=vpXu! zpFLgo?73Iw}AF diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyManganeseDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyManganeseDust.png deleted file mode 100644 index 060ab38707ed9f8a4d5f01960fc6a1846746971e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=3f*;O^bK4<0;t^ytx> zH*cPap4|eJU@8gn3ua&_n|#&+$W!ukaSW-5OIDCJ&~%Vo{JKz)dL$JmzO)X4KtjG+WCdvhO$SLWzW~Pc^o|J=Hg8s%ad5>Fl>-h^ a3=9)KFxhidXK4YIGkCiCxvX-T5(gvCil3IQNjRL716DD+TR+@2e#S)bR c4pIyZz5Yyww*Qlzfyx;?UHx3vIVCg!0QQ9K6NUm}WXcS59m=NHxL21Up f6-!hc7OiBM`-Z7#qM#K&P&I?6tDnm{r-UW|{_HFH diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyNickelDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyNickelDust.png deleted file mode 100644 index fa80186855cd9e5b31f39cc9829eb1ac355a9bfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 433 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf_5hy{*Z=?j|NQy$&!0bk|NdRO zcJ1obtJket_v6Qp6)RS(S+nNey?g)u{rmm<_kjZkR<2z6?%lgruU^fWGiUw!^*eU# z`1tXo#kBfavu3SYwaR3A-Nua@jVD##x^-*Xv}rG2z66Q@(Ud7uX3m^BdGh2NH*Va# zdGqYqvzISl?&;}iZ*Q-yt*xu8tE{Z7udfFwo>pryqu%=WG3`q|8W(!>FLvq9u9rB~ zZ8o(|Zce50`3X7~I)%ilOkkR0bLPyi zXFO+oWCR$^)ZEx?m9?|Q>KGk2Gzc_rSkb$&bLC8q=@Krin_Jd3E^J-8Zps#(BRqVO zmaz&Go(DDDT(n}znnkOYt!sQ@;H#S}yW#K&Mh5d}9-~>)(%yj_=IQF^vd$@?2>@CV BydeMp diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyNikoliteDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyNikoliteDust.png deleted file mode 100644 index 7ebcdafafb6b0f5c9f88d3de27e062f313d73b89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU1=2BPFOzFtG3e9WwoU-5X7F_Nb6Mw<&;$UM+$VMb diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyObsidianDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyObsidianDust.png deleted file mode 100644 index 027566d33257792bce6f3a682b5576fe0e418379..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=8Xy(mK6NNV{7Gzz44OqkHUS!u?>6-!hO cI7l%t^!hUy+Wt>=1}bOpboFyt=akR{0K63^^Z)<= diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyPhosphorousDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyPhosphorousDust.png deleted file mode 100644 index d9d5975bbd51428be811e693e4279e7c3081b027..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=9BpgV6n>4DT*72tNzF z0u*8@3GxeOU?`h>)&j^=@^oMSjwat2RVKbLh*2~7Z6^duSp diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyPyriteDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyPyriteDust.png deleted file mode 100644 index 232279cc1ee7560bb753bb2ca58ce8403e40ea8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=2I~KxknJ!}1D-YqJ<^ zeu=FCiZYc1`2{mDlubTs0puxrx;TbZ#3d_88)!O6YWW2;3Z!;Sn9#jhX~w}7OH>Xx bNHH+<`ZF2Y{!exWDrfL?^>bP0l+XkKkzOQX diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyPyropeDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyPyropeDust.png deleted file mode 100644 index 995879c416263914a60446c27c45c8b0a2a0e0fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=2dq20-M%>gLMoOeHj&~Unu(PA^R zz4rDc(OWMAC74Qr{DK)6$|j$+0P>VPT^vIy;*u4l4Ky7jS2+eWillZ-2=LgTG~?ik eB`OY!Rx-?e!&Ed;(25_Zn!(f6&t;ucLK6VKyd^CF diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyRedrockDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyRedrockDust.png deleted file mode 100644 index ec16a041b481df720ccc76cb5d16b273a2f99003..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=7uOazHdqS$VdKO8gl< zbD$7YNswPK14G&5vlc*}vZsq^Z8lw1CPPJYD@<);T3K0RVliAxZ!M diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyRedstoneDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyRedstoneDust.png deleted file mode 100644 index 1bd06657dd70545af196f6e180a9419d847372b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=6|<3`JnllYt?Gf#E*` z!+AMg7N7)ENswPK14G&5vlc*}lBbJfNJU(-g0z9OgQVN3fW{>P9TPT8>QbC>Fe69D cVbMy4d09-wJ$HB>0aY`2y85}Sb4q9e09WB5$p8QV diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyRubyDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyRubyDust.png deleted file mode 100644 index 9341d136f347f7cc6e639228ba3d09a88e235de5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=3%=ynyIic=)%(#9xaS zt1JpQ0Tg8_3GxeOU?`h>)&j^=_H=O!sfbHfkT%eCkks-EXcS28m@uJxv(k)%E0(An caFAkP==EnZwEds#3{=kG>FVdQ&MBb@0EAB`L;wH) diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinySaltpeterDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinySaltpeterDust.png deleted file mode 100644 index 05a965472a84abc554f1a97f50ca9c35a5435100..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=2UJ9|oeE*N@!0dp6#_ zel1XlsU*lRn1P{e@>vTYPubJOF{C0cSwY%B(?Rl-TL5EvYR7~L8#gM=IJjbo$^i!{ a28J4A#&_}2rYC{Q89ZJ6T-G@yGywqJGbvX9 diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinySapphireDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinySapphireDust.png deleted file mode 100644 index a0a62a89d727b2331a5eec22721697190286f06b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=8m6XMo5t?VNkgh0=+4 z%ytQG28uG31o;IsFqBO`YXRgbd%8G=RKz7KNE>K6NNV{7Gzz44OqkHUS!u?>6-!hO cI7l%t^!hUy+Wt>=1}bOpboFyt=akR{02%Hk3IG5A diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinySiliconDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinySiliconDust.png deleted file mode 100644 index 66ceaeadc104714997e9509b03ced9fc9ddef522..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=4Ze47$3y*4Ebc_V#_r za_@jbOeH~n!3+##lh0ZJdCHzHjv*Cs$qLd2nhug$egTZ>=^Ya$Y~HLi5nM7cAsvbpF6F UD`oPT6rdgkPgg&ebxsLQ0FmlWOaK4? diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinySodaliteDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinySodaliteDust.png deleted file mode 100644 index 4786d219e6d4285baf741a1eaed881b5b52a8d07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=6xU>wrk!e~Wy;4%N6D zUnb}*0*W$~1o;IsFqBO`YXRgbd%8G=RKz7KNE>K6NNV{7Gzz44OqkHUS!u?>6-!hO cI7l%t^!hUy+Wt>=1}bOpboFyt=akR{0J0Ax+yDRo diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinySpessartineDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinySpessartineDust.png deleted file mode 100644 index a198f63f37487dceeae31d0b4237845c6f549426..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=7n641j3Ag~bs|%VV~- zXT!q&*XbMpN-&iK`2{mDlubTs0puxpx;TbZ#3d_88)!O6u5t`$6iMxv5a6*vX~w}7 eOH>>dtz?+{hN)Eakt5tpnWZJ_BOspS{YD3IDQVM6z2r5OiTEKxb& bAjQDY>(69p`#;$ksGPym)z4*}Q$iB}#kM5_ diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinySteelDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinySteelDust.png deleted file mode 100644 index b4a12896fa87c7507c86042028773f28dc201156..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=7Agkw6q4ni3J778RKh z7n}3bxnvShf~h3PFPMR$Z1PzPAWzBD#WAEJE?Gg^K+{2Tm197oNNUG~0FMnyGY+m; eqT;Y z4-{f53GxeOU?`h>)&j^=@^oC-1o zn$+9d`)-@yBcLfvB|&~bQ_CiwwE*&TJzX3_D&mqCXg^4Fe`>sW!={BFW?ES6+#y)w q7N=%c$LQ#$BB+=s7^pBmjDaD06~hO0VXY@XjSQZyelF{r5}E)nHdJu{ diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyTeslatiteDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyTeslatiteDust.png deleted file mode 100644 index 7ebcdafafb6b0f5c9f88d3de27e062f313d73b89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU1=2BPFOzFtG3e9WwoU-5X7F_Nb6Mw<&;$UM+$VMb diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyTetrahedriteDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyTetrahedriteDust.png deleted file mode 100644 index 5748b286cf64e36e112a842d908f06fe0fb6399e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=3ZjqCixuCbrN}X055* zb_<27KkFQT5=)&j^=@^o$&?u7HF(JTXgVKzH fE0(A@ELzDh_YG6gL_sTlplSwBS3j3^P6^27Jbqp%c z7_Km+&jU&@l?3?(Gcc4*K5GHwDS5g$hE&8QD@YqiJ4m{n3TPAw?wGKlYn9@RgBdwG c4vSVYOmAh1eE9CDI#4x(r>mdKI;Vst09o558UO$Q diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyUvaroviteDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyUvaroviteDust.png deleted file mode 100644 index 0e18b6e3bea218a61f4f0bbbc5365e1025ac4f6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1<@@Ga{EA}>^27Jbqp%c z7_Km+&jU&@l?3?(Gcc4*K5GHwDS5g$hE&8QD@YqiJ4m{n3TPAw?wGKlYn9@RgBdwG c4vSVYOmAh1eE9CDI#4x(r>mdKI;Vst09o558UO$Q diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyVinteumDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyVinteumDust.png deleted file mode 100644 index 65fdf65089cf8a84b1ed34d49c15bab90b81d48c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=4Ze4E%C7;%bhvx~|H` zo?2$MM$W+wK`~AtaiJxXQ(ETs?|(LV&!q(yK5l&UCoNQPD^L$pNswPK14G&5vlc*} zil>WXNJU(-f^>mjgVD494P1B5>oFLs{GZFkVk|LtDvO7SD8sG-wmG?+*%oGiketit>p z$^x8<%QUa#3!sZ6DO{@aGJAta1N`m}?85qhYpS1w;R6SiBLn`8u z6{HO;9VFvsEAl+Ee#n*3_Ti+Nt3mTckI05b69xv2XqNiDrK_ER8W=oX{an^LB{Ts5 D7xp8E diff --git a/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyYellowGarnetDust.png b/src/main/resources/assets/techreborn/textures/items/tinyDust/tinyYellowGarnetDust.png deleted file mode 100644 index 3cf56a355446a1841984b18ecde1b7dc98122d8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=8!6fY8m;40p~lyu8Km z{~dST#%w;I1XD?nUoZnh+2pepK%SDPi(^PdT(W|+fu@7xD#w6Ek<^X}0UjHaW*l6x eM8#pzN`|>_n2II}TJZx_GkCiCxvX