diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
| -rw-r--r-- | src/main/java/gregtech/loaders/load/MTERecipeLoader.java | 12 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java | 17 |
2 files changed, 2 insertions, 27 deletions
diff --git a/src/main/java/gregtech/loaders/load/MTERecipeLoader.java b/src/main/java/gregtech/loaders/load/MTERecipeLoader.java index 3e638e7e60..365ac2520d 100644 --- a/src/main/java/gregtech/loaders/load/MTERecipeLoader.java +++ b/src/main/java/gregtech/loaders/load/MTERecipeLoader.java @@ -3524,18 +3524,6 @@ public class MTERecipeLoader implements Runnable { new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_HV, 'B', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.HV), 'P', ItemList.Electric_Pump_HV }); - GTModHandler.addCraftingRecipe( - ItemList.Pump_EV.get(1L), - bitsd, - new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_EV, 'B', - OrePrefixes.pipeLarge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.EV), 'P', - ItemList.Electric_Pump_EV }); - GTModHandler.addCraftingRecipe( - ItemList.Pump_IV.get(1L), - bitsd, - new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_IV, 'B', - OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.IV), 'P', - ItemList.Electric_Pump_IV }); GTModHandler.addCraftingRecipe( ItemList.MobRep_LV.get(1L), diff --git a/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java b/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java index 121cca445d..e1a86405bd 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java @@ -644,13 +644,9 @@ import static gregtech.api.enums.MetaTileEntityIDs.PRECISION_LASER_ENGRAVER_UMV; import static gregtech.api.enums.MetaTileEntityIDs.PRECISION_LASER_ENGRAVER_UV; import static gregtech.api.enums.MetaTileEntityIDs.PRECISION_LASER_ENGRAVER_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.PROCESSING_ARRAY_CONTROLLER; -import static gregtech.api.enums.MetaTileEntityIDs.PUMP_EV; import static gregtech.api.enums.MetaTileEntityIDs.PUMP_HV; -import static gregtech.api.enums.MetaTileEntityIDs.PUMP_IV; import static gregtech.api.enums.MetaTileEntityIDs.PUMP_LV; -import static gregtech.api.enums.MetaTileEntityIDs.PUMP_LuV; import static gregtech.api.enums.MetaTileEntityIDs.PUMP_MV; -import static gregtech.api.enums.MetaTileEntityIDs.PUMP_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.PURIFICATION_PLANT_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.PURIFICATION_UNIT_CLARIFIER; import static gregtech.api.enums.MetaTileEntityIDs.PURIFICATION_UNIT_DEGASIFIER; @@ -2656,17 +2652,8 @@ public class LoaderMetaTileEntities implements Runnable { // TODO CHECK CIRCUIT private static void registerPump() { ItemList.Pump_LV.set(new MTEPump(PUMP_LV.ID, "basicmachine.pump.tier.01", "Basic Pump", 1).getStackForm(1L)); - ItemList.Pump_MV.set(new MTEPump(PUMP_MV.ID, "basicmachine.pump.tier.02", "Advanced Pump", 2).getStackForm(1L)); - ItemList.Pump_HV - .set(new MTEPump(PUMP_HV.ID, "basicmachine.pump.tier.03", "Advanced Pump II", 3).getStackForm(1L)); - ItemList.Pump_EV - .set(new MTEPump(PUMP_EV.ID, "basicmachine.pump.tier.04", "Advanced Pump III", 4).getStackForm(1L)); - ItemList.Pump_IV - .set(new MTEPump(PUMP_IV.ID, "basicmachine.pump.tier.05", "Advanced Pump IV", 5).getStackForm(1L)); - ItemList.PumpLuV - .set(new MTEPump(PUMP_LuV.ID, "basicmachine.pump.tier.06", "Lake Dislocator", 6).getStackForm(1L)); - ItemList.PumpZPM - .set(new MTEPump(PUMP_ZPM.ID, "basicmachine.pump.tier.07", "Ocean Transposer", 7).getStackForm(1L)); + ItemList.Pump_MV.set(new MTEPump(PUMP_MV.ID, "basicmachine.pump.tier.02", "Good Pump", 2).getStackForm(1L)); + ItemList.Pump_HV.set(new MTEPump(PUMP_HV.ID, "basicmachine.pump.tier.03", "Advanced Pump", 3).getStackForm(1L)); } private static void registerTeleporter() { |