Optimization and compat fixes

Fixed registering mods based on compat Optimized register methods in modblocks and moditems classes
Pxl-8 · Feb 13, 2020 · becf05a · becf05a
1 parent a046254
commit becf05a
Show file tree

Hide file tree

Showing 8 changed files with 267 additions and 368 deletions.
diff --git a/compat_list.md b/compat_list.md
@@ -93,14 +93,15 @@
 |# **Aroma Dim** ad.
 |oreSticky                       |aroma1997sdimension:miningore/0             |minecraft:slime_ball                |minecraft:slime_ball                        |aroma1997sdimension:blocks/stickyore
 |oreClay                         |aroma1997sdimension:miningore/1             |minecraft:clay_ball                 |minecraft:clay_ball                         |aroma1997sdimension:blocks/clayore
-|# **Embers**
+|# **Embers** em.
 |oreCopper                       |embers:ore_copper                           |embers:ingot_copper                 |null                                        |embers:blocks/ore_copper_vanilla
 |oreLead                         |embers:ore_lead                             |embers:ingot_lead                   |null                                        |embers:blocks/ore_lead_vanilla
 |oreSilver                       |embers:ore_silver                           |embers:ingot_silver                 |null                                        |embers:blocks/ore_silver_vanilla
 |oreAluminum                     |embers:ore_aluminum                         |embers:ingot_aluminum               |null                                        |embers:blocks/ore_aluminum_vanilla
 |oreNickel                       |embers:ore_nickel                           |embers:ingot_nickel                 |null                                        |embers:blocks/ore_nickel_vanilla
 |oreTin                          |embers:ore_tin                              |embers:ingot_tin                    |null                                        |embers:blocks/ore_tin_vanilla
-|# **Mekanism**
+|oreQuartz                       |embers:ore_quartz                           |null                                |minecraft:quartz                            |embers:blocks/ore_quartz
+|# **Mekanism** mk.
 |oreOsmium                       |mekanism:oreblock/0                         |mekanism:ingot/1                    |mekanism:dust/2                             |mekanism:blocks/osmiumore
 |oreCopper                       |mekanism:oreblock/1                         |mekanism:ingot/5                    |mekanism:dust/3                             |mekanism:blocks/copperore
 |oreTin                          |mekanism:oreblock/2                         |mekanism:ingot/6                    |mekanism:dust/4                             |mekanism:blocks/tinore

diff --git a/src/main/java/network/pxl8/geoexpansion/common/blocks/ModBlocks.java b/src/main/java/network/pxl8/geoexpansion/common/blocks/ModBlocks.java
diff --git a/src/main/java/network/pxl8/geoexpansion/common/event/Register.java b/src/main/java/network/pxl8/geoexpansion/common/event/Register.java
@@ -53,15 +53,40 @@ public static void registerItems(RegistryEvent.Register<Item> event) {
 
     //Recipe register methods
     public static void registerOreDictionary(){
-        for (ItemOreCluster cluster : ModItems.oreClusterList) { if (cluster.getOredict() != null) OreDictionary.registerOre(cluster.getOredict(), cluster); }
-        for (ItemCrystalCluster cluster : ModItems.crystalClusterList) { if (cluster.getOredict() != null) OreDictionary.registerOre(cluster.getOredict(), cluster); }
-        for (ItemDustCluster cluster : ModItems.dustClusterList) { if (cluster.getOredict() != null) OreDictionary.registerOre(cluster.getOredict(), cluster); }
+        for (ItemOreCluster cluster : ModItems.oreClusterList) {
+            if (cluster.getOredict() != null) {
+                OreDictionary.registerOre(cluster.getOredict(), cluster);
+            }
+        }
+
+        for (ItemCrystalCluster cluster : ModItems.crystalClusterList) {
+            if (cluster.getOredict() != null) {
+                OreDictionary.registerOre(cluster.getOredict(), cluster);
+            }
+        }
+        for (ItemDustCluster cluster : ModItems.dustClusterList) {
+            if (cluster.getOredict() != null) {
+                OreDictionary.registerOre(cluster.getOredict(), cluster);
+            }
+        }
 
         //for (ItemSpallingHammer hammer : ModItems.spallingHammerList) { OreDictionary.registerOre("toolSpallingHammer", new ItemStack(hammer, 1, WILDCARD_VALUE)); }
 
-        for (ItemOreCluster cluster : ModItems.oreClusterListCompat) { if (cluster.getOredict() != null) OreDictionary.registerOre(cluster.getOredict(), cluster); }
-        for (ItemCrystalCluster cluster : ModItems.crystalClusterListCompat) { if (cluster.getOredict() != null) OreDictionary.registerOre(cluster.getOredict(), cluster); }
-        for (ItemDustCluster cluster : ModItems.dustClusterListCompat) { if (cluster.getOredict() != null) OreDictionary.registerOre(cluster.getOredict(), cluster); }
+        for (ItemOreCluster cluster : ModItems.oreClusterListCompat) {
+            if (cluster.getOredict() != null) {
+                OreDictionary.registerOre(cluster.getOredict(), cluster);
+            }
+        }
+        for (ItemCrystalCluster cluster : ModItems.crystalClusterListCompat) {
+            if (cluster.getOredict() != null) {
+                OreDictionary.registerOre(cluster.getOredict(), cluster);
+            }
+        }
+        for (ItemDustCluster cluster : ModItems.dustClusterListCompat) {
+            if (cluster.getOredict() != null) {
+                OreDictionary.registerOre(cluster.getOredict(), cluster);
+            }
+        }
     }
 
     public static void registerFurnaceRecipes() {