Merge branch '1.20.1' into fix-jei-drag

GregTechCEu · Sep 19, 2024 · f5fe9e4 · f5fe9e4
2 parents 48bb7e5 + 569eb61
commit f5fe9e4
Show file tree

Hide file tree

Showing 111 changed files with 70 additions and 221 deletions.
diff --git a/src/generated/resources/assets/gtceu/models/block/empty_tier_i_battery.json b/src/generated/resources/assets/gtceu/models/block/empty_tier_i_battery.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/empty_tier_i/top",
-    "side": "gtceu:block/casings/battery/empty_tier_i/top",
-    "top": "gtceu:block/casings/battery/empty_tier_i/side"
+    "side": "gtceu:block/casings/battery/empty_tier_i/side",
+    "top": "gtceu:block/casings/battery/empty_tier_i/top"
   }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/empty_tier_ii_battery.json b/src/generated/resources/assets/gtceu/models/block/empty_tier_ii_battery.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/empty_tier_ii/top",
-    "side": "gtceu:block/casings/battery/empty_tier_ii/top",
-    "top": "gtceu:block/casings/battery/empty_tier_ii/side"
+    "side": "gtceu:block/casings/battery/empty_tier_ii/side",
+    "top": "gtceu:block/casings/battery/empty_tier_ii/top"
   }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/empty_tier_iii_battery.json b/src/generated/resources/assets/gtceu/models/block/empty_tier_iii_battery.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/empty_tier_iii/top",
-    "side": "gtceu:block/casings/battery/empty_tier_iii/top",
-    "top": "gtceu:block/casings/battery/empty_tier_iii/side"
+    "side": "gtceu:block/casings/battery/empty_tier_iii/side",
+    "top": "gtceu:block/casings/battery/empty_tier_iii/top"
   }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/ev_lapotronic_battery.json b/src/generated/resources/assets/gtceu/models/block/ev_lapotronic_battery.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/ev_lapotronic/top",
-    "side": "gtceu:block/casings/battery/ev_lapotronic/top",
-    "top": "gtceu:block/casings/battery/ev_lapotronic/side"
+    "side": "gtceu:block/casings/battery/ev_lapotronic/side",
+    "top": "gtceu:block/casings/battery/ev_lapotronic/top"
   }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/industrial_tnt.json b/src/generated/resources/assets/gtceu/models/block/industrial_tnt.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "minecraft:block/tnt_bottom",
-    "side": "gtceu:block/industrial_tnt_side",
+    "side": "gtceu:block/misc/industrial_tnt_side",
     "top": "minecraft:block/tnt_top"
   }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/iv_lapotronic_battery.json b/src/generated/resources/assets/gtceu/models/block/iv_lapotronic_battery.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/iv_lapotronic/top",
-    "side": "gtceu:block/casings/battery/iv_lapotronic/top",
-    "top": "gtceu:block/casings/battery/iv_lapotronic/side"
+    "side": "gtceu:block/casings/battery/iv_lapotronic/side",
+    "top": "gtceu:block/casings/battery/iv_lapotronic/top"
   }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/luv_lapotronic_battery.json b/src/generated/resources/assets/gtceu/models/block/luv_lapotronic_battery.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/luv_lapotronic/top",
-    "side": "gtceu:block/casings/battery/luv_lapotronic/top",
-    "top": "gtceu:block/casings/battery/luv_lapotronic/side"
+    "side": "gtceu:block/casings/battery/luv_lapotronic/side",
+    "top": "gtceu:block/casings/battery/luv_lapotronic/top"
   }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/uhv_ultimate_battery.json b/src/generated/resources/assets/gtceu/models/block/uhv_ultimate_battery.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/uhv_ultimate/top",
-    "side": "gtceu:block/casings/battery/uhv_ultimate/top",
-    "top": "gtceu:block/casings/battery/uhv_ultimate/side"
+    "side": "gtceu:block/casings/battery/uhv_ultimate/side",
+    "top": "gtceu:block/casings/battery/uhv_ultimate/top"
   }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/uv_lapotronic_battery.json b/src/generated/resources/assets/gtceu/models/block/uv_lapotronic_battery.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/uv_lapotronic/top",
-    "side": "gtceu:block/casings/battery/uv_lapotronic/top",
-    "top": "gtceu:block/casings/battery/uv_lapotronic/side"
+    "side": "gtceu:block/casings/battery/uv_lapotronic/side",
+    "top": "gtceu:block/casings/battery/uv_lapotronic/top"
   }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/zpm_lapotronic_battery.json b/src/generated/resources/assets/gtceu/models/block/zpm_lapotronic_battery.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "bottom": "gtceu:block/casings/battery/zpm_lapotronic/top",
-    "side": "gtceu:block/casings/battery/zpm_lapotronic/top",
-    "top": "gtceu:block/casings/battery/zpm_lapotronic/side"
+    "side": "gtceu:block/casings/battery/zpm_lapotronic/side",
+    "top": "gtceu:block/casings/battery/zpm_lapotronic/top"
   }
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/GuiTextures.java b/src/main/java/com/gregtechceu/gtceu/api/gui/GuiTextures.java
@@ -49,11 +49,11 @@ public class GuiTextures {
     public static final ResourceTexture TOOL_DISABLE_AUTO_OUTPUT = new ResourceTexture(
             "gtceu:textures/gui/overlay/tool_disable_auto_output.png");
     public static final ResourceTexture TOOL_SWITCH_CONVERTER_NATIVE = new ResourceTexture(
-            "gtceu:textures/gui/overlay/tool_wire_block.png"); // switch to tool_switch_converter_native once that gets
-                                                               // made
+            "gtceu:textures/gui/overlay/tool_wire_block.png"); // todo switch to tool_switch_converter_native once that
+                                                               // gets made
     public static final ResourceTexture TOOL_SWITCH_CONVERTER_EU = new ResourceTexture(
-            "gtceu:textures/gui/overlay/tool_wire_connect.png"); // switch to tool_switch_converter_eu once that gets
-                                                                 // made
+            "gtceu:textures/gui/overlay/tool_wire_connect.png"); // todo switch to tool_switch_converter_eu once that
+                                                                 // gets made
 
     // BASE TEXTURES
     public static final ResourceBorderTexture BACKGROUND = new ResourceBorderTexture(

diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java
@@ -980,7 +980,7 @@ private static BlockEntry<ActiveBlock> createFireboxCasing(BoilerFireboxType typ
             .properties(p -> p.mapColor(MapColor.FIRE).instabreak().sound(SoundType.GRASS).ignitedByLava())
             .tag(BlockTags.MINEABLE_WITH_AXE)
             .blockstate((ctx, prov) -> prov.simpleBlock(ctx.get(), prov.models().cubeBottomTop(ctx.getName(),
-                    prov.blockTexture(ctx.get()).withSuffix("_side"),
+                    GTCEu.id("block/misc/industrial_tnt_side"),
                     new ResourceLocation("minecraft", "block/tnt_bottom"),
                     new ResourceLocation("minecraft", "block/tnt_top"))))
             .simpleItem()

diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTModels.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTModels.java
@@ -256,9 +256,9 @@ public static NonNullBiConsumer<DataGenContext<Block, BatteryBlock>, RegistrateB
                                                                                                                                IBatteryData batteryData) {
         return (ctx, prov) -> {
             prov.simpleBlock(ctx.getEntry(), prov.models().cubeBottomTop(name,
+                    GTCEu.id("block/casings/battery/" + batteryData.getBatteryName() + "/side"),
                     GTCEu.id("block/casings/battery/" + batteryData.getBatteryName() + "/top"),
-                    GTCEu.id("block/casings/battery/" + batteryData.getBatteryName() + "/top"),
-                    GTCEu.id("block/casings/battery/" + batteryData.getBatteryName() + "/side")));
+                    GTCEu.id("block/casings/battery/" + batteryData.getBatteryName() + "/top")));
         };
     }
 

diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java
@@ -304,7 +304,7 @@ public boolean onLeftClick(Player player, Level world, InteractionHand hand, Blo
                 var drained = cache.extractItem(0, player.isShiftKeyDown() ? stored.getItem().getMaxStackSize() : 1,
                         false);
                 if (!drained.isEmpty()) {
-                    if (player.addItem(drained)) {
+                    if (!player.addItem(drained)) {
                         Block.popResource(world, getPos().relative(getFrontFacing()), drained);
                     }
                 }

diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumTankMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumTankMachine.java
@@ -132,7 +132,9 @@ public long fill(FluidStack resource, boolean simulate) {
 
             private long handleVoiding(long filled, FluidStack resource) {
                 if (filled < resource.getAmount() && isVoiding && isFluidValid(0, resource)) {
-                    return resource.getAmount();
+                    if (stored.isEmpty() || stored.isFluidEqual(resource)) {
+                        return resource.getAmount();
+                    }
                 }
 
                 return filled;

diff --git a/src/main/resources/assets/gtceu/models/block/machine/electric_gear_box_16a.json b/src/main/resources/assets/gtceu/models/block/machine/electric_gear_box_16a.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"gearbox": "gtceu:block/gearbox",
+		"gearbox": "gtceu:block/machines/gearbox",
 		"bottom": "gtceu:block/casings/voltage/lv/bottom",
 		"top": "gtceu:block/casings/voltage/lv/top",
 		"particle": "gtceu:block/casings/voltage/lv/side",
@@ -141,4 +141,4 @@
 			"children": [10, 11, 12, 13]
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/gtceu/models/block/machine/electric_gear_box_2a.json b/src/main/resources/assets/gtceu/models/block/machine/electric_gear_box_2a.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"gearbox": "gtceu:block/gearbox",
+		"gearbox": "gtceu:block/machines/gearbox",
 		"bottom": "gtceu:block/casings/voltage/lv/bottom",
 		"top": "gtceu:block/casings/voltage/lv/top",
 		"particle": "gtceu:block/casings/voltage/lv/side",
@@ -141,4 +141,4 @@
 			"children": [10, 11, 12, 13]
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/gtceu/models/block/machine/electric_gear_box_32a.json b/src/main/resources/assets/gtceu/models/block/machine/electric_gear_box_32a.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"gearbox": "gtceu:block/gearbox",
+		"gearbox": "gtceu:block/machines/gearbox",
 		"bottom": "gtceu:block/casings/voltage/lv/bottom",
 		"top": "gtceu:block/casings/voltage/lv/top",
 		"particle": "gtceu:block/casings/voltage/lv/side",
@@ -141,4 +141,4 @@
 			"children": [10, 11, 12, 13]
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/gtceu/models/block/machine/electric_gear_box_8a.json b/src/main/resources/assets/gtceu/models/block/machine/electric_gear_box_8a.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"gearbox": "gtceu:block/gearbox",
+		"gearbox": "gtceu:block/machines/gearbox",
 		"bottom": "gtceu:block/casings/voltage/lv/bottom",
 		"top": "gtceu:block/casings/voltage/lv/top",
 		"particle": "gtceu:block/casings/voltage/lv/side",
@@ -141,4 +141,4 @@
 			"children": [10, 11, 12, 13]
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/gtceu/models/block/machine/kinetic_electric_machine.json b/src/main/resources/assets/gtceu/models/block/machine/kinetic_electric_machine.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"gearbox": "gtceu:block/gearbox",
+		"gearbox": "gtceu:block/machines/gearbox",
 		"bottom": "gtceu:block/casings/voltage/lv/bottom",
 		"top": "gtceu:block/casings/voltage/lv/top",
 		"particle": "gtceu:block/casings/voltage/lv/side",
@@ -135,4 +135,4 @@
 			"children": [10, 11, 12, 13]
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/kinetic_input_box.json b/src/main/resources/assets/gtceu/models/block/machine/part/kinetic_input_box.json
@@ -3,7 +3,7 @@
 	"parent": "block/block",
 	"textures": {
 		"overlay": "gtceu:block/overlay/machine/overlay_pipe_in",
-		"gearbox": "gtceu:block/gearbox",
+		"gearbox": "gtceu:block/machines/gearbox",
 		"bottom": "gtceu:block/casings/voltage/lv/bottom",
 		"top": "gtceu:block/casings/voltage/lv/top",
 		"particle": "gtceu:block/casings/voltage/lv/side",
@@ -152,4 +152,4 @@
 			"children": [11, 12, 13, 14]
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/kinetic_output_box.json b/src/main/resources/assets/gtceu/models/block/machine/part/kinetic_output_box.json
@@ -3,7 +3,7 @@
 	"parent": "block/block",
 	"textures": {
 		"overlay": "gtceu:block/overlay/machine/overlay_pipe_out",
-		"gearbox": "gtceu:block/gearbox",
+		"gearbox": "gtceu:block/machines/gearbox",
 		"bottom": "gtceu:block/casings/voltage/lv/bottom",
 		"top": "gtceu:block/casings/voltage/lv/top",
 		"particle": "gtceu:block/casings/voltage/lv/side",
@@ -152,4 +152,4 @@
 			"children": [11, 12, 13, 14]
 		}
 	]
-}
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/black_lamp.png b/src/main/resources/assets/gtceu/textures/block/black_lamp.png
diff --git a/src/main/resources/assets/gtceu/textures/block/blue_lamp.png b/src/main/resources/assets/gtceu/textures/block/blue_lamp.png
diff --git a/src/main/resources/assets/gtceu/textures/block/brown_lamp.png b/src/main/resources/assets/gtceu/textures/block/brown_lamp.png
diff --git a/...u/textures/block/cover/OVERLAY_SCREEN.png → ...u/textures/block/cover/overlay_screen.png b/...u/textures/block/cover/OVERLAY_SCREEN.png → ...u/textures/block/cover/overlay_screen.png
diff --git a/src/main/resources/assets/gtceu/textures/block/cyan_lamp.png b/src/main/resources/assets/gtceu/textures/block/cyan_lamp.png
diff --git a/src/main/resources/assets/gtceu/textures/block/gray_lamp.png b/src/main/resources/assets/gtceu/textures/block/gray_lamp.png
diff --git a/src/main/resources/assets/gtceu/textures/block/green_lamp.png b/src/main/resources/assets/gtceu/textures/block/green_lamp.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray.png.mcmeta
@@ -1,5 +1,5 @@
 {
   "ldlib": {
-    "connection": "gtceu:block/lamps/silver_ctm"
+    "connection": "gtceu:block/lamps/light_gray_ctm"
   }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_emissive.png.mcmeta
@@ -1,6 +1,6 @@
 {
   "ldlib": {
-    "connection": "gtceu:block/lamps/silver_ctm_emissive"
+    "connection": "gtceu:block/lamps/light_gray_ctm_emissive"
   },
   "shimmer": {
     "bloom": true

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
   "ldlib": {
-    "connection": "gtceu:block/lamps/silver_off_ctm"
+    "connection": "gtceu:block/lamps/light_gray_off_ctm"
   }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/light_blue_lamp.png b/src/main/resources/assets/gtceu/textures/block/light_blue_lamp.png
diff --git a/src/main/resources/assets/gtceu/textures/block/light_gray_lamp.png b/src/main/resources/assets/gtceu/textures/block/light_gray_lamp.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lime_lamp.png b/src/main/resources/assets/gtceu/textures/block/lime_lamp.png
diff --git a/.../resources/assets/gtceu/textures/block/machines/fermenter/overlay_front_active.png.mcmeta b/.../resources/assets/gtceu/textures/block/machines/fermenter/overlay_front_active.png.mcmeta
diff --git a/...s/assets/gtceu/textures/block/machines/fermenter/overlay_front_active_emissive.png.mcmeta b/...s/assets/gtceu/textures/block/machines/fermenter/overlay_front_active_emissive.png.mcmeta
diff --git a/...s/assets/gtceu/textures/block/gearbox.png → ...gtceu/textures/block/machines/gearbox.png b/...s/assets/gtceu/textures/block/gearbox.png → ...gtceu/textures/block/machines/gearbox.png
diff --git a/src/main/resources/assets/gtceu/textures/block/magenta_lamp.png b/src/main/resources/assets/gtceu/textures/block/magenta_lamp.png
diff --git a/...eu/textures/block/industrial_tnt_side.png → ...xtures/block/misc/industrial_tnt_side.png b/...eu/textures/block/industrial_tnt_side.png → ...xtures/block/misc/industrial_tnt_side.png
diff --git a/...main/resources/assets/gtceu/textures/block/molybdenum_disilicide_coil_block.png b/...main/resources/assets/gtceu/textures/block/molybdenum_disilicide_coil_block.png
diff --git a/src/main/resources/assets/gtceu/textures/block/molybdenum_disilicide_coil_block.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/molybdenum_disilicide_coil_block.png.mcmeta
diff --git a/.../resources/assets/gtceu/textures/block/molybdenum_disilicide_coil_block_ctm.png b/.../resources/assets/gtceu/textures/block/molybdenum_disilicide_coil_block_ctm.png
diff --git a/...assets/gtceu/textures/block/multiblock/fluid_drilling_rig/overlay_front_active.png.mcmeta b/...assets/gtceu/textures/block/multiblock/fluid_drilling_rig/overlay_front_active.png.mcmeta
diff --git a/...ceu/textures/block/multiblock/fluid_drilling_rig/overlay_front_active_emissive.png.mcmeta b/...ceu/textures/block/multiblock/fluid_drilling_rig/overlay_front_active_emissive.png.mcmeta
diff --git a/...eu/textures/block/multiblock/generator/large_steel_boiler/overlay_front_active.png.mcmeta b/...eu/textures/block/multiblock/generator/large_steel_boiler/overlay_front_active.png.mcmeta
diff --git a/...es/block/multiblock/generator/large_steel_boiler/overlay_front_active_emissive.png.mcmeta b/...es/block/multiblock/generator/large_steel_boiler/overlay_front_active_emissive.png.mcmeta
diff --git a/...textures/block/multiblock/generator/large_titanium_boiler/overlay_front_active.png.mcmeta b/...textures/block/multiblock/generator/large_titanium_boiler/overlay_front_active.png.mcmeta