删除部分矿脉，gtm bug

EpimorphicPioneers · Jun 9, 2024 · daee847 · daee847
1 parent b6285b2
commit daee847
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 61 deletions.
diff --git a/config/gtceu.yaml b/config/gtceu.yaml
@@ -273,12 +273,12 @@ client:
   defaultPaintingColor: #FFFFFF
 
   # The default color to overlay onto Machine (and other) UIs.
-  # 16777215 (#FFFFFF) is no coloring (like GTCE).
-  # 13819135 (#D2DCFF in decimal) is the classic blue from GT5 (default).
+  # 16777215 (#FFFFFF) is no coloring (like GTCE) (default).
+  # 13819135 (#D2DCFF in decimal) is the classic blue from GT5.
   defaultUIColor: #FFFFFF
 
   # Use VBO cache for multiblock preview.
-  # Disable it if you have issues with rendering multiblocks.
+  # Disable if you have issues with rendering multiblocks.
   # Default: true
   useVBO: true
 
@@ -317,12 +317,66 @@ tools:
   # Default: 16
   sprayCanChainLength: 16
 
+  # NanoSaber Options
+  nanoSaber:
+    # The additional damage added when the NanoSaber is powered.
+    # Default: 20.0
+    nanoSaberDamageBoost: 20.0
+
+    # The base damage of the NanoSaber.
+    # Default: 5.0
+    nanoSaberBaseDamage: 5.0
+
+    # Should Zombies spawn with charged, active NanoSabers on hard difficulty?
+    # Default: true
+    zombieSpawnWithSabers: true
+
+    # The EU/t consumption of the NanoSaber.
+    # Default: 64
+    energyConsumption: 64
+
+  # NightVision Goggles Voltage Tier. Default: 1 (LV)
+  voltageTierNightVision: 1
+
+  # NanoSuit Voltage Tier. Default: 3 (HV)
+  voltageTierNanoSuit: 3
+
+  # Advanced NanoSuit Chestplate Voltage Tier.
+  # Default: 3 (HV)
+  voltageTierAdvNanoSuit: 3
+
+  # QuarkTech Suit Voltage Tier.
+  # Default: 5 (IV)
+  voltageTierQuarkTech: 5
+
+  # Advanced QuarkTech Suit Chestplate Voltage Tier.
+  # Default: 5 (LuV)
+  voltageTierAdvQuarkTech: 6
+
+  # Electric Impeller Jetpack Voltage Tier.
+  # Default: 2 (MV)
+  voltageTierImpeller: 2
+
+  # Advanced Electric Jetpack Voltage Tier.
+  # Default: 3 (HV)
+  voltageTierAdvImpeller: 3
+
 # Config options for Game Mechanics
 gameplay:
   # Enable hazardous materials
   # Default: true
   hazardsEnabled: true
 
+  # Whether hazards are applied to all valid items, or just GT's.
+  # true = all, false = GT only.
+  # Default: true
+  universalHazards: true
+
+  # Whether the GTCEu's ingame guidebook, 'Compass', be enabled.
+  # WARNING: INCOMPLETE
+  # Default: false
+  enableCompass: false
+
 # Config options for Mod Compatibility
 compat:
   # Config options regarding GTEU compatibility with other energy systems
@@ -346,6 +400,8 @@ compat:
     # Default: 4 FE/Energy == 1 EU
     euToPlatformRatio: 4
 
+  # Config options regarding GTCEu compatibility with AE2
+  ae2:
   # Whether to hide facades of all blocks in JEI and creative search menu.
   # Default: true
   hideFacadesInJEI: true
@@ -354,12 +410,16 @@ compat:
   # Default: true
   hideFilledCellsInJEI: true
 
+  # Whether to hide the ore processing diagrams in JEI
+  # Default: false
+  hideOreProcessingDiagrams: false
+
   # Whether Gregtech should remove smelting recipes from the vanilla furnace for ingots requiring the Electric Blast Furnace.
   # Default: true
   removeSmeltingForEBFMetals: true
 
 dev:
-  # Debug general events? (will print placed veins to server's debug.log)
+  # Debug general events? (will print recipe conficts etc. to server's debug.log)
   # Default: false
   debug: false
 

diff --git a/config/infernalmobs.cfg b/config/infernalmobs.cfg
@@ -129,7 +129,9 @@
     "SnowGuardian": true,
     "ZombieVillager": true,
     "MistWolf": true,
-    "Phantom": true
+    "Phantom": true,
+    "MimicEntity": true,
+    "Drowned": true
   },
   "entitiesalwaysinfernal": {
     "FireBeetle": false,
@@ -167,7 +169,9 @@
     "SnowGuardian": false,
     "ZombieVillager": false,
     "MistWolf": false,
-    "Phantom": false
+    "Phantom": false,
+    "MimicEntity": false,
+    "Drowned": false
   },
   "entitybasehealth": {
     "SkeletonDruid": 20.0,
@@ -193,6 +197,7 @@
     "Witch": 26.0,
     "MistWolf": 30.0,
     "Phantom": 20.0,
-    "ZombieVillager": 20.0
+    "ZombieVillager": 20.0,
+    "MimicEntity": 60.0
   }
 }
diff --git a/kubejs/server_scripts/oreveins/common.js b/kubejs/server_scripts/oreveins/common.js
@@ -84,24 +84,25 @@ GTCEuServerEvents.oreVeins(event => {
             .placement("above")
         )
     })
-    event.add('kubejs:vermiculite', vein => {
-        vein.weight(80)
-        vein.clusterSize(35)
-        vein.density(0.75)
-        vein.layer('all')
-        vein.dimensions(OVERWORLD)
-        vein.heightRangeUniform(80, 200)
-        vein.dikeVeinGenerator(generator => generator
-            .withBlock(GTMaterials.Chalcocite, 3, 80, 200)
-            .withBlock(GTMaterials.get('vermiculite'), 2, 80, 200)
-            .withBlock(GTMaterials.Cassiterite, 2, 80, 200)
-            .withBlock(GTMaterials.Alunite, 1, 80, 200)
-        )
-        vein.surfaceIndicatorGenerator(indicator => indicator
-            .surfaceRock(GTMaterials.get('vermiculite'))
-            .placement("above")
-        )
-    })
+    // TODO: wait GTM update to support custom material ore vein.
+    // event.add('kubejs:vermiculite', vein => {
+    //     vein.weight(80)
+    //     vein.clusterSize(35)
+    //     vein.density(0.75)
+    //     vein.layer('all')
+    //     vein.dimensions(OVERWORLD)
+    //     vein.heightRangeUniform(80, 200)
+    //     vein.dikeVeinGenerator(generator => generator
+    //         .withBlock(GTMaterials.Chalcocite, 3, 80, 200)
+    //         .withBlock(GTMaterials.get('vermiculite'), 2, 80, 200)
+    //         .withBlock(GTMaterials.Cassiterite, 2, 80, 200)
+    //         .withBlock(GTMaterials.Alunite, 1, 80, 200)
+    //     )
+    //     vein.surfaceIndicatorGenerator(indicator => indicator
+    //         .surfaceRock(GTMaterials.get('vermiculite'))
+    //         .placement("above")
+    //     )
+    // })
     event.add('kubejs:oil_sand', vein => {
         vein.weight(40)
         vein.clusterSize(40)
@@ -283,29 +284,30 @@ GTCEuServerEvents.oreVeins(event => {
             .placement("above")
         )
     })
-    event.add('kubejs:lignite', vein => {
-        vein.weight(160)
-        vein.clusterSize(50)
-        vein.density(0.6)
-        vein.layer('all')
-        vein.dimensions(OVERWORLD)
-        vein.heightRangeUniform(80, 140)
-        vein.veinedVeinGenerator(generator => generator
-            .oreBlock(GTMaterials.get('lignite'), 3)
-            .rareBlock(GTMaterials.Coal, 1)
-            .rareBlockChance(0.1)
-            .veininessThreshold(0.1)
-            .maxRichnessThreshold(0.175)
-            .minRichness(0.4)
-            .maxRichness(0.7)
-            .edgeRoundoffBegin(3)
-            .maxEdgeRoundoff(0.1)
-        )
-        vein.surfaceIndicatorGenerator(indicator => indicator
-            .surfaceRock(GTMaterials.get('lignite'))
-            .placement("above")
-        )
-    })
+    // TODO: wait GTM update to support custom material ore vein.
+    // event.add('kubejs:lignite', vein => {
+    //     vein.weight(160)
+    //     vein.clusterSize(50)
+    //     vein.density(0.6)
+    //     vein.layer('all')
+    //     vein.dimensions(OVERWORLD)
+    //     vein.heightRangeUniform(80, 140)
+    //     vein.veinedVeinGenerator(generator => generator
+    //         .oreBlock(GTMaterials.get('lignite'), 3)
+    //         .rareBlock(GTMaterials.Coal, 1)
+    //         .rareBlockChance(0.1)
+    //         .veininessThreshold(0.1)
+    //         .maxRichnessThreshold(0.175)
+    //         .minRichness(0.4)
+    //         .maxRichness(0.7)
+    //         .edgeRoundoffBegin(3)
+    //         .maxEdgeRoundoff(0.1)
+    //     )
+    //     vein.surfaceIndicatorGenerator(indicator => indicator
+    //         .surfaceRock(GTMaterials.get('lignite'))
+    //         .placement("above")
+    //     )
+    // })
     event.add('kubejs:apatite', vein => {
         vein.weight(60)
         vein.clusterSize(25)

diff --git a/mods/.index/gregtechceu-modern.pw.toml b/mods/.index/gregtechceu-modern.pw.toml