Moving enums to registries part 5.

TerraFirmaCraft · Aug 12, 2018 · 96029c5 · 96029c5
1 parent 5b2d8d9
commit 96029c5
Show file tree

Hide file tree

Showing 17 changed files with 78 additions and 308 deletions.
diff --git a/src/main/java/net/dries007/tfc/api/ITreeGenerator.java b/src/main/java/net/dries007/tfc/api/ITreeGenerator.java
@@ -16,7 +16,6 @@
 import net.minecraft.world.gen.structure.template.TemplateManager;
 
 import net.dries007.tfc.api.types.Tree;
-import net.dries007.tfc.objects.blocks.BlocksTFC;
 
 public interface ITreeGenerator
 {
@@ -74,8 +73,8 @@ static boolean checkGenerationConditions(World world, BlockPos pos, Tree treeTyp
             if (!world.getBlockState(pos.up(y)).getMaterial().isReplaceable())
                 return false;
 
-        // Check if there is soil beneath
-        if (!BlocksTFC.isSoil(world.getBlockState(pos.down())))
+        // Check if there is a solid block beneath
+        if (!world.getBlockState(pos.down()).isNormalCube())
             return false;
 
         // Check the position for liquids, etc.

diff --git a/src/main/java/net/dries007/tfc/api/types/TFCRegistries.java b/src/main/java/net/dries007/tfc/api/types/TFCRegistries.java
@@ -22,11 +22,13 @@
 import net.minecraftforge.registries.IForgeRegistryEntry;
 import net.minecraftforge.registries.RegistryBuilder;
 
-import static net.dries007.tfc.Constants.MOD_ID;
+import static net.dries007.tfc.api.types.TFCRegistries.MOD_ID;
 
 @Mod.EventBusSubscriber(modid = MOD_ID)
 public class TFCRegistries
 {
+    static final String MOD_ID = "tfc"; // This is here to avoid a import statement.
+
     private static final ResourceLocation ROCK_TYPE = new ResourceLocation(MOD_ID, "rock_type");
     private static final ResourceLocation ROCK = new ResourceLocation(MOD_ID, "rock");
     private static final ResourceLocation ORE = new ResourceLocation(MOD_ID, "ore");

diff --git a/src/main/java/net/dries007/tfc/client/ClientRegisterEvents.java b/src/main/java/net/dries007/tfc/client/ClientRegisterEvents.java
@@ -29,13 +29,13 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import net.dries007.tfc.api.types.Ore;
 import net.dries007.tfc.api.types.Rock;
 import net.dries007.tfc.client.render.TESRChestTFC;
 import net.dries007.tfc.client.render.TESRIngotPile;
 import net.dries007.tfc.client.render.TESRPitKiln;
 import net.dries007.tfc.client.render.TESRWorldItem;
 import net.dries007.tfc.objects.Gem;
-import net.dries007.tfc.objects.OreEnum;
 import net.dries007.tfc.objects.blocks.BlockSlabTFC;
 import net.dries007.tfc.objects.blocks.BlocksTFC;
 import net.dries007.tfc.objects.blocks.stone.BlockFarmlandTFC;
@@ -80,10 +80,10 @@ public static void registerModels(ModelRegistryEvent event)
 
         for (ItemOreTFC item : ItemsTFC.getAllOreItems())
             if (item.ore.graded)
-                for (OreEnum.Grade grade : OreEnum.Grade.values())
+                for (Ore.Grade grade : Ore.Grade.values())
                     registerEnumBasedMetaItems("ore", grade, item);
             else
-                registerEnumBasedMetaItems("ore", OreEnum.Grade.NORMAL, item);
+                registerEnumBasedMetaItems("ore", Ore.Grade.NORMAL, item);
 
         for (Block block : BlocksTFC.getAllFluidBlocks())
             ModelLoader.setCustomStateMapper(block, new StateMap.Builder().ignore(BlockFluidBase.LEVEL).build());

diff --git a/src/main/java/net/dries007/tfc/objects/OreEnum.java b/src/main/java/net/dries007/tfc/objects/OreEnum.java
diff --git a/src/main/java/net/dries007/tfc/objects/Rock.java b/src/main/java/net/dries007/tfc/objects/Rock.java
diff --git a/src/main/java/net/dries007/tfc/objects/items/ItemFlat.java b/src/main/java/net/dries007/tfc/objects/items/ItemFlat.java
@@ -5,21 +5,22 @@
 
 package net.dries007.tfc.objects.items;
 
-import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Map;
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import net.minecraft.item.ItemStack;
 
 import mcp.MethodsReturnNonnullByDefault;
+import net.dries007.tfc.api.types.Rock;
 import net.dries007.tfc.api.util.Size;
 import net.dries007.tfc.api.util.Weight;
-import net.dries007.tfc.objects.Rock;
 
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
 public final class ItemFlat extends ItemTFC
 {
-    private static final EnumMap<Rock, ItemFlat> ROCK_MAP = new EnumMap<>(Rock.class);
+    private static final Map<Rock, ItemFlat> ROCK_MAP = new HashMap<>();
 
     public ItemFlat()
     {

diff --git a/src/main/java/net/dries007/tfc/objects/items/ItemsTFC.java b/src/main/java/net/dries007/tfc/objects/items/ItemsTFC.java
@@ -19,13 +19,14 @@
 import net.minecraftforge.registries.IForgeRegistry;
 
 import net.dries007.tfc.api.types.Ore;
+import net.dries007.tfc.api.types.Rock;
+import net.dries007.tfc.api.types.RockCategory;
 import net.dries007.tfc.api.types.Tree;
 import net.dries007.tfc.api.util.Size;
 import net.dries007.tfc.api.util.Weight;
 import net.dries007.tfc.objects.Gem;
 import net.dries007.tfc.objects.Metal;
 import net.dries007.tfc.objects.Powder;
-import net.dries007.tfc.objects.Rock;
 import net.dries007.tfc.objects.blocks.BlockSlabTFC;
 import net.dries007.tfc.objects.blocks.BlocksTFC;
 import net.dries007.tfc.objects.blocks.wood.BlockDoorTFC;
@@ -138,7 +139,7 @@ public static void registerItems(RegistryEvent.Register<Item> event)
         for (Tree wood : Tree.values())
             simpleItems.add(register(r, "wood/lumber/" + wood.name(), new ItemLumberTFC(wood), CT_WOOD));
 
-        for (Rock.Category cat : Rock.Category.values())
+        for (RockCategory cat : RockCategory.values())
         {
             simpleItems.add(register(r, "stone/axe/" + cat.name().toLowerCase(), new ItemRockAxe(cat), CT_ROCK_ITEMS));
             simpleItems.add(register(r, "stone/shovel/" + cat.name().toLowerCase(), new ItemRockShovel(cat), CT_ROCK_ITEMS));

diff --git a/src/main/java/net/dries007/tfc/objects/items/rock/ItemBrickTFC.java b/src/main/java/net/dries007/tfc/objects/items/rock/ItemBrickTFC.java
@@ -5,23 +5,24 @@
 
 package net.dries007.tfc.objects.items.rock;
 
-import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Map;
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import net.minecraft.item.ItemStack;
 
 import mcp.MethodsReturnNonnullByDefault;
+import net.dries007.tfc.api.types.Rock;
 import net.dries007.tfc.api.util.Size;
 import net.dries007.tfc.api.util.Weight;
-import net.dries007.tfc.objects.Rock;
 import net.dries007.tfc.objects.items.ItemTFC;
 import net.dries007.tfc.util.OreDictionaryHelper;
 
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
 public class ItemBrickTFC extends ItemTFC
 {
-    private static final EnumMap<Rock, ItemBrickTFC> MAP = new EnumMap<>(Rock.class);
+    private static final Map<Rock, ItemBrickTFC> MAP = new HashMap<>();
 
     public static ItemBrickTFC get(Rock ore)
     {
@@ -42,7 +43,7 @@ public ItemBrickTFC(Rock rock)
         setMaxDamage(0);
         OreDictionaryHelper.register(this, "brick");
         OreDictionaryHelper.register(this, "brick", rock);
-        OreDictionaryHelper.register(this, "brick", rock.category);
+        OreDictionaryHelper.register(this, "brick", rock.getRockCategory());
     }
 
     @Override