Added the Basic Fluid Drilling Rig

VeljkoBogdan · VeljkoBogdan · commit b89b52af0b88 · 2026-03-09T14:06:09.000+01:00
diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
     mapping_version=2023.09.03-1.20.1
 
 # Mod Properties
-    mod_version=2.3.2
+    mod_version=2.4.0
     maven_group=com.illuminatijoe.refactorycore
     archives_base_name=refactorycore
     mod_id=refactorycore
diff --git a/src/generated/resources/assets/refactorycore/blockstates/lv_basic_fluid_drilling_rig.json b/src/generated/resources/assets/refactorycore/blockstates/lv_basic_fluid_drilling_rig.json
@@ -0,0 +1,114 @@
+{
+  "variants": {
+    "facing=down,upwards_facing=east": {
+      "gtceu:z": 90,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "x": 90
+    },
+    "facing=down,upwards_facing=north": {
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "x": 90
+    },
+    "facing=down,upwards_facing=south": {
+      "gtceu:z": 180,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "x": 90
+    },
+    "facing=down,upwards_facing=west": {
+      "gtceu:z": 270,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "x": 90
+    },
+    "facing=east,upwards_facing=east": {
+      "gtceu:z": 270,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "y": 90
+    },
+    "facing=east,upwards_facing=north": {
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "y": 90
+    },
+    "facing=east,upwards_facing=south": {
+      "gtceu:z": 180,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "y": 90
+    },
+    "facing=east,upwards_facing=west": {
+      "gtceu:z": 90,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "y": 90
+    },
+    "facing=north,upwards_facing=east": {
+      "gtceu:z": 270,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig"
+    },
+    "facing=north,upwards_facing=north": {
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig"
+    },
+    "facing=north,upwards_facing=south": {
+      "gtceu:z": 180,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig"
+    },
+    "facing=north,upwards_facing=west": {
+      "gtceu:z": 90,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig"
+    },
+    "facing=south,upwards_facing=east": {
+      "gtceu:z": 270,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "y": 180
+    },
+    "facing=south,upwards_facing=north": {
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "y": 180
+    },
+    "facing=south,upwards_facing=south": {
+      "gtceu:z": 180,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "y": 180
+    },
+    "facing=south,upwards_facing=west": {
+      "gtceu:z": 90,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "y": 180
+    },
+    "facing=up,upwards_facing=east": {
+      "gtceu:z": 90,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "x": 270
+    },
+    "facing=up,upwards_facing=north": {
+      "gtceu:z": 180,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "x": 270
+    },
+    "facing=up,upwards_facing=south": {
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "x": 270
+    },
+    "facing=up,upwards_facing=west": {
+      "gtceu:z": 270,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "x": 270
+    },
+    "facing=west,upwards_facing=east": {
+      "gtceu:z": 270,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "y": 270
+    },
+    "facing=west,upwards_facing=north": {
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "y": 270
+    },
+    "facing=west,upwards_facing=south": {
+      "gtceu:z": 180,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "y": 270
+    },
+    "facing=west,upwards_facing=west": {
+      "gtceu:z": 90,
+      "model": "refactorycore:block/machine/lv_basic_fluid_drilling_rig",
+      "y": 270
+    }
+  }
+}
diff --git a/src/generated/resources/assets/refactorycore/lang/en_ud.json b/src/generated/resources/assets/refactorycore/lang/en_ud.json
@@ -41,6 +41,7 @@
   "block.refactorycore.luv_hydrator": "ɹ§II ɹoʇɐɹpʎH ǝʇıןƎp§",
   "block.refactorycore.luv_lp_input_hatch": "ɥɔʇɐH ʇnduI ԀꞀ ΛnꞀp§",
   "block.refactorycore.luv_lp_output_hatch": "ɥɔʇɐH ʇndʇnO ԀꞀ ΛnꞀp§",
+  "block.refactorycore.lv_basic_fluid_drilling_rig": "ɹ§ bıᴚ buıןןıɹᗡ pınןℲ ɔısɐᗺ",
   "block.refactorycore.lv_hydrator": "ɹ§ ɹoʇɐɹpʎH ɔısɐᗺ",
   "block.refactorycore.max_fake_nuclear_reactor": "ɹ§ ɹoʇɔɐǝᴚ ɹɐǝןɔnN ǝʞɐℲ XⱯWן§ɔ§",
   "block.refactorycore.max_lp_input_hatch": "ɥɔʇɐH ʇnduI ԀꞀ XⱯWן§ɔ§",
diff --git a/src/generated/resources/assets/refactorycore/lang/en_us.json b/src/generated/resources/assets/refactorycore/lang/en_us.json
@@ -41,6 +41,7 @@
   "block.refactorycore.luv_hydrator": "§dElite Hydrator II§r",
   "block.refactorycore.luv_lp_input_hatch": "§dLuV LP Input Hatch",
   "block.refactorycore.luv_lp_output_hatch": "§dLuV LP Output Hatch",
+  "block.refactorycore.lv_basic_fluid_drilling_rig": "Basic Fluid Drilling Rig §r",
   "block.refactorycore.lv_hydrator": "Basic Hydrator §r",
   "block.refactorycore.max_fake_nuclear_reactor": "§c§lMAX Fake Nuclear Reactor §r",
   "block.refactorycore.max_lp_input_hatch": "§c§lMAX LP Input Hatch",
diff --git a/src/generated/resources/assets/refactorycore/models/block/machine/lv_basic_fluid_drilling_rig.json b/src/generated/resources/assets/refactorycore/models/block/machine/lv_basic_fluid_drilling_rig.json
@@ -0,0 +1,90 @@
+{
+  "parent": "minecraft:block/block",
+  "loader": "gtceu:machine",
+  "machine": "refactorycore:lv_basic_fluid_drilling_rig",
+  "texture_overrides": {
+    "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks"
+  },
+  "variants": {
+    "is_formed=false,recipe_logic_status=idle": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
+          "overlay_front": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front",
+          "overlay_front_emissive": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_emissive"
+        }
+      }
+    },
+    "is_formed=false,recipe_logic_status=suspend": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
+          "overlay_front": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_paused",
+          "overlay_front_emissive": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_paused_emissive"
+        }
+      }
+    },
+    "is_formed=false,recipe_logic_status=waiting": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
+          "overlay_front": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_active",
+          "overlay_front_emissive": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_active_emissive"
+        }
+      }
+    },
+    "is_formed=false,recipe_logic_status=working": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
+          "overlay_front": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_active",
+          "overlay_front_emissive": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_active_emissive"
+        }
+      }
+    },
+    "is_formed=true,recipe_logic_status=idle": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
+          "overlay_front": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front",
+          "overlay_front_emissive": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_emissive"
+        }
+      }
+    },
+    "is_formed=true,recipe_logic_status=suspend": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
+          "overlay_front": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_paused",
+          "overlay_front_emissive": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_paused_emissive"
+        }
+      }
+    },
+    "is_formed=true,recipe_logic_status=waiting": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
+          "overlay_front": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_active",
+          "overlay_front_emissive": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_active_emissive"
+        }
+      }
+    },
+    "is_formed=true,recipe_logic_status=working": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks",
+          "overlay_front": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_active",
+          "overlay_front_emissive": "gtceu:block/multiblock/fluid_drilling_rig/overlay_front_active_emissive"
+        }
+      }
+    }
+  }
+}
diff --git a/src/generated/resources/assets/refactorycore/models/item/lv_basic_fluid_drilling_rig.json b/src/generated/resources/assets/refactorycore/models/item/lv_basic_fluid_drilling_rig.json
@@ -0,0 +1,3 @@
+{
+  "parent": "refactorycore:block/machine/lv_basic_fluid_drilling_rig"
+}
diff --git a/src/main/java/com/illuminatijoe/refactorycore/machines/multiblock/MultiblockInit.java b/src/main/java/com/illuminatijoe/refactorycore/machines/multiblock/MultiblockInit.java
@@ -1,6 +1,7 @@
 package com.illuminatijoe.refactorycore.machines.multiblock;
 
 import com.illuminatijoe.refactorycore.machines.multiblock.electric.AuraAltar;
+import com.illuminatijoe.refactorycore.machines.multiblock.electric.BasicFluidDrillingRig;
 import com.illuminatijoe.refactorycore.machines.multiblock.electric.Bloodforge;
 import com.illuminatijoe.refactorycore.machines.multiblock.generator.ManaBurners;
 import com.illuminatijoe.refactorycore.machines.multiblock.nuclear.NuclearReactor;
@@ -15,6 +16,7 @@ public static void init() {
         ManaBurners.init();
         NuclearReactor.init();
         CoolingTower.init();
+        BasicFluidDrillingRig.init();
 
         // dummy machines
         FakeNuclearReactor.init();
diff --git a/src/main/java/com/illuminatijoe/refactorycore/machines/multiblock/electric/BasicFluidDrillMachine.java b/src/main/java/com/illuminatijoe/refactorycore/machines/multiblock/electric/BasicFluidDrillMachine.java
@@ -0,0 +1,127 @@
+package com.illuminatijoe.refactorycore.machines.multiblock.electric;
+
+import com.illuminatijoe.refactorycore.machines.trait.BasicFluidDrillLogic;
+
+import com.gregtechceu.gtceu.GTCEu;
+import com.gregtechceu.gtceu.api.GTValues;
+import com.gregtechceu.gtceu.api.capability.IEnergyContainer;
+import com.gregtechceu.gtceu.api.capability.recipe.EURecipeCapability;
+import com.gregtechceu.gtceu.api.capability.recipe.IO;
+import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
+import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
+import com.gregtechceu.gtceu.api.machine.feature.ITieredMachine;
+import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine;
+import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
+import com.gregtechceu.gtceu.api.misc.EnergyContainerList;
+import com.gregtechceu.gtceu.common.data.GTBlocks;
+import com.gregtechceu.gtceu.common.data.GTMaterialBlocks;
+import com.gregtechceu.gtceu.common.data.GTMaterials;
+import com.gregtechceu.gtceu.utils.FormattingUtil;
+import com.gregtechceu.gtceu.utils.GTUtil;
+
+import net.minecraft.ChatFormatting;
+import net.minecraft.MethodsReturnNonnullByDefault;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.HoverEvent;
+import net.minecraft.network.chat.Style;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.material.Fluid;
+
+import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+public class BasicFluidDrillMachine extends WorkableElectricMultiblockMachine implements ITieredMachine {
+
+    @Getter
+    public final int tier;
+
+    public BasicFluidDrillMachine(IMachineBlockEntity holder, int tier) {
+        super(holder);
+        this.tier = tier;
+    }
+
+    @Override
+    protected RecipeLogic createRecipeLogic(Object... args) {
+        return new BasicFluidDrillLogic(this);
+    }
+
+    @NotNull
+    @Override
+    public BasicFluidDrillLogic getRecipeLogic() {
+        return (BasicFluidDrillLogic) super.getRecipeLogic();
+    }
+
+    public int getEnergyTier() {
+        var energyContainer = this.getCapabilitiesFlat(IO.IN, EURecipeCapability.CAP);
+        if (energyContainer == null) return this.tier;
+        var energyCont = new EnergyContainerList(energyContainer.stream().filter(IEnergyContainer.class::isInstance)
+                .map(IEnergyContainer.class::cast).toList());
+
+        return Math.min(this.tier + 1, Math.max(this.tier, GTUtil.getFloorTierByVoltage(energyCont.getInputVoltage())));
+    }
+
+    @Override
+    public void addDisplayText(List<Component> textList) {
+        if (isFormed()) {
+            int energyContainer = getEnergyTier();
+            long maxVoltage = GTValues.V[energyContainer];
+            String voltageName = GTValues.VNF[energyContainer];
+            textList.add(Component.translatable("gtceu.multiblock.max_energy_per_tick", maxVoltage, voltageName));
+
+            if (getRecipeLogic().getVeinFluid() != null) {
+                // Fluid name
+                Fluid drilledFluid = getRecipeLogic().getVeinFluid();
+                Component fluidInfo = drilledFluid.getFluidType().getDescription().copy()
+                        .withStyle(ChatFormatting.GREEN);
+                textList.add(Component.translatable("gtceu.multiblock.fluid_rig.drilled_fluid", fluidInfo)
+                        .withStyle(ChatFormatting.GRAY));
+
+                // Fluid amount
+                Component amountInfo = Component.literal(FormattingUtil.formatNumbers(
+                        getRecipeLogic().getFluidToProduce() * 20L / BasicFluidDrillLogic.MAX_PROGRESS) +
+                        " mB/s").withStyle(ChatFormatting.BLUE);
+                textList.add(Component.translatable("gtceu.multiblock.fluid_rig.fluid_amount", amountInfo)
+                        .withStyle(ChatFormatting.GRAY));
+            } else {
+                Component noFluid = Component.translatable("gtceu.multiblock.fluid_rig.no_fluid_in_area")
+                        .withStyle(ChatFormatting.RED);
+                textList.add(Component.translatable("gtceu.multiblock.fluid_rig.drilled_fluid", noFluid)
+                        .withStyle(ChatFormatting.GRAY));
+            }
+        } else {
+            Component tooltip = Component.translatable("gtceu.multiblock.invalid_structure.tooltip")
+                    .withStyle(ChatFormatting.GRAY);
+            textList.add(Component.translatable("gtceu.multiblock.invalid_structure")
+                    .withStyle(Style.EMPTY.withColor(ChatFormatting.RED)
+                            .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, tooltip))));
+        }
+    }
+
+    public static int getDepletionChance() {
+        return 1;
+    }
+
+    public static float getRigMultiplier() {
+        return 0.5f;
+    }
+
+    public static Block getCasingState() {
+        return GTBlocks.CASING_BRONZE_BRICKS.get();
+    }
+
+    @SuppressWarnings("DataFlowIssue")
+    public static Block getFrameState() {
+        return GTMaterialBlocks.MATERIAL_BLOCKS.get(TagPrefix.frameGt, GTMaterials.Steel).get();
+    }
+
+    public static ResourceLocation getBaseTexture() {
+        return GTCEu.id("block/casings/solid/machine_casing_bronze_plated_bricks");
+    }
+}
diff --git a/src/main/java/com/illuminatijoe/refactorycore/machines/multiblock/electric/BasicFluidDrillingRig.java b/src/main/java/com/illuminatijoe/refactorycore/machines/multiblock/electric/BasicFluidDrillingRig.java
diff --git a/src/main/java/com/illuminatijoe/refactorycore/machines/trait/BasicFluidDrillLogic.java b/src/main/java/com/illuminatijoe/refactorycore/machines/trait/BasicFluidDrillLogic.java

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "parent": "refactorycore:block/machine/lv_basic_fluid_drilling_rig"`
	`3`	`+}`