From fd8eddb085d5d1c82ba04f7e4f74db2b7d53b0c1 Mon Sep 17 00:00:00 2001
From: trinsdar <30245301+Trinsdar@users.noreply.github.com>
Date: Tue, 1 Aug 2023 18:12:07 -0400
Subject: [PATCH] removed higher tier oil drilling rigs

---
 .../java/muramasa/gregtech/data/Machines.java |  2 +-
 .../muramasa/gregtech/data/Structures.java    |  4 +--
 .../tile/multi/TileEntityOilDrillingRig.java  | 26 -------------------
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/common/src/main/java/muramasa/gregtech/data/Machines.java b/common/src/main/java/muramasa/gregtech/data/Machines.java
index c7f832408..dd4732d4a 100644
--- a/common/src/main/java/muramasa/gregtech/data/Machines.java
+++ b/common/src/main/java/muramasa/gregtech/data/Machines.java
@@ -154,7 +154,7 @@ public class Machines {
     public static MultiMachine LARGE_TURBINE = new MultiMachine(GTIRef.ID, "large_turbine").setTiers(HV, EV, IV, UV).setMap(STEAM_FUELS, HV).setMap(HP_STEAM_FUELS, IV).setMap(GAS_FUELS, EV, UV).addFlags(GUI, FLUID, ENERGY, GENERATOR).setTile(TileEntityLargeTurbine::new).custom(Textures.TURBINE);
     public static MultiMachine MULTI_SMELTER = new MultiMachine(GTIRef.ID, "multi_smelter").setTiers(HV).setMap(SMELTING).addFlags(GUI, ITEM, ENERGY).setTile(TileEntityMultiSmelter::new).custom();
     public static MultiMachine NUCLEAR_REACTOR = new MultiMachine(GTIRef.ID, "nuclear_reactor").setTiers(EV).setMap(NUCLEAR).addFlags(GUI, ITEM, FLUID, ENERGY).setTile(TileEntityNuclearReactor::new).custom();
-    public static MultiMachine OIL_DRILLING_RIG = new MultiMachine(GTIRef.ID, "oil_drilling_rig").setTiers(MV, HV, EV, IV).addFlags(GUI, FLUID, ENERGY).setTile(TileEntityOilDrillingRig::new).custom();
+    public static MultiMachine OIL_DRILLING_RIG = new MultiMachine(GTIRef.ID, "oil_drilling_rig").setTiers(MV).addFlags(GUI, FLUID, ENERGY).setTile(TileEntityOilDrillingRig::new).custom();
     public static MultiMachine PYROLYSIS_OVEN = new MultiMachine(GTIRef.ID, "pyrolysis_oven").setTiers(MV).setMap(PYROLYSISING).addFlags(GUI, ITEM, FLUID, ENERGY).setTile(TileEntityPyrolysisOven::new).custom();
     public static MultiMachine VACUUM_FREEZER = new MultiMachine(GTIRef.ID, "vacuum_freezer").setTiers(HV).setMap(VACUUM_FREEZING).addFlags(GUI, ITEM, FLUID, ENERGY).setTile(TileEntityVacuumFreezer::new);
     /**
diff --git a/common/src/main/java/muramasa/gregtech/data/Structures.java b/common/src/main/java/muramasa/gregtech/data/Structures.java
index 2ffaf6712..d1a9b9255 100644
--- a/common/src/main/java/muramasa/gregtech/data/Structures.java
+++ b/common/src/main/java/muramasa/gregtech/data/Structures.java
@@ -171,8 +171,8 @@ public static void init() {
 
         OIL_DRILLING_RIG.setStructure(TileEntityOilDrillingRig.class, b -> b.part("main")
                 .of("   ", " F ", "   ").of(0).of(0).of(" F ", "FCF", " F ").of(3).of(3).of("H~H", "HCH", "HHH").build()
-                .atElement('F', lazy(t -> ofBlock(FRAME.get().get(t.getMaterial()).asBlock()))).atElement('C', lazy(t -> ofBlock(t.getCasing())))
-                .atElement('H', lazy(t -> StructureUtility.<TileEntityOilDrillingRig>ofChain(ofBlock(t.getCasing()), ofHatchMinTier(HATCH_ENERGY, t.getMachineTier()), ofHatch(HATCH_FLUID_O))))
+                .at('F', FRAME.get().get(Steel)).at('C', GregTechData.CASING_SOLID_STEEL)
+                .at('H', GregTechData.CASING_SOLID_STEEL, HATCH_ENERGY, HATCH_FLUID_O)
                 .offset(1, 6, 0).min(1, HATCH_FLUID_O, HATCH_ENERGY).build());
 
         VACUUM_FREEZER.setStructure(TileEntityVacuumFreezer.class, b -> b.part("main")
diff --git a/common/src/main/java/muramasa/gregtech/tile/multi/TileEntityOilDrillingRig.java b/common/src/main/java/muramasa/gregtech/tile/multi/TileEntityOilDrillingRig.java
index 562676eda..466349628 100644
--- a/common/src/main/java/muramasa/gregtech/tile/multi/TileEntityOilDrillingRig.java
+++ b/common/src/main/java/muramasa/gregtech/tile/multi/TileEntityOilDrillingRig.java
@@ -53,32 +53,6 @@ public void serverTick(Level level, BlockPos pos, BlockState state) {
         }
     }
 
-    public Material getMaterial(){
-        if (this.tier == EV){
-            return Materials.Steel;
-        }
-        if (this.tier == IV){
-            return Materials.StainlessSteel;
-        }
-        if (tier == LUV){
-            return Materials.Titanium;
-        }
-        return Materials.TungstenSteel;
-    }
-
-    public Block getCasing(){
-        if (this.tier == EV){
-            return GregTechData.CASING_SOLID_STEEL;
-        }
-        if (this.tier == IV){
-            return GregTechData.CASING_STAINLESS_STEEL;
-        }
-        if (tier == LUV){
-            return GregTechData.CASING_TITANIUM;
-        }
-        return GregTechData.CASING_TUNGSTENSTEEL;
-    }
-
     public boolean destroyBlock(Level level, BlockPos pos, boolean dropBlock, @Nullable Entity entity, ItemStack item) {
         BlockState blockstate = level.getBlockState(pos);
         if (blockstate.isAir()) {