diff --git a/dependencies.gradle b/dependencies.gradle index 4a2531d3f..c663ae367 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.58:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.61:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") diff --git a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java index dba68e872..38301440a 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java @@ -4,7 +4,6 @@ import static bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes; import static bartworks.API.recipe.BartWorksRecipeMaps.bioLabRecipes; import static bartworks.util.BWRecipes.computeSieverts; -import static com.dreammaster.gthandler.GT_CoreModSupport.*; import static gregtech.api.enums.Materials.*; import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.Genetics; diff --git a/src/main/java/com/dreammaster/gthandler/CoreMod_PCBFactory_MaterialLoader.java b/src/main/java/com/dreammaster/gthandler/CoreMod_PCBFactory_MaterialLoader.java deleted file mode 100644 index 1d3466423..000000000 --- a/src/main/java/com/dreammaster/gthandler/CoreMod_PCBFactory_MaterialLoader.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.dreammaster.gthandler; - -import gregtech.api.enums.Materials; -import gregtech.api.util.PCBFactoryManager; - -public class CoreMod_PCBFactory_MaterialLoader { - - public static void init() { - PCBFactoryManager.addPlasticTier(Materials.RadoxPolymer, 8); - } -} diff --git a/src/main/java/com/dreammaster/gthandler/CustomItemList.java b/src/main/java/com/dreammaster/gthandler/CustomItemList.java index 77c67a583..64956252c 100644 --- a/src/main/java/com/dreammaster/gthandler/CustomItemList.java +++ b/src/main/java/com/dreammaster/gthandler/CustomItemList.java @@ -13,10 +13,6 @@ public enum CustomItemList implements IItemContainer { - Machine_Multi_AirFilterT1, - Machine_Multi_AirFilterT2, - Machine_Multi_AirFilterT3, - // CoreModItems EtchedLowVoltageWiring, EtchedInsaneVoltageWiring, @@ -310,7 +306,6 @@ public enum CustomItemList implements IItemContainer { MedalWarp, MaceratedPlantmass, EngineCore, - nameRemover, TwilightCrystal, UnfiredClayBrick, UnfiredSearedBrick, diff --git a/src/main/java/com/dreammaster/gthandler/GT_CoreModSupport.java b/src/main/java/com/dreammaster/gthandler/GT_CoreModSupport.java deleted file mode 100644 index 9f9af44ad..000000000 --- a/src/main/java/com/dreammaster/gthandler/GT_CoreModSupport.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.dreammaster.gthandler; - -import gregtech.api.enums.Materials; -import gregtech.api.interfaces.IMaterialHandler; - -public class GT_CoreModSupport implements IMaterialHandler { - - public GT_CoreModSupport() { - Materials.add(this); - } - - @Override - public void onMaterialsInit() { - /** This is just left here as an example of how to add new materials. **/ - /* - * int i = 0; for (int j = GregTechAPI.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16); i - * < j; i++) { String aID = (i < 10 ? "0" : "") + i; new Materials(-1, TextureSet.SET_METALLIC, 1.0F, 0, 0, 0, - * 255, 255, 255, 0, "CustomMat" + aID, "CustomMat" + aID, 0, 0, 0, 0, false, false, 1, 1, 1, Dyes._NULL, - * "custom", true, aID); } - */ - } -} diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index 773ea0e06..4da9e593b 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -611,7 +611,7 @@ public void run() { OrePrefixes.stickLong.get(Materials.Steel), 'R', OrePrefixes.rotor.get(Materials.Steel), 'M', ItemList.Electric_Motor_LV, 'R', OrePrefixes.screw.get(Materials.Steel) }); GTModHandler.addCraftingRecipe( - CustomItemList.Machine_Multi_AirFilterT1.get(1L), + ItemList.Machine_Multi_AirFilterT1.get(1L), bits, new Object[] { "RPR", "MBM", "CGC", 'B', ItemList.Hull_LV, 'R', OrePrefixes.rotor.get(Materials.Steel), 'P', ItemList.Electric_Pump_LV, 'M', ItemList.Electric_Motor_LV, 'C', @@ -628,7 +628,7 @@ public void run() { OrePrefixes.stickLong.get(Materials.Titanium), 'R', OrePrefixes.rotor.get(Materials.Titanium), 'M', ItemList.Electric_Motor_HV, 'R', OrePrefixes.screw.get(Materials.Titanium) }); GTModHandler.addCraftingRecipe( - CustomItemList.Machine_Multi_AirFilterT2.get(1L), + ItemList.Machine_Multi_AirFilterT2.get(1L), bits, new Object[] { "RPR", "MBM", "CGC", 'B', ItemList.Hull_HV, 'R', OrePrefixes.rotor.get(Materials.Titanium), 'P', ItemList.Electric_Pump_HV, 'M', @@ -647,7 +647,7 @@ public void run() { OrePrefixes.rotor.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'R', OrePrefixes.screw.get(Materials.TungstenSteel) }); GTModHandler.addCraftingRecipe( - CustomItemList.Machine_Multi_AirFilterT3.get(1L), + ItemList.Machine_Multi_AirFilterT3.get(1L), bits, new Object[] { "RPR", "MBM", "CGC", 'B', ItemList.Hull_IV, 'R', OrePrefixes.rotor.get(Materials.TungstenSteel), 'P', ItemList.Electric_Pump_IV, 'M', diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java index b49b16bd2..74e3c27f2 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java @@ -1,6 +1,5 @@ package com.dreammaster.gthandler; -import static com.dreammaster.gthandler.enums.MetaTileEntityIDs.*; import static gregtech.api.enums.GTValues.VP; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.slicerRecipes; @@ -10,10 +9,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import com.dreammaster.gthandler.multiAirFilter.GT_MetaTileEntity_AirFilterT1; -import com.dreammaster.gthandler.multiAirFilter.GT_MetaTileEntity_AirFilterT2; -import com.dreammaster.gthandler.multiAirFilter.GT_MetaTileEntity_AirFilterT3; -import com.dreammaster.gthandler.nameRemover.NameRemover; import com.dreammaster.item.food.QuantumBread; import gregtech.api.enums.GTValues; @@ -70,8 +65,6 @@ public void run() { registerPlasmaArcFurnace(); registerCanningMachine(); registerChemicalBath(); - registerAirFilter(); - registerNameRemover(); registerCircuitAssembler(); registerMachines2(); recipes(); @@ -939,7 +932,7 @@ public void recipes() { OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.UMV) }); GTModHandler.addCraftingRecipe( - CustomItemList.nameRemover.get(1L), + ItemList.NameRemover.get(1L), bitsd, new Object[] { "SsS", "VMV", "SXS", 'M', ItemList.Hull_ULV, 'V', OrePrefixes.gearGtSmall.get(Materials.AnyBronze), 'S', OrePrefixes.screw.get(Materials.AnyIron), @@ -3318,29 +3311,6 @@ private void registerChemicalBath() { 12); } - private void registerAirFilter() { - CustomItemList.Machine_Multi_AirFilterT1.set( - new GT_MetaTileEntity_AirFilterT1( - AIR_FILTER_CONTROLLER_T1.ID, - "multimachine.airfilter.01", - "Electric Air Filter T1").getStackForm(1L)); - CustomItemList.Machine_Multi_AirFilterT2.set( - new GT_MetaTileEntity_AirFilterT2( - AIR_FILTER_CONTROLLER_T2.ID, - "multimachine.airfilter.02", - "Electric Air Filter T2").getStackForm(1L)); - CustomItemList.Machine_Multi_AirFilterT3.set( - new GT_MetaTileEntity_AirFilterT3( - AIR_FILTER_CONTROLLER_T3.ID, - "multimachine.airfilter.03", - "Electric Air Filter T3").getStackForm(1L)); - } - - private void registerNameRemover() { - CustomItemList.nameRemover - .set(new NameRemover(NAME_REMOVER.ID, "fix.name.remover", "Name Remover", 0).getStackForm(1L)); - } - private void registerCircuitAssembler() { GTModHandler.addCraftingRecipe( ItemList.CircuitAssemblerUHV.get(1L), diff --git a/src/main/java/com/dreammaster/gthandler/enums/MetaTileEntityIDs.java b/src/main/java/com/dreammaster/gthandler/enums/MetaTileEntityIDs.java deleted file mode 100644 index 6e127e703..000000000 --- a/src/main/java/com/dreammaster/gthandler/enums/MetaTileEntityIDs.java +++ /dev/null @@ -1,410 +0,0 @@ -package com.dreammaster.gthandler.enums; - -// todo: unify it with GT's one -public enum MetaTileEntityIDs { - - HULL_UEV(11230), - HULL_UIV(11231), - HULL_UMV(11232), - HULL_UXV(11233), - HULL_MAX(11234), - PLASMA_GENERATOR_ZPM(10752), - PLASMA_GENERATOR_UV(10753), - ALLOY_SMELTER_LuV(10760), - ALLOY_SMELTER_ZPM(10761), - ALLOY_SMELTER_UV(10762), - ALLOY_SMELTER_UHV(10763), - ALLOY_SMELTER_UEV(10764), - ALLOY_SMELTER_UIV(10765), - ALLOY_SMELTER_UMV(10766), - - MATTER_AMPLIFIER_LuV(10770), - MATTER_AMPLIFIER_ZPM(10771), - MATTER_AMPLIFIER_UV(10772), - MATTER_AMPLIFIER_UHV(10773), - MATTER_AMPLIFIER_UEV(10774), - MATTER_AMPLIFIER_UIV(10775), - MATTER_AMPLIFIER_UMV(10776), - ASSEMBLING_MACHINE_LuV(10780), - ASSEMBLING_MACHINE_ZPM(10781), - ASSEMBLING_MACHINE_UV(10782), - ASSEMBLING_MACHINE_UHV(10783), - ASSEMBLING_MACHINE_UEV(10784), - ASSEMBLING_MACHINE_UIV(10785), - ASSEMBLING_MACHINE_UMV(10786), - AUTOCLAVE_LuV(10790), - AUTOCLAVE_ZPM(10791), - AUTOCLAVE_UV(10792), - AUTOCLAVE_UHV(10793), - AUTOCLAVE_UEV(10794), - AUTOCLAVE_UIV(10795), - AUTOCLAVE_UMV(10796), - BENDING_MACHINE_LuV(10800), - BENDING_MACHINE_ZPM(10801), - BENDING_MACHINE_UV(10802), - BENDING_MACHINE_UHV(10803), - BENDING_MACHINE_UEV(10804), - BENDING_MACHINE_UIV(10805), - BENDING_MACHINE_UMV(10806), - COMPRESSOR_LuV(10810), - COMPRESSOR_ZPM(10811), - COMPRESSOR_UV(10812), - COMPRESSOR_UHV(10813), - COMPRESSOR_UEV(10814), - COMPRESSOR_UIV(10815), - COMPRESSOR_UMV(10816), - CUTTING_MACHINE_LuV(10820), - CUTTING_MACHINE_ZPM(10821), - CUTTING_MACHINE_UV(10822), - CUTTING_MACHINE_UHV(10823), - CUTTING_MACHINE_UEV(10824), - CUTTING_MACHINE_UIV(10825), - CUTTING_MACHINE_UMV(10826), - DISTILLERY_LuV(10830), - DISTILLERY_ZPM(10831), - DISTILLERY_UV(10832), - DISTILLERY_UHV(10833), - DISTILLERY_UEV(10834), - DISTILLERY_UIV(10835), - DISTILLERY_UMV(10836), - ELECTRIC_FURNACE_LuV(10840), - ELECTRIC_FURNACE_ZPM(10841), - ELECTRIC_FURNACE_UV(10842), - ELECTRIC_FURNACE_UHV(10843), - ELECTRIC_FURNACE_UEV(10844), - ELECTRIC_FURNACE_UIV(10845), - ELECTRIC_FURNACE_UMV(10846), - ELECTROLYZER_LuV(10850), - ELECTROLYZER_ZPM(10851), - ELECTROLYZER_UV(10852), - ELECTROLYZER_UHV(10853), - ELECTROLYZER_UEV(10854), - ELECTROLYZER_UIV(10855), - ELECTROLYZER_UMV(10856), - ELECTROMAGNETIC_SEPARATOR_LuV(10860), - ELECTROMAGNETIC_SEPARATOR_ZPM(10861), - ELECTROMAGNETIC_SEPARATOR_UV(10862), - ELECTROMAGNETIC_SEPARATOR_UHV(10863), - ELECTROMAGNETIC_SEPARATOR_UEV(10864), - ELECTROMAGNETIC_SEPARATOR_UIV(10865), - ELECTROMAGNETIC_SEPARATOR_UMV(10866), - EXTRACTOR_LuV(10870), - EXTRACTOR_ZPM(10871), - EXTRACTOR_UV(10872), - EXTRACTOR_UHV(10873), - EXTRACTOR_UEV(10874), - EXTRACTOR_UIV(10875), - EXTRACTOR_UMV(10876), - EXTRUDER_LuV(10880), - EXTRUDER_ZPM(10881), - EXTRUDER_UV(10882), - EXTRUDER_UHV(10883), - EXTRUDER_UEV(10884), - EXTRUDER_UIV(10885), - EXTRUDER_UMV(10886), - FLUID_SOLIDIFIER_LuV(10890), - FLUID_SOLIDIFIER_ZPM(10891), - FLUID_SOLIDIFIER_UV(10892), - FLUID_SOLIDIFIER_UHV(10893), - FLUID_SOLIDIFIER_UEV(10894), - FLUID_SOLIDIFIER_UIV(10895), - FLUID_SOLIDIFIER_UMV(10896), - FORMING_PRESS_LuV(10900), - FORMING_PRESS_ZPM(10901), - FORMING_PRESS_UV(10902), - FORMING_PRESS_UHV(10903), - FORMING_PRESS_UEV(10904), - FORMING_PRESS_UIV(10905), - FORMING_PRESS_UMV(10906), - FORGE_HAMMER_LuV(10910), - FORGE_HAMMER_ZPM(10911), - FORGE_HAMMER_UV(10912), - FORGE_HAMMER_UHV(10913), - FORGE_HAMMER_UEV(10914), - FORGE_HAMMER_UIV(10915), - FORGE_HAMMER_UMV(10916), - LATHE_LuV(10920), - LATHE_ZPM(10921), - LATHE_UV(10922), - LATHE_UHV(10923), - LATHE_UEV(10924), - LATHE_UIV(10925), - LATHE_UMV(10926), - PRECISION_LASER_ENGRAVER_LuV(10930), - PRECISION_LASER_ENGRAVER_ZPM(10931), - PRECISION_LASER_ENGRAVER_UV(10932), - PRECISION_LASER_ENGRAVER_UHV(10933), - PRECISION_LASER_ENGRAVER_UEV(10934), - PRECISION_LASER_ENGRAVER_UIV(10935), - PRECISION_LASER_ENGRAVER_UMV(10936), - MACERATOR_LuV(10940), - MACERATOR_ZPM(10941), - MACERATOR_UV(10942), - MACERATOR_UHV(10943), - MACERATOR_UEV(10944), - MACERATOR_UIV(10945), - MACERATOR_UMV(10946), - MATTER_FABRICATOR_LuV(10950), - MATTER_FABRICATOR_ZPM(10951), - MATTER_FABRICATOR_UV(10952), - MATTER_FABRICATOR_UHV(10953), - MATTER_FABRICATOR_UEV(10954), - MATTER_FABRICATOR_UIV(10955), - MATTER_FABRICATOR_UMV(10956), - MICROWAVE_LuV(10960), - MICROWAVE_ZPM(10961), - MICROWAVE_UV(10962), - MICROWAVE_UHV(10963), - MICROWAVE_UEV(10964), - MICROWAVE_UIV(10965), - MICROWAVE_UMV(10966), - ORE_WASHING_PLANT_LuV(10970), - ORE_WASHING_PLANT_ZPM(10971), - ORE_WASHING_PLANT_UV(10972), - ORE_WASHING_PLANT_UHV(10973), - ORE_WASHING_PLANT_UEV(10974), - ORE_WASHING_PLANT_UIV(10975), - ORE_WASHING_PLANT_UMV(10976), - POLARIZER_LuV(10980), - POLARIZER_ZPM(10981), - POLARIZER_UV(10982), - POLARIZER_UHV(10983), - POLARIZER_UEV(10984), - POLARIZER_UIV(10985), - POLARIZER_UMV(10986), - RECYCLER_LuV(10990), - RECYCLER_ZPM(10991), - RECYCLER_UV(10992), - RECYCLER_UHV(10993), - RECYCLER_UEV(10994), - RECYCLER_UIV(10995), - RECYCLER_UMV(10996), - MATTER_REPLICATOR_LuV(11000), - MATTER_REPLICATOR_ZPM(11001), - MATTER_REPLICATOR_UV(11002), - MATTER_REPLICATOR_UHV(11003), - MATTER_REPLICATOR_UEV(11004), - MATTER_REPLICATOR_UIV(11005), - MATTER_REPLICATOR_UMV(11006), - SCANNER_LuV(11010), - SCANNER_ZPM(11011), - SCANNER_UV(11012), - SCANNER_UHV(11013), - SCANNER_UEV(11014), - SCANNER_UIV(11015), - SCANNER_UMV(11016), - SIFTING_MACHINE_LuV(11020), - SIFTING_MACHINE_ZPM(11021), - SIFTING_MACHINE_UV(11022), - SIFTING_MACHINE_UHV(11023), - SIFTING_MACHINE_UEV(11024), - SIFTING_MACHINE_UIV(11025), - SIFTING_MACHINE_UMV(11026), - SLICING_MACHINE_LuV(11028), - SLICING_MACHINE_ZPM(11029), - SLICING_MACHINE_UV(11030), - SLICING_MACHINE_UHV(11033), - SLICING_MACHINE_UEV(11034), - SLICING_MACHINE_UIV(11035), - SLICING_MACHINE_UMV(11036), - THERMAL_CENTRIFUGE_LuV(11040), - THERMAL_CENTRIFUGE_ZPM(11041), - THERMAL_CENTRIFUGE_UV(11042), - THERMAL_CENTRIFUGE_UHV(11043), - THERMAL_CENTRIFUGE_UEV(11044), - THERMAL_CENTRIFUGE_UIV(11045), - THERMAL_CENTRIFUGE_UMV(11046), - WIREMILL_LuV(11050), - WIREMILL_ZPM(11051), - WIREMILL_UV(11052), - WIREMILL_UHV(11053), - WIREMILL_UEV(11054), - WIREMILL_UIV(11055), - WIREMILL_UMV(11056), - ARC_FURNACE_LuV(11070), - ARC_FURNACE_ZPM(11071), - ARC_FURNACE_UV(11072), - ARC_FURNACE_UHV(11073), - ARC_FURNACE_UEV(11074), - ARC_FURNACE_UIV(11075), - ARC_FURNACE_UMV(11076), - CENTRIFUGE_LuV(11080), - CENTRIFUGE_ZPM(11081), - CENTRIFUGE_UV(11082), - CENTRIFUGE_UHV(11083), - CENTRIFUGE_UEV(11084), - CENTRIFUGE_UIV(11085), - CENTRIFUGE_UMV(11086), - PLASMA_ARC_FURNACE_LuV(11090), - PLASMA_ARC_FURNACE_ZPM(11091), - PLASMA_ARC_FURNACE_UV(11092), - PLASMA_ARC_FURNACE_UHV(11093), - PLASMA_ARC_FURNACE_UEV(11094), - PLASMA_ARC_FURNACE_UIV(11095), - PLASMA_ARC_FURNACE_UMV(11096), - BREWERY_LuV(11120), - BREWERY_ZPM(11121), - BREWERY_UV(11122), - BREWERY_UHV(11123), - BREWERY_UEV(11124), - BREWERY_UIV(11125), - BREWERY_UMV(11126), - CANNING_MACHINE_LuV(11130), - CANNING_MACHINE_ZPM(11131), - CANNING_MACHINE_UV(11132), - CANNING_MACHINE_UHV(11133), - CANNING_MACHINE_UEV(11134), - CANNING_MACHINE_UIV(11135), - CANNING_MACHINE_UMV(11136), - CHEMICAL_BATH_LuV(11140), - CHEMICAL_BATH_ZPM(11141), - CHEMICAL_BATH_UV(11142), - CHEMICAL_BATH_UHV(11143), - CHEMICAL_BATH_UEV(11144), - CHEMICAL_BATH_UIV(11145), - CHEMICAL_BATH_UMV(11146), - CHEMICAL_REACTOR_LuV(11150), - CHEMICAL_REACTOR_ZPM(11151), - CHEMICAL_REACTOR_UV(11152), - CHEMICAL_REACTOR_UHV(11153), - CHEMICAL_REACTOR_UEV(11154), - CHEMICAL_REACTOR_UIV(11155), - CHEMICAL_REACTOR_UMV(11156), - FERMENTER_LuV(11170), - FERMENTER_ZPM(11171), - FERMENTER_UV(11172), - FERMENTER_UHV(11173), - FERMENTER_UEV(11174), - FERMENTER_UIV(11175), - FERMENTER_UMV(11176), - FLUID_CANNER_LuV(11180), - FLUID_CANNER_ZPM(11181), - FLUID_CANNER_UV(11182), - FLUID_CANNER_UHV(11183), - FLUID_CANNER_UEV(11184), - FLUID_CANNER_UIV(11185), - FLUID_CANNER_UMV(11186), - FLUID_EXTRACTOR_LuV(11190), - FLUID_EXTRACTOR_ZPM(11191), - FLUID_EXTRACTOR_UV(11192), - FLUID_EXTRACTOR_UHV(11193), - FLUID_EXTRACTOR_UEV(11194), - FLUID_EXTRACTOR_UIV(11195), - FLUID_EXTRACTOR_UMV(11196), - FLUID_HEATER_LuV(11200), - FLUID_HEATER_ZPM(11201), - FLUID_HEATER_UV(11202), - FLUID_HEATER_UHV(11203), - FLUID_HEATER_UEV(11204), - FLUID_HEATER_UIV(11205), - FLUID_HEATER_UMV(11206), - MIXER_LuV(11210), - MIXER_ZPM(11211), - MIXER_UV(11212), - MIXER_UHV(11213), - MIXER_UEV(11214), - MIXER_UIV(11215), - MIXER_UMV(11216), - TRANSFORMER_UEV_UHV(11220), - TRANSFORMER_UIV_UEV(11221), - TRANSFORMER_UMV_UIV(11222), - TRANSFORMER_UXV_UMV(11223), - TRANSFORMER_MAX_UXV(11224), - BATTERY_BUFFER_4_BY_4_UEV(11240), - BATTERY_BUFFER_4_BY_4_UIV(11241), - BATTERY_BUFFER_4_BY_4_UMV(11242), - BATTERY_BUFFER_4_BY_4_UXV(11243), - BATTERY_BUFFER_4_BY_4_MAX(11245), - BATTERY_BUFFER_3_BY_3_UEV(11250), - BATTERY_BUFFER_3_BY_3_UIV(11251), - BATTERY_BUFFER_3_BY_3_UMV(11252), - BATTERY_BUFFER_3_BY_3_UXV(11253), - BATTERY_BUFFER_3_BY_3_MAX(11255), - BATTERY_BUFFER_2_BY_2_UEV(11260), - BATTERY_BUFFER_2_BY_2_UIV(11261), - BATTERY_BUFFER_2_BY_2_UMV(11262), - BATTERY_BUFFER_2_BY_2_UXV(11263), - BATTERY_BUFFER_2_BY_2_MAX(11265), - BATTERY_BUFFER_1_BY_1_UEV(11270), - BATTERY_BUFFER_1_BY_1_UIV(11271), - BATTERY_BUFFER_1_BY_1_UMV(11272), - BATTERY_BUFFER_1_BY_1_UXV(11273), - BATTERY_BUFFER_1_BY_1_MAX(11275), - BATTERY_CHARGER_4_4_UEV(11280), - BATTERY_CHARGER_4_4_UIV(11281), - BATTERY_CHARGER_4_4_UMV(11282), - BATTERY_CHARGER_4_4_UXV(11283), - DYNAMO_HATCH_UEV(11290), - DYNAMO_HATCH_UIV(11291), - DYNAMO_HATCH_UMV(11292), - DYNAMO_HATCH_UXV(11293), - ENERGY_HATCH_UEV(11300), - ENERGY_HATCH_UIV(11301), - ENERGY_HATCH_UMV(11302), - ENERGY_HATCH_UXV(11303), - WET_TRANSFORMER_LV_ULV(12000), - WET_TRANSFORMER_MV_LV(12001), - WET_TRANSFORMER_HV_MV(12002), - WET_TRANSFORMER_EV_HV(12003), - WET_TRANSFORMER_IV_EV(12004), - WET_TRANSFORMER_LuV_IV(12005), - WET_TRANSFORMER_ZPM_LuV(12006), - WET_TRANSFORMER_UV_ZPM(12007), - WET_TRANSFORMER_UHV_UV(12008), - WET_TRANSFORMER_UEV_UHV(12009), - WET_TRANSFORMER_UIV_UEV(12010), - WET_TRANSFORMER_UMV_UIV(12011), - WET_TRANSFORMER_UXV_UMV(12012), - WET_TRANSFORMER_MAX_UXV(12013), - HIGH_AMP_TRANSFORMER_UEV_UHV(11989), - HIGH_AMP_TRANSFORMER_UIV_UEV(11910), - HIGH_AMP_TRANSFORMER_UMV_UIV(11911), - HIGH_AMP_TRANSFORMER_UXV_UMV(11912), - HIGH_AMP_TRANSFORMER_MAX_UXV(11913), - AIR_FILTER_CONTROLLER_T1(12020), - AIR_FILTER_CONTROLLER_T2(12021), - AIR_FILTER_CONTROLLER_T3(12022), - TURBO_CHARGER_ULV(12040), - TURBO_CHARGER_LV(12041), - TURBO_CHARGER_MV(12042), - TURBO_CHARGER_HV(12043), - TURBO_CHARGER_EV(12044), - TURBO_CHARGER_IV(12045), - TURBO_CHARGER_LuV(12046), - TURBO_CHARGER_ZPM(12047), - TURBO_CHARGER_UV(12048), - TURBO_CHARGER_UHV(12049), - CHEST_BUFFER_UEV(12060), - CHEST_BUFFER_UIV(12061), - CHEST_BUFFER_UMV(12062), - NAME_REMOVER(12070), - ROCK_BREAKER_LuV(12080), - ROCK_BREAKER_ZPM(12081), - ROCK_BREAKER_UV(12082), - ROCK_BREAKER_UHV(12083), - ROCK_BREAKER_UEV(12084), - ROCK_BREAKER_UIV(12085), - ROCK_BREAKER_UMV(12086), - CIRCUIT_ASSEMBLER_UHV(12090), - CIRCUIT_ASSEMBLER_UEV(12091), - CIRCUIT_ASSEMBLER_UIV(12092), - CIRCUIT_ASSEMBLER_UMV(12093), - CIRCUIT_ASSEMBLER_UXV(12094), - CIRCUIT_ASSEMBLER_MAX(12096), - INPUT_HATCH_UEV(12097), - INPUT_HATCH_UIV(12098), - INPUT_HATCH_UMV(12099), - INPUT_HATCH_UXV(12100), - INPUT_HATCH_MAX(12102), - OUTPUT_HATCH_UEV(12103), - OUTPUT_HATCH_UIV(12104), - OUTPUT_HATCH_UMV(12105), - OUTPUT_HATCH_UXV(12106), - OUTPUT_HATCH_MAX(12108),; - - public final int ID; - - private MetaTileEntityIDs(int ID) { - this.ID = ID; - } -} diff --git a/src/main/java/com/dreammaster/gthandler/gui/CoreMod_UITextures.java b/src/main/java/com/dreammaster/gthandler/gui/CoreMod_UITextures.java deleted file mode 100644 index d19abc520..000000000 --- a/src/main/java/com/dreammaster/gthandler/gui/CoreMod_UITextures.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.dreammaster.gthandler.gui; - -import com.dreammaster.lib.Refstrings; -import com.gtnewhorizons.modularui.api.drawable.UITexture; - -public class CoreMod_UITextures { - - public static final UITexture PROGRESSBAR_NAME_REMOVER = UITexture - .fullImage(Refstrings.MODID, "gui/progressbar/name_remover"); -} diff --git a/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterBase.java b/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterBase.java deleted file mode 100644 index 574119e4b..000000000 --- a/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterBase.java +++ /dev/null @@ -1,593 +0,0 @@ -package com.dreammaster.gthandler.multiAirFilter; - -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GTValues.VN; -import static gregtech.api.enums.Textures.BlockIcons.TURBINE_NEW; -import static gregtech.api.enums.Textures.BlockIcons.TURBINE_NEW_ACTIVE; -import static gregtech.api.util.GTStructureUtility.ofHatchAdder; -import static gregtech.api.util.GTStructureUtility.ofHatchAdderOptional; -import static gregtech.api.util.GTUtility.filterValidMTEs; -import static java.lang.Math.max; -import static java.lang.Math.min; - -import java.util.ArrayList; -import java.util.Arrays; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import org.jetbrains.annotations.NotNull; - -import com.dreammaster.gthandler.CustomItemList; -import com.dreammaster.item.ItemList; -import com.dreammaster.main.MainRegistry; -import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits; -import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing; -import com.gtnewhorizon.structurelib.structure.IStructureDefinition; -import com.gtnewhorizon.structurelib.structure.StructureDefinition; - -import eu.usrv.yamcore.auxiliary.PlayerChatHelper; -import gregtech.api.GregTechAPI; -import gregtech.api.enums.Materials; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.IToolStats; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.MetaGeneratedTool; -import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase; -import gregtech.api.metatileentity.implementations.MTEHatchMuffler; -import gregtech.api.recipe.check.CheckRecipeResult; -import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.render.TextureFactory; -import gregtech.api.util.GTRecipe; -import gregtech.api.util.GTUtility; -import gregtech.api.util.GTUtilityClient; -import gregtech.api.util.MultiblockTooltipBuilder; -import gregtech.common.items.MetaGeneratedTool01; -import gregtech.common.pollution.Pollution; - -// TODO move this multi to GT5u -public abstract class GT_MetaTileEntity_AirFilterBase - extends MTEEnhancedMultiBlockBase { - - protected int baseEff = 0; - protected int multiTier = 0; - protected int chunkIndex = 0; - protected boolean hasPollution = false; - protected int mode = 0; // 0 for processing chunks in order, 1 for processing chunks randomly - protected int size; // current working size of the multi, max is 2*multiTier + 1 - protected boolean isFilterLoaded = false; - protected int filterUsageRemaining = 0; - protected int tickCounter = 0; // because we can't trust the world tick, it may be in a dim with eternal day, etc - private boolean mFormed; - protected static final String STRUCTURE_PIECE_MAIN = "main"; - protected static final ClassValue> STRUCTURE_DEFINITION = new ClassValue>() { - - @Override - protected IStructureDefinition computeValue(Class type) { - return StructureDefinition.builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { "xxx", "xxx", "xxx" }, { "vmv", "m-m", "vmv" }, - { "vmv", "m-m", "vmv" }, { "c~c", "ccc", "ccc" }, })) - .addElement( - 'c', - lazy( - x -> ofChain( - ofBlock(GregTechAPI.sBlockCasingsNH, x.getCasingMeta()), - ofHatchAdder( - GT_MetaTileEntity_AirFilterBase::addMaintenanceToMachineList, - x.getCasingIndex(), - 1), - ofHatchAdder( - GT_MetaTileEntity_AirFilterBase::addInputToMachineList, - x.getCasingIndex(), - 1), - ofHatchAdder( - GT_MetaTileEntity_AirFilterBase::addOutputToMachineList, - x.getCasingIndex(), - 1), - ofHatchAdder( - GT_MetaTileEntity_AirFilterBase::addEnergyInputToMachineList, - x.getCasingIndex(), - 1)))) - .addElement('x', lazy(x -> ofBlock(GregTechAPI.sBlockCasingsNH, x.getCasingMeta()))) - .addElement('v', lazy(x -> ofBlock(GregTechAPI.sBlockCasingsNH, x.getPipeMeta()))) - .addElement( - 'm', - lazy( - x -> ofHatchAdderOptional( - GT_MetaTileEntity_AirFilterBase::addMufflerToMachineList, - x.getCasingIndex(), - 2, - GregTechAPI.sBlockCasingsNH, - x.getCasingMeta()))) - .build(); - } - }; - - @Override - public final IStructureDefinition getStructureDefinition() { - return STRUCTURE_DEFINITION.get(getClass()); - } - - @Override - public void construct(ItemStack stackSize, boolean hintsOnly) { - buildPiece(STRUCTURE_PIECE_MAIN, stackSize, hintsOnly, 1, 3, 0); - } - - @Override - public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { - return checkPiece(STRUCTURE_PIECE_MAIN, 1, 3, 0) && !mMufflerHatches.isEmpty() - && mMaintenanceHatches.size() == 1; - } - - static final GTRecipe tRecipeT1 = new GTRecipe( - new ItemStack[] { CustomItemList.AdsorptionFilter.get(1L, new Object()) }, - new ItemStack[] { CustomItemList.AdsorptionFilterDirty.get(1L, new Object()) }, - null, - null, - null, - null, - 200, - 30, - 0); - static final GTRecipe tRecipeT2 = new GTRecipe( - new ItemStack[] { CustomItemList.AdsorptionFilter.get(1L, new Object()) }, - new ItemStack[] { CustomItemList.AdsorptionFilterDirty.get(1L, new Object()) }, - null, - null, - null, - null, - 200, - 480, - 0); - static final GTRecipe tRecipeT3 = new GTRecipe( - new ItemStack[] { CustomItemList.AdsorptionFilter.get(1L, new Object()) }, - new ItemStack[] { CustomItemList.AdsorptionFilterDirty.get(1L, new Object()) }, - null, - null, - null, - null, - 200, - 7680, - 0); - - public GT_MetaTileEntity_AirFilterBase(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - } - - public GT_MetaTileEntity_AirFilterBase(String aName) { - super(aName); - } - - public abstract GTRecipe getRecipe(); - - public String getCasingString() { - return switch (getCasingMeta()) { - case 0 -> "Air Filter Turbine Casing"; - case 3 -> "Advanced Air Filter Turbine Casing"; - case 5 -> "Super Air Filter Turbine Casing"; - default -> "fill a ticket on github if you read this"; - }; - } - - public String getPipeString() { - return switch (getPipeMeta()) { - case 1 -> "Air Filter Vent Casing"; - case 4 -> "Advanced Air Filter Vent Casing"; - case 6 -> "Super Air Filter Vent Casing"; - default -> "fill a ticket on github if you read this"; - }; - } - - @Override - protected MultiblockTooltipBuilder createTooltip() { - final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); - tt.addMachineType("Air Filter").addInfo("Needs a Turbine in the controller") - .addInfo("Can process " + (2 * multiTier + 1) + "x" + (2 * multiTier + 1) + " chunks") - .addInfo("Each muffler hatch reduces pollution in one chunk of the working area by:") - .addInfo( - " " + EnumChatFormatting.WHITE - + MainRegistry.CoreConfig.globalMultiplicator - + " * multiTierBonus * turbineEff * FLOOR(" - + MainRegistry.CoreConfig.scalingFactor - + "^mufflerTier)") - .addInfo("every second").addInfo("- multiTierBonus for this controller is " + getBonusByTier()) - .addInfo("- turbineEff is the efficiency of the Turbine in controller slot") - .addInfo("- Effective muffler tier is limited by energy input tier") - .addInfo("- Uses " + this.getRecipe().mEUt + " EU/t while working").addSeparator() - .addInfo("Insert " + ItemList.AdsorptionFilter.getIS().getDisplayName() + " in an input bus") - .addInfo(" to double pollution cleaning amount (30 uses per item)") - .addInfo("Each maintenance issue reduces cleaning amount by 10%").beginStructureBlock(3, 4, 3, true) - .addController("Front bottom").addOtherStructurePart(getCasingString(), "Top and bottom layers") - .addOtherStructurePart(getPipeString(), "Corners of the middle two layers") - .addOtherStructurePart("Muffler Hatch", "Sides of the middle two layers") - .addEnergyHatch("Any bottom layer casing", 1).addMaintenanceHatch("Any bottom layer casing", 1) - .addInputBus("Any bottom layer casing", 1).addOutputBus("Any bottom layer casing", 1).toolTipFinisher(); - return tt; - } - - @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int colorIndex, boolean aActive, boolean aRedstone) { - ITexture casingTexture = Textures.BlockIcons.getCasingTextureForId(getCasingIndex()); - if (side == facing) { - if (aActive) { - return new ITexture[] { casingTexture, - TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE_GLOW) - .glow().build() }; - } - return new ITexture[] { casingTexture, TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_DIESEL_ENGINE), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_DIESEL_ENGINE_GLOW).glow() - .build() }; - } - return new ITexture[] { casingTexture }; - } - - public abstract float getBonusByTier(); - - public abstract int getCasingIndex(); - - @Override - public boolean isCorrectMachinePart(ItemStack aStack) { - if (aStack == null) return false; - if (!(aStack.getItem() instanceof MetaGeneratedTool01 tool)) return false; - if (aStack.getItemDamage() < 170 || aStack.getItemDamage() > 179) return false; - - IToolStats stats = tool.getToolStats(aStack); - if (stats == null || stats.getSpeedMultiplier() <= 0) return false; - - Materials material = MetaGeneratedTool.getPrimaryMaterial(aStack); - return material != null && material.mToolSpeed > 0; - } - - private float getTurbineDamage(ItemStack aStack) { - if (aStack == null || !(aStack.getItem() instanceof MetaGeneratedTool tool)) { - return -1; - } - return tool.getToolCombatDamage(aStack); - } - - @Override - protected IAlignmentLimits getInitialAlignmentLimits() { - // don't rotate it, it's cursed. - return (d, r, f) -> d.offsetY == 0 && r.isNotRotated() && !f.isVerticallyFliped(); - } - - public int getPollutionCleaningRatePerTick(float turbineEff, float multiEff, boolean isRateBoosted) { - return getPollutionCleaningRatePerSecond(turbineEff, multiEff, isRateBoosted) / 20; - } - - public int getPollutionCleaningRatePerSecond(float turbineEff, float multiEff, boolean isRateBoosted) { - long tVoltage = getMaxInputVoltage(); - byte tTier = (byte) max(1, GTUtility.getTier(tVoltage)); - int pollutionPerSecond = 0; - for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) { - // applying scaling factor - pollutionPerSecond += (int) Math.pow(MainRegistry.CoreConfig.scalingFactor, min(tTier, tHatch.mTier)); - } - // apply the boost - if (isRateBoosted) { - pollutionPerSecond = (int) (pollutionPerSecond * MainRegistry.CoreConfig.boostPerAbsorptionFilter); - } - // apply the rest of the coefs - pollutionPerSecond = (int) (pollutionPerSecond * turbineEff - * multiEff - * getBonusByTier() - * MainRegistry.CoreConfig.globalMultiplicator); - return pollutionPerSecond; - } - - @NotNull - @Override - public CheckRecipeResult checkProcessing() { - mEfficiencyIncrease = 10000; - mEfficiency = 10000 - (getIdealStatus() - getRepairStatus()) * 1000; - // check pollution for next cycle: - hasPollution = getTotalPollution() >= MainRegistry.CoreConfig.pollutionThresholdAirFilter; - mMaxProgresstime = getRecipe().mDuration; - mEUt = -getRecipe().mEUt; - if (!hasPollution) { - return CheckRecipeResultRegistry.SUCCESSFUL; - } - - ItemStack aStack = getControllerSlot(); - if (!isCorrectMachinePart(aStack)) { - return CheckRecipeResultRegistry.NO_TURBINE_FOUND; - } - - float damage = getTurbineDamage(aStack); - if (damage == -1) { - return CheckRecipeResultRegistry.NO_TURBINE_FOUND; - } - baseEff = GTUtility.safeInt((long) ((50.0F + 10.0F * damage) * 100)); - tickCounter = 0; // resetting the counter in case of a power failure, etc - - // scan the inventory to search for filter if none has been loaded previously - if (!isFilterLoaded) { - ArrayList tInputList = getStoredInputs(); - int tInputList_sS = tInputList.size(); - for (int i = 0; i < tInputList_sS - 1; i++) { - for (int j = i + 1; j < tInputList_sS; j++) { - if (GTUtility.areStacksEqual(tInputList.get(i), tInputList.get(j))) { - if (tInputList.get(i).stackSize >= tInputList.get(j).stackSize) { - tInputList.remove(j--); - tInputList_sS = tInputList.size(); - } else { - tInputList.remove(i--); - tInputList_sS = tInputList.size(); - break; - } - } - } - } - - ItemStack[] tInputs = Arrays.copyOfRange(tInputList.toArray(new ItemStack[0]), 0, 2); - if (!tInputList.isEmpty()) { - if (getRecipe().isRecipeInputEqual(true, null, tInputs)) { - updateSlots(); - filterUsageRemaining = MainRegistry.CoreConfig.usagesPerAbsorptionFilter; - isFilterLoaded = true; - } - } - } - - // if a filter is loaded in - if (isFilterLoaded) { - - // consume one use of the filter - filterUsageRemaining -= 1; - - // when the filter finished its last usage, we give it back in dirty form. - if (filterUsageRemaining == 0) { - mOutputItems = new ItemStack[] { getRecipe().getOutput(0) }; - isFilterLoaded = false; - } else { - mOutputItems = null; // no return until the filter has been totally consumed - } - } - - return CheckRecipeResultRegistry.SUCCESSFUL; - } - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - super.saveNBTData(aNBT); - aNBT.setInteger("mode", mode); // running mode - aNBT.setInteger("chunkIndex", chunkIndex); // chunk index when running in normal mode - aNBT.setInteger("size", size); // working area - aNBT.setBoolean("isFilterLoaded", isFilterLoaded); - aNBT.setInteger("filterUsageRemaining", filterUsageRemaining); - } - - @Override - public void loadNBTData(NBTTagCompound aNBT) { - super.loadNBTData(aNBT); - mode = aNBT.getInteger("mode"); - chunkIndex = aNBT.getInteger("chunkIndex"); - size = aNBT.getInteger("size"); - isFilterLoaded = aNBT.getBoolean("isFilterLoaded"); - filterUsageRemaining = aNBT.getInteger("filterUsageRemaining"); - } - - public void cleanPollution() { - int cleaningRate = getPollutionCleaningRatePerSecond(baseEff / 10000f, mEfficiency / 10000f, isFilterLoaded); - if (cleaningRate > 0) { - World world = this.getBaseMetaTileEntity().getWorld(); - if (mode == 0) { // processing chunk normally - removePollutionFromChunk(cleaningRate, world, chunkIndex); - chunkIndex += 1; - if (chunkIndex >= size * size) { - chunkIndex = 0; - } - } else { // process chunks randomly - // list all the polluted chunks - ArrayList pollutedChunks = new ArrayList<>(); - for (int index = 0; index < size * size; index++) { - if (getPollutionInChunk(world, index) > 0) { - pollutedChunks.add(index); - } - } - // pick the chunk randomly - if (!pollutedChunks.isEmpty()) { - int index = pollutedChunks.get(MainRegistry.Rnd.nextInt(pollutedChunks.size())); - removePollutionFromChunk(cleaningRate, world, index); - } - } - } - } - - protected final int getPollutionInChunk(World world, int chunkIndexIn) { - final int xCoordMulti = this.getBaseMetaTileEntity().getXCoord(); - final int zCoordMulti = this.getBaseMetaTileEntity().getZCoord(); - final int chunkX = xCoordMulti - 16 * (size / 2 - chunkIndexIn % size) >> 4; - final int chunkZ = zCoordMulti + 16 * (size / 2 - chunkIndexIn / size) >> 4; - return Pollution.getPollution(world, chunkX, chunkZ); - } - - protected final void removePollutionFromChunk(int amount, World world, int chunkIndexIn) { - final int xCoordMulti = this.getBaseMetaTileEntity().getXCoord(); - final int zCoordMulti = this.getBaseMetaTileEntity().getZCoord(); - final int chunkX = xCoordMulti - 16 * (size / 2 - chunkIndexIn % size) >> 4; - final int chunkZ = zCoordMulti + 16 * (size / 2 - chunkIndexIn / size) >> 4; - Pollution.addPollution(world, chunkX, chunkZ, -amount); - } - - public abstract int getPipeMeta(); - - public abstract int getCasingMeta(); - - @Override - public int getMaxEfficiency(ItemStack aStack) { - return 10000; - } - - @Override - public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if (size == 0) { // here in case it's not set by NBT loading - size = 2 * multiTier + 1; - } - super.onPreTick(aBaseMetaTileEntity, aTick); - } - - public int getTotalPollution() { - int pollutionAmount = 0; - World world = this.getBaseMetaTileEntity().getWorld(); - for (int i = 0; i < size * size; i++) { - pollutionAmount += getPollutionInChunk(world, i); - - } - return pollutionAmount; - } - - @Override - public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if (aTick % 200L == 0L) { - // refresh casing on state change - int Xpos = aBaseMetaTileEntity.getXCoord() + aBaseMetaTileEntity.getBackFacing().offsetX; - int Ypos = aBaseMetaTileEntity.getYCoord() + 3; - int Zpos = aBaseMetaTileEntity.getZCoord() + aBaseMetaTileEntity.getBackFacing().offsetZ; - try { - aBaseMetaTileEntity.getWorld() - .markBlockRangeForRenderUpdate(Xpos - 1, Ypos, Zpos - 1, Xpos + 1, Ypos, Zpos + 1); - } catch (Exception ignored) {} - } - super.onPostTick(aBaseMetaTileEntity, aTick); - } - - @Override - public void onValueUpdate(byte aValue) { - mFormed = aValue == 1; - } - - @Override - public byte getUpdateData() { - return (byte) (mMachine ? 1 : 0); - } - - @Override - public boolean renderInWorld(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, RenderBlocks aRenderer) { - if (!mFormed) return false; - int[] xyz = new int[3]; - ExtendedFacing ext = getExtendedFacing(); - ext.getWorldOffset(new int[] { 0, -3, 1 }, xyz); - IIconContainer[] tTextures = getBaseMetaTileEntity().isActive() ? TURBINE_NEW_ACTIVE : TURBINE_NEW; - // we know this multi can only ever face upwards, so just use +y directly - ExtendedFacing direction = ExtendedFacing.of(ForgeDirection.UP); - GTUtilityClient.renderTurbineOverlay( - aWorld, - xyz[0] + aX, - xyz[1] + aY, - xyz[2] + aZ, - aRenderer, - direction, - GregTechAPI.sBlockCasingsNH, - tTextures); - return false; - } - - @Override - public boolean onRunningTick(ItemStack aStack) { - if (tickCounter == 19 && hasPollution) { - cleanPollution(); - tickCounter = 0; - } else { - tickCounter += 1; - } - return super.onRunningTick(aStack); - } - - @Override - public int getDamageToComponent(ItemStack aStack) { - try { - if (isCorrectMachinePart(aStack) && hasPollution) { // no pollution no damage - return getBaseMetaTileEntity().getRandomNumber(2); // expected to be 0.5 damage in long term - } - } catch (Exception e) { - /**/ - } - return 0; - } - - @Override - public boolean explodesOnComponentBreak(ItemStack aStack) { - return false; - } - - @Override - public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (!aPlayer.isSneaking()) { // change mode - mode = mode == 1 ? 0 : 1; - if (mode == 0) { - chunkIndex = 0; - PlayerChatHelper.SendInfo(aPlayer, "Electric air filter now running in normal mode"); - } else { - PlayerChatHelper.SendInfo(aPlayer, "Electric air filter now running in random mode"); - } - } else { // change radius on sneak - if (size == 1) { - size = 2 * multiTier + 1; - } else { - size -= 2; // always get odd number - } - chunkIndex = 0; - PlayerChatHelper - .SendInfo(aPlayer, "Electric air filter is now working in a " + size + "x" + size + " area"); - } - } - - @Override - public String[] getInfoData() { - return new String[] { "Progress:", - EnumChatFormatting.GREEN + Integer.toString(mProgresstime / 20) - + EnumChatFormatting.RESET - + " s / " - + EnumChatFormatting.YELLOW - + mMaxProgresstime / 20 - + EnumChatFormatting.RESET - + " s", - "Stored Energy:", - EnumChatFormatting.GREEN + Long.toString(getBaseMetaTileEntity().getStoredEU()) - + EnumChatFormatting.RESET - + " EU / " - + EnumChatFormatting.YELLOW - + getBaseMetaTileEntity().getEUCapacity() - + EnumChatFormatting.RESET - + " EU", - "Probably uses: " + - // negative EU triggers special EU consumption behavior. however it does not produce power. - EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t", - "Max Energy Income: " + EnumChatFormatting.YELLOW - + getMaxInputVoltage() - + EnumChatFormatting.RESET - + " EU/t(*2A) Tier: " - + EnumChatFormatting.YELLOW - + VN[GTUtility.getTier(getMaxInputVoltage())] - + EnumChatFormatting.RESET, - "Problems: " + EnumChatFormatting.RED - + (getIdealStatus() - getRepairStatus()) - + EnumChatFormatting.RESET - + " Efficiency: " - + EnumChatFormatting.YELLOW - + mEfficiency / 100.0F - + EnumChatFormatting.RESET - + " %", - "Pollution reduction: " + EnumChatFormatting.GREEN - + getPollutionCleaningRatePerTick(baseEff / 10000f, mEfficiency / 10000f, isFilterLoaded) - + EnumChatFormatting.RESET - + " gibbl/t", - "Has a filter in it: " + isFilterLoaded, - "remaining cycles for the filter (if present): " + filterUsageRemaining }; - } -} diff --git a/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterT1.java b/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterT1.java deleted file mode 100644 index dfdf42910..000000000 --- a/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterT1.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.dreammaster.gthandler.multiAirFilter; - -import com.dreammaster.main.MainRegistry; - -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.GTRecipe; - -public class GT_MetaTileEntity_AirFilterT1 extends GT_MetaTileEntity_AirFilterBase { - - public GT_MetaTileEntity_AirFilterT1(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - multiTier = 1; - } - - public GT_MetaTileEntity_AirFilterT1(String aName) { - super(aName); - multiTier = 1; - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_AirFilterT1(mName); - } - - @Override - public GTRecipe getRecipe() { - return tRecipeT1; - } - - @Override - public float getBonusByTier() { - return MainRegistry.CoreConfig.bonusByTierT1; - } - - @Override - public int getCasingIndex() { - return 57; - } - - @Override - public int getPipeMeta() { - return 1; - } - - @Override - public int getCasingMeta() { - return 0; - } -} diff --git a/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterT2.java b/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterT2.java deleted file mode 100644 index 531a04af2..000000000 --- a/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterT2.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.dreammaster.gthandler.multiAirFilter; - -import com.dreammaster.main.MainRegistry; - -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.GTRecipe; - -public class GT_MetaTileEntity_AirFilterT2 extends GT_MetaTileEntity_AirFilterBase { - - public GT_MetaTileEntity_AirFilterT2(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - multiTier = 2; - } - - public GT_MetaTileEntity_AirFilterT2(String aName) { - super(aName); - multiTier = 2; - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_AirFilterT2(mName); - } - - @Override - public GTRecipe getRecipe() { - return tRecipeT2; - } - - @Override - public float getBonusByTier() { - return MainRegistry.CoreConfig.bonusByTierT2; - } - - @Override - public int getCasingIndex() { - return 59; - } - - @Override - public int getPipeMeta() { - return 4; - } - - @Override - public int getCasingMeta() { - return 3; - } -} diff --git a/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterT3.java b/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterT3.java deleted file mode 100644 index d98c5000c..000000000 --- a/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterT3.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.dreammaster.gthandler.multiAirFilter; - -import com.dreammaster.main.MainRegistry; - -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.GTRecipe; - -public class GT_MetaTileEntity_AirFilterT3 extends GT_MetaTileEntity_AirFilterBase { - - public GT_MetaTileEntity_AirFilterT3(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - multiTier = 3; - } - - public GT_MetaTileEntity_AirFilterT3(String aName) { - super(aName); - multiTier = 3; - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_AirFilterT3(mName); - } - - @Override - public GTRecipe getRecipe() { - return tRecipeT3; - } - - @Override - public float getBonusByTier() { - return MainRegistry.CoreConfig.bonusByTierT3; - } - - @Override - public int getCasingIndex() { - return 60; - } - - @Override - public int getPipeMeta() { - return 6; - } - - @Override - public int getCasingMeta() { - return 5; - } -} diff --git a/src/main/java/com/dreammaster/gthandler/nameRemover/NameRemover.java b/src/main/java/com/dreammaster/gthandler/nameRemover/NameRemover.java deleted file mode 100644 index 303c2690c..000000000 --- a/src/main/java/com/dreammaster/gthandler/nameRemover/NameRemover.java +++ /dev/null @@ -1,242 +0,0 @@ -package com.dreammaster.gthandler.nameRemover; - -import static net.minecraft.util.EnumChatFormatting.*; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import com.dreammaster.gthandler.gui.CoreMod_UITextures; -import com.gtnewhorizons.modularui.api.drawable.FallbackableUITexture; - -import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GTUITextures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.CoverableTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.MTEBasicMachine; -import gregtech.api.recipe.BasicUIProperties; -import gregtech.api.render.TextureFactory; -import gregtech.common.items.ItemIntegratedCircuit; - -/** - * Created by Tec on 28.03.2017. - */ -public class NameRemover extends MTEBasicMachine { - - public NameRemover(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - 1, - "Can fix GT items with broken NBT data, will erase everything!", - 2, - 1, - TextureFactory.of( - TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER_ACTIVE), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER_ACTIVE_GLOW) - .glow().build()), - TextureFactory.of( - TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER_GLOW).glow() - .build()), - TextureFactory.of( - TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE_GLOW) - .glow().build()), - TextureFactory.of( - TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_GLOW).glow() - .build()), - TextureFactory.of( - TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER_ACTIVE), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER_ACTIVE_GLOW) - .glow().build()), - TextureFactory.of( - TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER_GLOW).glow() - .build()), - TextureFactory.of( - TextureFactory.of(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE_GLOW) - .glow().build()), - TextureFactory.of( - TextureFactory.of(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER_GLOW).glow() - .build())); - } - - public NameRemover(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { - super(aName, aTier, 1, aDescription, aTextures, 2, 1); - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new NameRemover(mName, mTier, mDescriptionArray, mTextures); - } - - @Override - public int checkRecipe() { - if (getInputAt(0) == null) return 0; - ItemStack output = getInputAt(0).copy(); - NBTTagCompound nbt = output.getTagCompound(); - if (nbt != null) { - int circuitSetting = 0; - ItemStack circuit = getInputAt(1); - if (circuit != null && circuit.getItem() instanceof ItemIntegratedCircuit) { - circuitSetting = circuit.getItemDamage(); - } - boolean removeName = false; - boolean removeDisassembly = false; - boolean removeColor = false; - boolean removeRepair = false; - boolean removeDye = false; - boolean removeSpray = false; - boolean removeCovers = false; - switch (circuitSetting) { - case 1: - removeName = true; - break; - case 2: - removeDisassembly = true; - break; - case 3: - removeColor = true; - break; - case 4: - removeRepair = true; - break; - case 5: - removeDye = true; - break; - case 6: - removeSpray = true; - break; - case 24: - removeCovers = true; - default: - removeName = true; - removeDisassembly = true; - removeColor = true; - removeRepair = true; - removeDye = true; - removeSpray = true; - } - if (removeName && nbt.hasKey("display")) { - nbt.getCompoundTag("display").removeTag("Name"); - if (nbt.getCompoundTag("display").hasNoTags()) { - nbt.removeTag("display"); - } - } - if (removeDisassembly) removeTag(nbt, "GT.CraftingComponents"); - if (removeColor) removeTag(nbt, "color"); - if (removeRepair) removeTag(nbt, "RepairCost"); - if (removeDye && nbt.hasKey("display")) { - nbt.getCompoundTag("display").removeTag("color"); - if (nbt.getCompoundTag("display").hasNoTags()) { - nbt.removeTag("display"); - } - } - if (removeSpray) removeTag(nbt, "mColor"); - removeTag(nbt, "mTargetStackSize"); // MTEBuffer - removeTag(nbt, "mOutputFluid"); // MTEDigitalTankBase - removeTag(nbt, "mVoidOverflow"); // MTEDigitalTankBase & MTEQuantumChest - removeTag(nbt, "mVoidFluidFull"); // MTEDigitalTankBase - removeTag(nbt, "mLockFluid"); // MTEDigitalTankBase - removeTag(nbt, "lockedFluidName"); // MTEDigitalTankBase - removeTag(nbt, "mAllowInputFromOutputSide"); // MTEDigitalTankBase - removeTag(nbt, "mItemsPerSide"); // MTEItemDistributor - removeTag(nbt, "radiusConfig"); // MTEMiner & MTEPump - removeTag(nbt, "mDisallowRetract"); // MTEPump - removeTag(nbt, "mStrongRedstone"); // BaseMetaTileEntity - if (removeCovers) { // BaseMetaTileEntity - removeTag(nbt, "mMuffler"); - removeTag(nbt, "mLockUpgrade"); - removeTag(nbt, "mCoverSides"); - removeTag(nbt, "gt.covers"); - for (String key : CoverableTileEntity.COVER_DATA_NBT_KEYS) { - removeTag(nbt, key); - } - } - if (nbt.hasNoTags()) { - output.setTagCompound(null); - } - } - if (canOutput(output)) { - getInputAt(0).stackSize = 0; - mEUt = 0; - mMaxProgresstime = 20; - mOutputItems[0] = output; - return 2; - } - return 0; - } - - private static void removeTag(NBTTagCompound nbt, String key) { - if (nbt.hasKey(key)) { - nbt.removeTag(key); - } - } - - @Override - public String[] getDescription() { - List description = new ArrayList<>(); - description.add("Removes various NBT tags as well as covers."); - description.add(" "); - description.add(UNDERLINE + "First Slot" + RESET); - description.add("The item you want to strip of NBT"); - description.add(" "); - description.add(UNDERLINE + "Second Slot" + RESET); - description.add("One of the following circuits:"); - description.add(BOLD + "Circuit 1:" + RESET + " Attempt to fix broken ores by removing the Display Name tag"); - description.add(BOLD + "Circuit 3:" + RESET + " Remove Railcraft stacking tag"); - description.add(BOLD + "Circuit 4:" + RESET + " Remove Anvil repair tag"); - description.add(BOLD + "Circuit 5:" + RESET + " Remove Dye from Leather armor"); - description.add(BOLD + "Circuit 6:" + RESET + " Remove Spray color from GT items"); - description.add( - BOLD + "Circuit 24:" - + RESET - + " Remove everything including covers. Be careful you won't recover the covers!"); - description.add(" "); - description.add(BOLD + "No Circuit:" + RESET + " Remove everything except covers"); - return description.toArray(new String[0]); - } - - @Override - public boolean isElectric() { - return false; - } - - @Override - public long maxEUStore() { - return 0; - } - - @Override - public long getMinimumStoredEU() { - return 0; - } - - @Override - public long maxAmperesIn() { - return 0; - } - - @Override - public long maxAmperesOut() { - return 0; - } - - private static final FallbackableUITexture progressBarTexture = GTUITextures - .fallbackableProgressbar("name_remover", CoreMod_UITextures.PROGRESSBAR_NAME_REMOVER); - - @Override - protected BasicUIProperties getUIProperties() { - return super.getUIProperties().toBuilder().progressBarTexture(progressBarTexture).build(); - } -} diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 390e4e5d4..81527c0b9 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -4036,7 +4036,7 @@ private void makeAirFilterRecipes() { ItemList.Electric_Pump_LV.get(1L), GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 1L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Machine_Multi_AirFilterT1.get(1L)) + .itemOutputs(ItemList.Machine_Multi_AirFilterT1.get(1L)) .fluidInputs(Materials.SolderingAlloy.getMolten(144)).duration(10 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); @@ -4049,7 +4049,7 @@ private void makeAirFilterRecipes() { ItemList.Electric_Pump_LV.get(1L), GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 1L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Machine_Multi_AirFilterT1.get(1L)).fluidInputs(Materials.Tin.getMolten(288)) + .itemOutputs(ItemList.Machine_Multi_AirFilterT1.get(1L)).fluidInputs(Materials.Tin.getMolten(288)) .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() @@ -4061,9 +4061,8 @@ private void makeAirFilterRecipes() { ItemList.Electric_Pump_LV.get(1L), GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 1L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Machine_Multi_AirFilterT1.get(1L)) - .fluidInputs(Materials.Lead.getMolten(576)).duration(10 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); + .itemOutputs(ItemList.Machine_Multi_AirFilterT1.get(1L)).fluidInputs(Materials.Lead.getMolten(576)) + .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -4127,7 +4126,7 @@ private void makeAirFilterRecipes() { ItemList.Electric_Pump_HV.get(1L), GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Machine_Multi_AirFilterT2.get(1L)) + .itemOutputs(ItemList.Machine_Multi_AirFilterT2.get(1L)) .fluidInputs(Materials.SolderingAlloy.getMolten(144)).duration(10 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); @@ -4140,7 +4139,7 @@ private void makeAirFilterRecipes() { ItemList.Electric_Pump_HV.get(1L), GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Machine_Multi_AirFilterT2.get(1L)).fluidInputs(Materials.Tin.getMolten(288)) + .itemOutputs(ItemList.Machine_Multi_AirFilterT2.get(1L)).fluidInputs(Materials.Tin.getMolten(288)) .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() @@ -4152,9 +4151,8 @@ private void makeAirFilterRecipes() { ItemList.Electric_Pump_HV.get(1L), GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Machine_Multi_AirFilterT2.get(1L)) - .fluidInputs(Materials.Lead.getMolten(576)).duration(10 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); + .itemOutputs(ItemList.Machine_Multi_AirFilterT2.get(1L)).fluidInputs(Materials.Lead.getMolten(576)) + .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -4218,7 +4216,7 @@ private void makeAirFilterRecipes() { ItemList.Electric_Pump_IV.get(1L), GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 1L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Machine_Multi_AirFilterT3.get(1L)) + .itemOutputs(ItemList.Machine_Multi_AirFilterT3.get(1L)) .fluidInputs(Materials.SolderingAlloy.getMolten(144)).duration(10 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); @@ -4231,7 +4229,7 @@ private void makeAirFilterRecipes() { ItemList.Electric_Pump_IV.get(1L), GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 1L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Machine_Multi_AirFilterT3.get(1L)).fluidInputs(Materials.Tin.getMolten(288)) + .itemOutputs(ItemList.Machine_Multi_AirFilterT3.get(1L)).fluidInputs(Materials.Tin.getMolten(288)) .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() @@ -4243,9 +4241,8 @@ private void makeAirFilterRecipes() { ItemList.Electric_Pump_IV.get(1L), GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 1L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(CustomItemList.Machine_Multi_AirFilterT3.get(1L)) - .fluidInputs(Materials.Lead.getMolten(576)).duration(10 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); + .itemOutputs(ItemList.Machine_Multi_AirFilterT3.get(1L)).fluidInputs(Materials.Lead.getMolten(576)) + .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/CrackingRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/CrackingRecipes.java index a5b41494d..5ced57858 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/CrackingRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/CrackingRecipes.java @@ -1,6 +1,5 @@ package com.dreammaster.gthandler.recipes; -import static com.dreammaster.gthandler.GT_CoreModSupport.*; import static gregtech.api.enums.Materials.*; import static gregtech.api.recipe.RecipeMaps.crackingRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; diff --git a/src/main/java/com/dreammaster/main/MainRegistry.java b/src/main/java/com/dreammaster/main/MainRegistry.java index eba40f921..ae418bd35 100644 --- a/src/main/java/com/dreammaster/main/MainRegistry.java +++ b/src/main/java/com/dreammaster/main/MainRegistry.java @@ -47,8 +47,6 @@ import com.dreammaster.creativetab.ModTabList; import com.dreammaster.detrav.ScannerTools; import com.dreammaster.fluids.FluidList; -import com.dreammaster.gthandler.CoreMod_PCBFactory_MaterialLoader; -import com.dreammaster.gthandler.GT_CoreModSupport; import com.dreammaster.gthandler.GT_CustomLoader; import com.dreammaster.gthandler.GT_Loader_ItemPipes; import com.dreammaster.gthandler.recipes.DTPFRecipes; @@ -102,7 +100,6 @@ import eu.usrv.yamcore.creativetabs.CreativeTabsManager; import eu.usrv.yamcore.fluids.ModFluidManager; import eu.usrv.yamcore.items.ModItemManager; -import gregtech.GTMod; import gregtech.api.GregTechAPI; import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; @@ -217,11 +214,6 @@ public void PreLoad(FMLPreInitializationEvent PreEvent) { ModTabList.InitModTabs(TabManager, ItemManager); // ------------------------------------------------------------ - // Materials init - if (!GTMod.gregtechproxy.mEnableAllMaterials) { - new GT_CoreModSupport(); - } - // ------------------------------------------------------------ Logger.debug("PRELOAD Create Items"); if (!ItemList.AddToItemManager(ItemManager) @@ -367,8 +359,6 @@ public void load(FMLInitializationEvent event) { TF_Loot_Chests.init(); } - CoreMod_PCBFactory_MaterialLoader.init(); - BWGlassAdder.registerGlasses(); if (CoreConfig.gtnhPauseMenuButtons && event.getSide().isClient()) { diff --git a/src/main/resources/assets/dreamcraft/textures/gui/progressbar/name_remover.png b/src/main/resources/assets/dreamcraft/textures/gui/progressbar/name_remover.png deleted file mode 100644 index b902ddf02..000000000 Binary files a/src/main/resources/assets/dreamcraft/textures/gui/progressbar/name_remover.png and /dev/null differ