Merge branch '1.20.1' into sc/research-logic

# Conflicts: # src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java
GregTechCEu · Apr 4, 2024 · 4004fcb · 4004fcb
2 parents cf80a5f + 8f0b5bf
commit 4004fcb
Show file tree

Hide file tree

Showing 21 changed files with 84 additions and 29 deletions.
diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/basalt.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/basalt.json
@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/basalt",
   "position": [
-    -100,
-    100
+    -200,
+    150
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/deepslate.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/deepslate.json
@@ -118,7 +118,7 @@
   "page": "gtceu:generation/deepslate",
   "position": [
     -50,
-    150
+    50
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/diorite.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/diorite.json
@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/diorite",
   "position": [
-    -50,
-    50
+    -100,
+    150
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/endstone.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/endstone.json
@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/endstone",
   "position": [
-    -50,
-    100
+    -100,
+    50
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/granite.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/granite.json
@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/granite",
   "position": [
-    -150,
-    100
+    -200,
+    50
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/gravel.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/gravel.json
@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/gravel",
   "position": [
-    -150,
-    50
+    -200,
+    100
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/netherrack.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/netherrack.json
@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/netherrack",
   "position": [
-    -200,
-    50
+    -50,
+    100
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/red_sand.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/red_sand.json
@@ -118,7 +118,7 @@
   "page": "gtceu:generation/red_sand",
   "position": [
     -100,
-    150
+    100
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/sand.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/sand.json
@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/sand",
   "position": [
-    -200,
-    100
+    -150,
+    50
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/stone.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/stone.json
@@ -117,7 +117,7 @@
   ],
   "page": "gtceu:generation/stone",
   "position": [
-    -200,
+    -50,
     150
   ],
   "pre_nodes": [

diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/tuff.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/tuff.json
@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/tuff",
   "position": [
-    -100,
-    50
+    -150,
+    100
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json
@@ -3941,6 +3941,7 @@
   "item.gtceu.opv_electric_motor": "ɹoʇoW ɔıɹʇɔǝןƎ ΛdO",
   "item.gtceu.opv_electric_piston": "uoʇsıԀ ɔıɹʇɔǝןƎ ΛdO",
   "item.gtceu.opv_electric_pump": "dɯnԀ ɔıɹʇɔǝןƎ ΛdO",
+  "item.gtceu.opv_emitter": "ɹǝʇʇıɯƎ ΛdO",
   "item.gtceu.opv_field_generator": "ɹoʇɐɹǝuǝ⅁ pןǝıℲ ΛdO",
   "item.gtceu.opv_fluid_regulator": "ɹoʇɐןnbǝᴚ pınןℲ ΛdO",
   "item.gtceu.opv_robot_arm": "ɯɹⱯ ʇoqoᴚ ΛdO",
@@ -4280,6 +4281,7 @@
   "item.gtceu.uev_electric_motor": "ɹoʇoW ɔıɹʇɔǝןƎ ΛƎ∩",
   "item.gtceu.uev_electric_piston": "uoʇsıԀ ɔıɹʇɔǝןƎ ΛƎ∩",
   "item.gtceu.uev_electric_pump": "dɯnԀ ɔıɹʇɔǝןƎ ΛƎ∩",
+  "item.gtceu.uev_emitter": "ɹǝʇʇıɯƎ ΛƎ∩",
   "item.gtceu.uev_field_generator": "ɹoʇɐɹǝuǝ⅁ pןǝıℲ ΛƎ∩",
   "item.gtceu.uev_fluid_regulator": "ɹoʇɐןnbǝᴚ pınןℲ ΛƎ∩",
   "item.gtceu.uev_robot_arm": "ɯɹⱯ ʇoqoᴚ ΛƎ∩",
@@ -4293,6 +4295,7 @@
   "item.gtceu.uhv_electric_motor": "ɹoʇoW ɔıɹʇɔǝןƎ ΛH∩",
   "item.gtceu.uhv_electric_piston": "uoʇsıԀ ɔıɹʇɔǝןƎ ΛH∩",
   "item.gtceu.uhv_electric_pump": "dɯnԀ ɔıɹʇɔǝןƎ ΛH∩",
+  "item.gtceu.uhv_emitter": "ɹǝʇʇıɯƎ ΛH∩",
   "item.gtceu.uhv_field_generator": "ɹoʇɐɹǝuǝ⅁ pןǝıℲ ΛH∩",
   "item.gtceu.uhv_fluid_regulator": "ɹoʇɐןnbǝᴚ pınןℲ ΛH∩",
   "item.gtceu.uhv_robot_arm": "ɯɹⱯ ʇoqoᴚ ΛH∩",
@@ -4302,6 +4305,7 @@
   "item.gtceu.uiv_electric_motor": "ɹoʇoW ɔıɹʇɔǝןƎ ΛI∩",
   "item.gtceu.uiv_electric_piston": "uoʇsıԀ ɔıɹʇɔǝןƎ ΛI∩",
   "item.gtceu.uiv_electric_pump": "dɯnԀ ɔıɹʇɔǝןƎ ΛI∩",
+  "item.gtceu.uiv_emitter": "ɹǝʇʇıɯƎ ΛI∩",
   "item.gtceu.uiv_field_generator": "ɹoʇɐɹǝuǝ⅁ pןǝıℲ ΛI∩",
   "item.gtceu.uiv_fluid_regulator": "ɹoʇɐןnbǝᴚ pınןℲ ΛI∩",
   "item.gtceu.uiv_robot_arm": "ɯɹⱯ ʇoqoᴚ ΛI∩",
@@ -4336,6 +4340,7 @@
   "item.gtceu.uxv_electric_motor": "ɹoʇoW ɔıɹʇɔǝןƎ ΛX∩",
   "item.gtceu.uxv_electric_piston": "uoʇsıԀ ɔıɹʇɔǝןƎ ΛX∩",
   "item.gtceu.uxv_electric_pump": "dɯnԀ ɔıɹʇɔǝןƎ ΛX∩",
+  "item.gtceu.uxv_emitter": "ɹǝʇʇıɯƎ ΛX∩",
   "item.gtceu.uxv_field_generator": "ɹoʇɐɹǝuǝ⅁ pןǝıℲ ΛX∩",
   "item.gtceu.uxv_fluid_regulator": "ɹoʇɐןnbǝᴚ pınןℲ ΛX∩",
   "item.gtceu.uxv_robot_arm": "ɯɹⱯ ʇoqoᴚ ΛX∩",

diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json
@@ -3941,6 +3941,7 @@
   "item.gtceu.opv_electric_motor": "OpV Electric Motor",
   "item.gtceu.opv_electric_piston": "OpV Electric Piston",
   "item.gtceu.opv_electric_pump": "OpV Electric Pump",
+  "item.gtceu.opv_emitter": "OpV Emitter",
   "item.gtceu.opv_field_generator": "OpV Field Generator",
   "item.gtceu.opv_fluid_regulator": "OpV Fluid Regulator",
   "item.gtceu.opv_robot_arm": "OpV Robot Arm",
@@ -4280,6 +4281,7 @@
   "item.gtceu.uev_electric_motor": "UEV Electric Motor",
   "item.gtceu.uev_electric_piston": "UEV Electric Piston",
   "item.gtceu.uev_electric_pump": "UEV Electric Pump",
+  "item.gtceu.uev_emitter": "UEV Emitter",
   "item.gtceu.uev_field_generator": "UEV Field Generator",
   "item.gtceu.uev_fluid_regulator": "UEV Fluid Regulator",
   "item.gtceu.uev_robot_arm": "UEV Robot Arm",
@@ -4293,6 +4295,7 @@
   "item.gtceu.uhv_electric_motor": "UHV Electric Motor",
   "item.gtceu.uhv_electric_piston": "UHV Electric Piston",
   "item.gtceu.uhv_electric_pump": "UHV Electric Pump",
+  "item.gtceu.uhv_emitter": "UHV Emitter",
   "item.gtceu.uhv_field_generator": "UHV Field Generator",
   "item.gtceu.uhv_fluid_regulator": "UHV Fluid Regulator",
   "item.gtceu.uhv_robot_arm": "UHV Robot Arm",
@@ -4302,6 +4305,7 @@
   "item.gtceu.uiv_electric_motor": "UIV Electric Motor",
   "item.gtceu.uiv_electric_piston": "UIV Electric Piston",
   "item.gtceu.uiv_electric_pump": "UIV Electric Pump",
+  "item.gtceu.uiv_emitter": "UIV Emitter",
   "item.gtceu.uiv_field_generator": "UIV Field Generator",
   "item.gtceu.uiv_fluid_regulator": "UIV Fluid Regulator",
   "item.gtceu.uiv_robot_arm": "UIV Robot Arm",
@@ -4336,6 +4340,7 @@
   "item.gtceu.uxv_electric_motor": "UXV Electric Motor",
   "item.gtceu.uxv_electric_piston": "UXV Electric Piston",
   "item.gtceu.uxv_electric_pump": "UXV Electric Pump",
+  "item.gtceu.uxv_emitter": "UXV Emitter",
   "item.gtceu.uxv_field_generator": "UXV Field Generator",
   "item.gtceu.uxv_fluid_regulator": "UXV Fluid Regulator",
   "item.gtceu.uxv_robot_arm": "UXV Robot Arm",

diff --git a/src/generated/resources/assets/gtceu/models/item/opv_emitter.json b/src/generated/resources/assets/gtceu/models/item/opv_emitter.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "gtceu:item/opv_emitter"
+  }
+}
diff --git a/src/generated/resources/assets/gtceu/models/item/uev_emitter.json b/src/generated/resources/assets/gtceu/models/item/uev_emitter.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "gtceu:item/uev_emitter"
+  }
+}
diff --git a/src/generated/resources/assets/gtceu/models/item/uhv_emitter.json b/src/generated/resources/assets/gtceu/models/item/uhv_emitter.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "gtceu:item/uhv_emitter"
+  }
+}
diff --git a/src/generated/resources/assets/gtceu/models/item/uiv_emitter.json b/src/generated/resources/assets/gtceu/models/item/uiv_emitter.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "gtceu:item/uiv_emitter"
+  }
+}
diff --git a/src/generated/resources/assets/gtceu/models/item/uxv_emitter.json b/src/generated/resources/assets/gtceu/models/item/uxv_emitter.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "gtceu:item/uxv_emitter"
+  }
+}
diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/PatternPreviewWidget.java b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/PatternPreviewWidget.java
@@ -1,6 +1,7 @@
 package com.gregtechceu.gtceu.api.gui.widget;
 
 import com.gregtechceu.gtceu.GTCEu;
+import com.gregtechceu.gtceu.api.gui.GuiTextures;
 import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
 import com.gregtechceu.gtceu.api.pattern.BlockPattern;
 import com.gregtechceu.gtceu.api.block.MetaMachineBlock;
@@ -54,6 +55,7 @@ public class PatternPreviewWidget extends WidgetGroup {
     private static BlockPos LAST_POS = new BlockPos(0, 50, 0);
     private static final Map<MultiblockMachineDefinition, MBPattern[]> CACHE = new HashMap<>();
     private final SceneWidget sceneWidget;
+    private final DraggableScrollableWidgetGroup scrollableWidgetGroup;
     public final MultiblockMachineDefinition controllerDefinition;
     public final MBPattern[] patterns;
     private final List<SimplePredicate> predicates;
@@ -63,17 +65,25 @@ public class PatternPreviewWidget extends WidgetGroup {
     private SlotWidget[] candidates;
 
     protected PatternPreviewWidget(MultiblockMachineDefinition controllerDefinition) {
-        super(0, 0, 176, 176);
+        super(0, 0, 160, 160);
         setClientSideWidget();
         this.controllerDefinition = controllerDefinition;
         predicates = new ArrayList<>();
         layer = -1;
 
-        addWidget(sceneWidget = new SceneWidget(3, 3, 170, 170, LEVEL)
+        addWidget(sceneWidget = new SceneWidget(3, 3, 150, 150, LEVEL)
                 .setOnSelected(this::onPosSelected)
                 .setRenderFacing(false)
                 .setRenderFacing(false));
 
+        scrollableWidgetGroup = new DraggableScrollableWidgetGroup(3, 132, 154, 22)
+            .setXScrollBarHeight(4)
+            .setXBarStyle(GuiTextures.SLIDER_BACKGROUND, GuiTextures.BUTTON)
+            .setScrollable(true)
+            .setDraggable(true);
+        scrollableWidgetGroup.setScrollYOffset(0);
+        addWidget(scrollableWidgetGroup);
+
         if (ConfigHolder.INSTANCE.client.useVBO) {
             if (!RenderSystem.isOnRenderThread()) {
                 RenderSystem.recordRenderCall(sceneWidget::useCacheBuffer);
@@ -82,7 +92,7 @@ protected PatternPreviewWidget(MultiblockMachineDefinition controllerDefinition)
             }
         }
 
-        addWidget(new ImageWidget(3, 3, 170, 10,
+        addWidget(new ImageWidget(3, 3, 160, 10,
                 new TextTexture(controllerDefinition.getDescriptionId(), -1)
                         .setType(TextTexture.TextType.ROLL)
                         .setWidth(170)
@@ -97,13 +107,13 @@ protected PatternPreviewWidget(MultiblockMachineDefinition controllerDefinition)
                     .toArray(MBPattern[]::new);
         });
 
-        addWidget(new ButtonWidget(150, 40, 18, 18, new GuiTextureGroup(
+        addWidget(new ButtonWidget(138, 30, 18, 18, new GuiTextureGroup(
                 ColorPattern.T_GRAY.rectTexture(),
                 new TextTexture("1").setSupplier(() -> "P:" + index)),
                 (x) -> setPage((index + 1 >= patterns.length) ? 0 : index + 1))
                 .setHoverBorderTexture(1, -1));
 
-        addWidget(new ButtonWidget(150, 60, 18, 18, new GuiTextureGroup(
+        addWidget(new ButtonWidget(138, 50, 18, 18, new GuiTextureGroup(
                 ColorPattern.T_GRAY.rectTexture(),
                 new TextTexture("1").setSupplier(() -> layer >= 0 ? "L:" + layer : "ALL")),
                 cd -> updateLayer())
@@ -168,10 +178,10 @@ public void setPage(int index) {
         slotWidgets = new SlotWidget[Math.min(pattern.parts.size(), 18)];
         var itemHandler = new CycleItemStackHandler(pattern.parts);
         for (int i = 0; i < slotWidgets.length; i++) {
-            slotWidgets[i] = new SlotWidget(itemHandler, i, 7 + (i % 9) * 18, 173 - (((slotWidgets.length - 1) / 9 + 1) * 18)  + (i / 9) * 18, false, false)
+            slotWidgets[i] = new SlotWidget(itemHandler, i, 4 + i * 18, 0, false, false)
                     .setBackgroundTexture(ColorPattern.T_GRAY.rectTexture())
                     .setIngredientIO(IngredientIO.INPUT);
-            addWidget(slotWidgets[i]);
+            scrollableWidgetGroup.addWidget(slotWidgets[i]);
         }
     }
 
@@ -211,10 +221,10 @@ private void onPosSelected(BlockPos pos, Direction facing) {
             }
             candidates = new SlotWidget[candidateStacks.size()];
             CycleItemStackHandler itemHandler = new CycleItemStackHandler(candidateStacks);
-            int maxCol = (173 - (((slotWidgets.length - 1) / 9 + 1) * 18) - 35) % 18;
+            int maxCol = (160 - (((slotWidgets.length - 1) / 9 + 1) * 18) - 35) % 18;
             for (int i = 0; i < candidateStacks.size(); i++) {
                 int finalI = i;
-                candidates[i] = new SlotWidget(itemHandler, i, 9 + (i / maxCol) * 18, 33 + (i % maxCol) * 18, false, false)
+                candidates[i] = new SlotWidget(itemHandler, i, 3 + (i / maxCol) * 18, 3 + (i % maxCol) * 18, false, false)
                         .setIngredientIO(IngredientIO.INPUT)
                         .setBackgroundTexture(new ColorRectTexture(0x4fffffff))
                         .setOnAddedTooltips((slot, list) -> list.addAll(predicateTips.get(finalI)));

diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/SurfaceRockBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/SurfaceRockBlock.java
@@ -138,7 +138,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
 
     @Override
     public String getDescriptionId() {
-        return super.getDescriptionId();
+        return "block.surface_rock";
     }
 
     @Override

diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java
@@ -1150,6 +1150,11 @@ public static ICustomDescriptionId cellName() {
     public static ItemEntry<Item> EMITTER_LuV = REGISTRATE.item("luv_emitter", Item::new).lang("LuV Emitter").onRegister(compassNodeExist(GTCompassSections.COMPONENTS, "emitter")).register();
     public static ItemEntry<Item> EMITTER_ZPM = REGISTRATE.item("zpm_emitter", Item::new).lang("ZPM Emitter").onRegister(compassNodeExist(GTCompassSections.COMPONENTS, "emitter")).register();
     public static ItemEntry<Item> EMITTER_UV = REGISTRATE.item("uv_emitter", Item::new).lang("UV Emitter").onRegister(compassNodeExist(GTCompassSections.COMPONENTS, "emitter")).register();
+    public static ItemEntry<Item> EMITTER_UHV = GTCEuAPI.isHighTier() ? REGISTRATE.item("uhv_emitter", Item::new).lang("UHV Emitter").onRegister(compassNodeExist(GTCompassSections.COMPONENTS, "emitter")).register() : null;
+    public static ItemEntry<Item> EMITTER_UEV = GTCEuAPI.isHighTier() ? REGISTRATE.item("uev_emitter", Item::new).lang("UEV Emitter").onRegister(compassNodeExist(GTCompassSections.COMPONENTS, "emitter")).register() : null;
+    public static ItemEntry<Item> EMITTER_UIV = GTCEuAPI.isHighTier() ? REGISTRATE.item("uiv_emitter", Item::new).lang("UIV Emitter").onRegister(compassNodeExist(GTCompassSections.COMPONENTS, "emitter")).register() : null;
+    public static ItemEntry<Item> EMITTER_UXV = GTCEuAPI.isHighTier() ? REGISTRATE.item("uxv_emitter", Item::new).lang("UXV Emitter").onRegister(compassNodeExist(GTCompassSections.COMPONENTS, "emitter")).register() : null;
+    public static ItemEntry<Item> EMITTER_OpV = GTCEuAPI.isHighTier() ? REGISTRATE.item("opv_emitter", Item::new).lang("OpV Emitter").onRegister(compassNodeExist(GTCompassSections.COMPONENTS, "emitter")).register() : null;
 
     public static ItemEntry<Item> SENSOR_LV = REGISTRATE.item("lv_sensor", Item::new).lang("LV Sensor").onRegister(compassNodeExist(GTCompassSections.COMPONENTS, "sensor")).register();
     public static ItemEntry<Item> SENSOR_MV = REGISTRATE.item("mv_sensor", Item::new).lang("MV Sensor").onRegister(compassNodeExist(GTCompassSections.COMPONENTS, "sensor")).register();
-Original file line number
+Diff line change
@@ Expand Up / @@ -117,7 +117,7 @@ @@
       ],
       "page": "gtceu:generation/stone",
       "position": [
-        -200,
+        -50,
       ],
       "pre_nodes": [
@@ Expand Down @@