Merge branch 'master' into dev

# Conflicts: # dependencies.gradle
GTNewHorizons · May 4, 2024 · b3505cb · b3505cb
2 parents 56846a4 + 284b933
commit b3505cb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,6 +1,6 @@
 dependencies {
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.01-pre:dev')
-    api("com.github.GTNewHorizons:bartworks:0.9.21:dev")
+    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.02:dev')
+    api("com.github.GTNewHorizons:bartworks:0.10.0:dev")
 
     implementation('curse.maven:cofh-core-69162:2388751')
     // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels

diff --git a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java
@@ -6,9 +6,12 @@
 import java.awt.event.ActionListener;
 import java.io.File;
 
+import net.minecraft.block.Block;
 import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.config.Configuration;
 
+import com.github.bartimaeusnek.crossmod.galacticgreg.GT_TileEntity_VoidMiner_Base;
+
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -26,6 +29,7 @@
 import gtPlusPlus.everglades.block.DarkWorldContentLoader;
 import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base;
+import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer;
 import gtPlusPlus.everglades.gen.gt.WorldGen_Ores;
 import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
@@ -77,6 +81,7 @@ public void load(final FMLInitializationEvent e) {
         GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE);
         getEvergladesBiome().load();
         Everglades_Dimension.load();
+        addToVoidMinerDrops();
     }
 
     public static synchronized void GenerateOreMaterials() {
@@ -151,6 +156,19 @@ protected synchronized void setVars(FMLPreInitializationEvent event) {
         DarkWorldContentLoader.run();
     }
 
+    public void addToVoidMinerDrops() {
+        for (WorldGen_GT_Ore_Layer t : WorldGen_Ores.validOreveins.values()) {
+            addVMDrop(t.mPrimaryMeta, 0, t.mWeight);
+            addVMDrop(t.mSecondaryMeta, 0, t.mWeight);
+            addVMDrop(t.mBetweenMeta, 0, t.mWeight);
+            addVMDrop(t.mSporadicMeta, 0, t.mWeight);
+        }
+    }
+
+    public void addVMDrop(Block block, int meta, float weight) {
+        GT_TileEntity_VoidMiner_Base.addBlockToDimensionList(CORE.EVERGLADES_ID, block, meta, weight);
+    }
+
     @EventHandler
     public void serverLoad(FMLServerStartingEvent event) {
         getEvergladesBiome().serverLoad(event);