diff --git a/AntimatterAPI b/AntimatterAPI index a25462d8..f8c1c59e 160000 --- a/AntimatterAPI +++ b/AntimatterAPI @@ -1 +1 @@ -Subproject commit a25462d816cd429d78ea189df42c862886dc5473 +Subproject commit f8c1c59ecb0a2da57975258edb8bd4470ce9289c diff --git a/common/src/main/java/trinsdar/gt4r/data/Machines.java b/common/src/main/java/trinsdar/gt4r/data/Machines.java index 9f261bdf..acd7de2e 100644 --- a/common/src/main/java/trinsdar/gt4r/data/Machines.java +++ b/common/src/main/java/trinsdar/gt4r/data/Machines.java @@ -64,7 +64,7 @@ public class Machines { public static BasicMachine THERMAL_CENTRIFUGE = new UpgradeableMachine(GT4RRef.ID, "thermal_centrifuge").setTiers(MV).setMap(THERMAL_CENTRIFUGING).addFlags(GUI, ITEM, FLUID); public static BasicMachine FLUID_PRESS = new UpgradeableMachine(GT4RRef.ID, "fluid_press").setMap(RecipeMaps.FLUID_PRESS).setTiers(LV).addFlags(GUI, ITEM, FLUID); public static BasicMachine FLUID_SOLIDIFIER = new UpgradeableMachine(GT4RRef.ID, "fluid_solidifier").setMap(FLUID_SOLIDIFYING).setTiers(LV).addFlags(GUI, ITEM, FLUID); - public static BasicMachine PUMP = new BasicMachine(GT4RRef.ID, "pump").addFlags(GUI, ITEM, FLUID).setTiers(LV).setTile(BlockEntityPump::new); + public static BasicMachine PUMP = new BasicMachine(GT4RRef.ID, "pump").addFlags(GUI, ITEM, FLUID).setTiers(LV).setTile(BlockEntityPump::new).baseTexture(Textures.BASE_HANDLER); public static BasicMachine SIFTER = new UpgradeableMachine(GT4RRef.ID, "sifter").setMap(SIFTING).setTiers(LV).addFlags(GUI, ITEM); public static BasicMachine SMELTER = new UpgradeableMachine(GT4RRef.ID, "smelter").setTiers(MV).setMap(RecipeMaps.SMELTER).addFlags(GUI, ITEM, FLUID); public static BasicMachine BATH = new UpgradeableMachine(GT4RRef.ID, "bath").setMap(BATHING).setTiers(LV).addFlags(GUI, ITEM); @@ -176,7 +176,7 @@ public static void init() { SEMIFLUID_GENERATOR.setOutputCover(COVER_DYNAMO_OLD); WINDMILL.setOutputCover(COVER_DYNAMO_OLD); WATERMILL.setOutputCover(COVER_DYNAMO_OLD); - EU.remove(HEAT_EXCHANGER); - EU.remove(DUSTBIN); + HEAT_EXCHANGER.removeFlags(EU); + DUSTBIN.removeFlags(EU); } } diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/advanced_miner.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/advanced_miner.png index 340bfedd..fac15f09 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/advanced_miner.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/advanced_miner.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/bronze_blast_furnace.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/bronze_blast_furnace.png deleted file mode 100644 index 1b7f5cbc..00000000 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/bronze_blast_furnace.png and /dev/null differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/combustion_engine.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/combustion_engine.png deleted file mode 100644 index 493a1f8c..00000000 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/combustion_engine.png and /dev/null differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/distillation_tower.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/distillation_tower.png index e8852e03..fac15f09 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/distillation_tower.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/distillation_tower.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/ev.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/ev.png index 41ecb617..9987ac8d 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/ev.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/ev.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/hv.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/hv.png index d10884a1..2f9dc457 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/hv.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/hv.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/implosion_compressor.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/implosion_compressor.png index 340bfedd..fac15f09 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/implosion_compressor.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/implosion_compressor.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/industrial_blast_furnace.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/industrial_blast_furnace.png index 02709721..fac15f09 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/industrial_blast_furnace.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/industrial_blast_furnace.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/industrial_grinder.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/industrial_grinder.png index 58e1430c..fac15f09 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/industrial_grinder.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/industrial_grinder.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/industrial_sawmill.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/industrial_sawmill.png index 7efc53e9..fac15f09 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/industrial_sawmill.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/industrial_sawmill.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/iv.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/iv.png index e4cfc395..5690cc66 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/iv.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/iv.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/luv.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/luv.png deleted file mode 100644 index a02e3127..00000000 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/luv.png and /dev/null differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/lv.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/lv.png index 072812da..970407dc 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/lv.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/lv.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/machine_base.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/machine_base.png deleted file mode 100644 index aa049bb0..00000000 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/machine_base.png and /dev/null differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/multi_smelter.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/multi_smelter.png deleted file mode 100644 index a434bd02..00000000 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/multi_smelter.png and /dev/null differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/mv.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/mv.png index 716537e3..9d0f123e 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/mv.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/mv.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_cracking_unit.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_cracking_unit.png deleted file mode 100644 index 2f101863..00000000 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_cracking_unit.png and /dev/null differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_drilling_rig_ev.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_drilling_rig_ev.png deleted file mode 100644 index 340bfedd..00000000 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_drilling_rig_ev.png and /dev/null differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_drilling_rig_iv.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_drilling_rig_iv.png deleted file mode 100644 index 340bfedd..00000000 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_drilling_rig_iv.png and /dev/null differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_drilling_rig_luv.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_drilling_rig_luv.png deleted file mode 100644 index 340bfedd..00000000 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_drilling_rig_luv.png and /dev/null differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_drilling_rig_zpm.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_drilling_rig_zpm.png deleted file mode 100644 index 340bfedd..00000000 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/oil_drilling_rig_zpm.png and /dev/null differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/pyrolysis_oven.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/pyrolysis_oven.png index a933e389..fac15f09 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/pyrolysis_oven.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/pyrolysis_oven.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/ulv.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/ulv.png index 5dd51ab3..7b364883 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/ulv.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/ulv.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/uv.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/uv.png deleted file mode 100644 index e90f18b1..00000000 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/uv.png and /dev/null differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/vacuum_freezer.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/vacuum_freezer.png index a89a31a0..9d0f123e 100644 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/vacuum_freezer.png and b/common/src/main/resources/assets/gt4r/textures/block/machine/base/vacuum_freezer.png differ diff --git a/common/src/main/resources/assets/gt4r/textures/block/machine/base/zpm.png b/common/src/main/resources/assets/gt4r/textures/block/machine/base/zpm.png deleted file mode 100644 index e1a0f402..00000000 Binary files a/common/src/main/resources/assets/gt4r/textures/block/machine/base/zpm.png and /dev/null differ