Update anthracite/lignite veins (#1139)

* commit * add oredict * add crushing/forge hammer recipes * registering ore * refactor: rename ore vein files * fix: fix wrong recipe & hide ore materials --------- Co-authored-by: planetme <87911459+planetme@users.noreply.github.com> Co-authored-by: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
SymmetricDevs · Dec 17, 2024 · b8121ed · b8121ed
1 parent 8976aed
commit b8121ed
Show file tree

Hide file tree

Showing 10 changed files with 160 additions and 66 deletions.
diff --git a/config/gregtech/worldgen/vein/beneath/anthracite_deposit_vein.json b/config/gregtech/worldgen/vein/beneath/anthracite_deposit_vein.json
@@ -0,0 +1,43 @@
+{
+  "weight": 60,
+  "density": 1,
+  "max_height": 255,
+  "min_height": 0,
+  "dimension_filter": ["dimension_id:10"],
+  "generator": {
+    "type": "layered",
+    "radius": [
+      25,
+      25
+    ]
+  },
+  "filler": {
+    "type": "layered",
+    "values": [
+      {
+        "primary": {
+          "block":"susy:resource_block_1",
+          "variant":"anthracite"
+        }
+      },
+      {
+        "secondary": {
+          "block":"susy:resource_block_1",
+          "variant":"anthracite"
+        }
+      },
+      {
+        "between": {
+          "block":"susy:resource_block_1",
+          "variant":"anthracite"
+        }
+      },
+      {
+        "sporadic": {
+          "block":"susy:resource_block_1",
+          "variant":"anthracite"
+        }
+      }
+    ]
+  }
+}
diff --git a/config/gregtech/worldgen/vein/beneath/anthracite_vein.json b/config/gregtech/worldgen/vein/beneath/anthracite_vein.json
diff --git a/config/gregtech/worldgen/vein/overworld/lignite_deposit_vein.json b/config/gregtech/worldgen/vein/overworld/lignite_deposit_vein.json
@@ -0,0 +1,46 @@
+{
+  "weight": 180,
+  "density": 1,
+  "max_height": 255,
+  "min_height": 60,
+  "vein_populator": {
+    "type": "surface_rock",
+    "material": "lignite"
+  },
+  "generator": {
+    "type": "layered",
+    "radius": [
+      20,
+      20
+    ]
+  },
+  "filler": {
+    "type": "layered",
+    "values": [
+      {
+        "primary": {
+          "block":"susy:resource_block_1",
+          "variant":"lignite"
+        }
+      },
+      {
+        "secondary": {
+          "block":"susy:resource_block_1",
+          "variant":"lignite"
+        }
+      },
+      {
+        "between": {
+          "block":"susy:resource_block_1",
+          "variant":"lignite"
+        }
+      },
+      {
+        "sporadic": {
+          "block":"susy:resource_block_1",
+          "variant":"lignite"
+        }
+      }
+    ]
+  }
+}
diff --git a/config/gregtech/worldgen/vein/overworld/lignite_vein.json b/config/gregtech/worldgen/vein/overworld/lignite_vein.json
diff --git a/groovy/material/OreMaterials.groovy b/groovy/material/OreMaterials.groovy
@@ -621,5 +621,17 @@ public class OreMaterials{
                 .flags(NO_UNIFICATION)
                 .color(0xbb5f09)
                 .build();
+
+        AnthraciteDeposit = new Material.Builder(7084, SuSyUtility.susyId("anthracite_deposit"))
+                .ore()
+                .flags(NO_UNIFICATION)
+                .color(0x241212)
+                .build();
+
+        LigniteDeposit = new Material.Builder(7085, SuSyUtility.susyId("lignite_deposit"))
+                .ore()
+                .flags(NO_UNIFICATION)
+                .color(0x644646)
+                .build();
     }
 }
diff --git a/groovy/material/SuSyMaterials.groovy b/groovy/material/SuSyMaterials.groovy
@@ -115,6 +115,8 @@ class SuSyMaterials {
         public static Material MagmaticHydrothermalDeposit;
         public static Material CoalDeposit;
         public static Material NativeCopperDeposit;
+        public static Material AnthraciteDeposit;
+        public static Material LigniteDeposit;
 
         // Roasted Ores
 

diff --git a/groovy/postInit/gameplay/Ores.groovy b/groovy/postInit/gameplay/Ores.groovy
@@ -93,7 +93,31 @@ def RedundantOreRemovals = [
         ore('dustPureNativeCopperDeposit'),
         ore('dustNativeCopperDeposit'),
         ore('dustSmallNativeCopperDeposit'),
-        ore('dustTinyNativeCopperDeposit')
+        ore('dustTinyNativeCopperDeposit'),
+
+        item('gregtech:ore_anthracite_deposit_0'),
+        ore('oreNetherrackAnthraciteDeposit'),
+        ore('oreEndstoneAnthraciteDeposit'),
+        ore('crushedAnthraciteDeposit'),
+        ore('crushedPurifiedAnthraciteDeposit'),
+        ore('crushedCentrifugedAnthraciteDeposit'),
+        ore('dustImpureAnthraciteDeposit'),
+        ore('dustPureAnthraciteDeposit'),
+        ore('dustAnthraciteDeposit'),
+        ore('dustSmallAnthraciteDeposit'),
+        ore('dustTinyAnthraciteDeposit'),
+
+        item('gregtech:ore_lignite_deposit_0'),
+        ore('oreNetherrackLigniteDeposit'),
+        ore('oreEndstoneLigniteDeposit'),
+        ore('crushedLigniteDeposit'),
+        ore('crushedPurifiedLigniteDeposit'),
+        ore('crushedCentrifugedLigniteDeposit'),
+        ore('dustImpureLigniteDeposit'),
+        ore('dustPureLigniteDeposit'),
+        ore('dustLigniteDeposit'),
+        ore('dustSmallLigniteDeposit'),
+        ore('dustTinyLigniteDeposit')
 ]
 
 for (entry in RedundantOreRemovals) {

diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy
@@ -764,6 +764,34 @@ mods.gregtech.macerator.recipeBuilder()
 		.EUt(7)
 		.buildAndRegister();
 
+mods.gregtech.forge_hammer.recipeBuilder()
+		.inputs(item('susy:resource_block_1', 1))
+		.outputs(metaitem('gemAnthracite') * 8)
+		.duration(10)
+		.EUt(16)
+		.buildAndRegister();
+
+mods.gregtech.macerator.recipeBuilder()
+		.inputs(item('susy:resource_block_1', 1))
+		.outputs(metaitem('dustAnthracite') * 8)
+		.duration(240)
+		.EUt(7)
+		.buildAndRegister();
+
+mods.gregtech.forge_hammer.recipeBuilder()
+		.inputs(item('susy:resource_block_1', 2))
+		.outputs(metaitem('gemLignite') * 8)
+		.duration(10)
+		.EUt(16)
+		.buildAndRegister();
+
+mods.gregtech.macerator.recipeBuilder()
+		.inputs(item('susy:resource_block_1', 2))
+		.outputs(metaitem('dustLignite') * 8)
+		.duration(240)
+		.EUt(7)
+		.buildAndRegister();
+
 mods.gregtech.macerator.recipeBuilder()
 		.inputs(metaitem('native_copper'))
 		.outputs(metaitem('dustCopper'))

diff --git a/groovy/prePostInit/oreDict.groovy b/groovy/prePostInit/oreDict.groovy
@@ -93,6 +93,8 @@ ore('oreBauxite').add(item('susy:resource_block:0'))
 ore('oreSulfur').add(item('susy:resource_block:14'))
 ore('oreCoalDeposit').add(item('susy:resource_block:15'))
 ore('oreNativeCopperDeposit').add(item('susy:resource_block_1:0'))
+ore('oreAnthraciteDeposit').add(item('susy:resource_block_1:1'))
+ore('oreLigniteDeposit').add(item('susy:resource_block_1:2'))
 
 ore('oreOrthomagmaticDeposit').add(item('susy:deposit_block:0'))
 ore('oreMetamorphicDeposit').add(item('susy:deposit_block:1'))

diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang
@@ -1085,6 +1085,8 @@ item.susy.material.alluvial_deposit.ore=Alluvial Deposit
 item.susy.material.magmatic_hydrothermal_deposit.ore=Magmatic Hydrothermal Deposit
 item.susy.material.coal_deposit.ore=Coal Deposit
 item.susy.material.native_copper_deposit.ore=Native Copper Deposit
+item.susy.material.anthracite_deposit.ore=Anthracite Deposit
+item.susy.material.lignite_deposit.ore=Lignite Deposit
 
 susy.material.orthomagmatic_deposit=Orthomagmatic Deposit
 susy.material.metamorphic_deposit=Metamorphic Deposit