Merge pull request #430 from LITW-Refined-New-Stories/feat/more-ores

register yellorit ore & improve check for TileEntities in DeepslateOreRegistry
Roadhog360 · Feb 26, 2024 · b971a9e · b971a9e
2 parents f72754a + 48599ce
commit b971a9e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/main/java/ganymedes01/etfuturum/compat/ExternalContent.java b/src/main/java/ganymedes01/etfuturum/compat/ExternalContent.java
@@ -40,6 +40,8 @@ public enum Blocks {
  DRACONIUM_ORE(() -> GameRegistry.findBlock("DraconicEvolution", "draconiumOre")),
 
  PROJECT_RED_ORE(() -> GameRegistry.findBlock("ProjRed|Exploration", "projectred.exploration.ore")),
+
+ BR_YELLORITE_ORE(() -> GameRegistry.findBlock("BigReactors", "YelloriteOre")),
 
  BP_TESLATITE_ORE(() -> GameRegistry.findBlock("bluepower", "teslatite_ore")),
  BP_RUBY_ORE(() -> GameRegistry.findBlock("bluepower", "ruby_ore")),

diff --git a/src/main/java/ganymedes01/etfuturum/compat/ModsList.java b/src/main/java/ganymedes01/etfuturum/compat/ModsList.java
@@ -35,6 +35,7 @@ public enum ModsList {
  ARS_MAGICA_2("arsmagica2"),
  MULTIPART("McMultipart"),
  DRACONIC_EVOLUTION("DraconicEvolution"),
+ BIG_REACTORS("BigReactors"),
 
  NOT_ENOUGH_IDS("neid"),
  ENDLESS_IDS("endlessids"),

diff --git a/src/main/java/ganymedes01/etfuturum/recipes/ModRecipes.java b/src/main/java/ganymedes01/etfuturum/recipes/ModRecipes.java
@@ -998,6 +998,12 @@ ore_dyes[dye], new ItemStack(Blocks.sand, 1, 0), new ItemStack(Blocks.sand, 1, 0
  }
  }
 
+ if (ModsList.BIG_REACTORS.isLoaded()) {
+ if (ConfigModCompat.moddedRawOres) {
+ registerOre("oreUranium", ExternalContent.Blocks.BR_YELLORITE_ORE.get());
+ }
+ }
+
  addShapelessRecipe(new ItemStack(Items.dye, 1, 9), ModBlocks.PINK_PETALS.get());
 
  registerModdedDeepslateOres();