From 33e6060119d4263dcac1a594e53390e7a62e848a Mon Sep 17 00:00:00 2001 From: Muramasa Date: Sat, 10 Sep 2016 13:20:09 +0100 Subject: Simplify, cleanup and seperate processors --- .../loaders/preload/GT_Loader_OreProcessing.java | 58 +++------------------- 1 file changed, 7 insertions(+), 51 deletions(-) (limited to 'src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java') diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java index 7fda646839..1e12e9c14b 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java @@ -14,57 +14,32 @@ public class GT_Loader_OreProcessing new ProcessingBlock(); new ProcessingBolt(); new ProcessingCell(); - new ProcessingCellPlasma(); new ProcessingCircuit(); new ProcessingCompressed(); new ProcessingCrafting(); new ProcessingCrop(); - new ProcessingCrushedPurified(); - new ProcessingCrushedCentrifuged(); + new ProcessingCrushedOre(); new ProcessingCrystallized(); new ProcessingDirty(); new ProcessingDust(); - new ProcessingDustImpure(); - new ProcessingDustSmall(); - new ProcessingDustTiny(); new ProcessingDye(); new ProcessingFoil(); new ProcessingFood(); new ProcessingLens(); new ProcessingShaping(); - new ProcessingGemChipped(); - new ProcessingGemFlawed(); new ProcessingGem(); - new ProcessingGemFlawless(); - new ProcessingGemExquisite(); new ProcessingGear(); - new ProcessingGearSmall(); - new ProcessingIngot1(); - new ProcessingIngot2(); - new ProcessingIngot3(); - new ProcessingIngot4(); - new ProcessingIngot5(); - new ProcessingIngotHot(); + new ProcessingIngot(); new ProcessingItem(); - new ProcessingLeaves(); new ProcessingLog(); new ProcessingTransforming(); new ProcessingNugget(); new ProcessingOre(); new ProcessingOrePoor(); new ProcessingOreSmelting(); - new ProcessingPipeSmall(); - new ProcessingPipeMedium(); - new ProcessingPipeLarge(); - new ProcessingPipeRestrictive(); + new ProcessingPipe(); new ProcessingPlank(); - new ProcessingPlate1(); - new ProcessingPlate2(); - new ProcessingPlate3(); - new ProcessingPlate4(); - new ProcessingPlate5(); - new ProcessingPlate9(); - new ProcessingPlateAlloy(); + new ProcessingPlate(); new ProcessingPure(); new ProcessingRecycling(); new ProcessingSand(); @@ -75,28 +50,9 @@ public class GT_Loader_OreProcessing new ProcessingStone(); new ProcessingStoneCobble(); new ProcessingStoneVarious(); - new ProcessingToolHeadArrow(); - new ProcessingToolHeadAxe(); - new ProcessingToolHeadBuzzSaw(); - new ProcessingToolHeadFile(); - new ProcessingToolHeadHammer(); - new ProcessingToolHeadHoe(); - new ProcessingToolHeadPickaxe(); - new ProcessingToolHeadSaw(); - new ProcessingToolHeadSense(); - new ProcessingToolHeadShovel(); - new ProcessingToolHeadSword(); - new ProcessingToolHeadPlow(); - new ProcessingToolHeadDrill(); - new ProcessingToolHeadChainsaw(); - new ProcessingToolHeadWrench(); - new ProcessingToolHeadUniversalSpade(); + new ProcessingToolHead(); + new ProcessingToolOther(); new ProcessingWax(); - new ProcessingWire01(); - new ProcessingWire02(); - new ProcessingWire04(); - new ProcessingWire08(); - new ProcessingWire12(); - new ProcessingWire16(); + new ProcessingWire(); } } -- cgit From 75ef60a0c112e72470dd771992d6a1a9f0d4e53d Mon Sep 17 00:00:00 2001 From: Muramasa Date: Sat, 10 Sep 2016 15:00:07 +0100 Subject: Add processing changes from LoadTimes/Bugfixes and more cleanup --- src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java') diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java index 1e12e9c14b..05a629d1a4 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java @@ -9,7 +9,6 @@ public class GT_Loader_OreProcessing GT_Log.out.println("GT_Mod: Register Ore processing."); new ProcessingAll(); new ProcessingArrows(); - new ProcessingBattery(); new ProcessingBeans(); new ProcessingBlock(); new ProcessingBolt(); -- cgit From 23546a5c2c2a6edc75eb32d8c179e63dc8df3930 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Fri, 16 Sep 2016 15:01:37 +0100 Subject: Stop disabled component recipe gen, more separation and fixes --- src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java') diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java index 05a629d1a4..0fbb10a541 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java @@ -13,6 +13,7 @@ public class GT_Loader_OreProcessing new ProcessingBlock(); new ProcessingBolt(); new ProcessingCell(); + new ProcessingCrate(); new ProcessingCircuit(); new ProcessingCompressed(); new ProcessingCrafting(); @@ -41,8 +42,10 @@ public class GT_Loader_OreProcessing new ProcessingPlate(); new ProcessingPure(); new ProcessingRecycling(); + new ProcessingRound(); new ProcessingSand(); new ProcessingSaplings(); + new ProcessingScrew(); new ProcessingSlab(); new ProcessingStick(); new ProcessingStickLong(); -- cgit From 291839871e1233ba0c72e48cf16847246a1ccc7c Mon Sep 17 00:00:00 2001 From: Muramasa Date: Fri, 23 Sep 2016 02:28:29 +0100 Subject: Reduce disabled component creation & GT_Proxy postInit -> Processors --- src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java') diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java index 0fbb10a541..fe9f8704fb 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java @@ -24,6 +24,7 @@ public class GT_Loader_OreProcessing new ProcessingDust(); new ProcessingDye(); new ProcessingFoil(); + new ProcessingFineWire(); new ProcessingFood(); new ProcessingLens(); new ProcessingShaping(); @@ -43,6 +44,7 @@ public class GT_Loader_OreProcessing new ProcessingPure(); new ProcessingRecycling(); new ProcessingRound(); + new ProcessingRotor(); new ProcessingSand(); new ProcessingSaplings(); new ProcessingScrew(); -- cgit