diff --git a/src/main/java/forestry/api/arboriculture/IWoodAccess.java b/src/main/java/forestry/api/arboriculture/IWoodAccess.java index 06abffac0..58624ffbb 100644 --- a/src/main/java/forestry/api/arboriculture/IWoodAccess.java +++ b/src/main/java/forestry/api/arboriculture/IWoodAccess.java @@ -27,4 +27,5 @@ public interface IWoodAccess { List getRegisteredWoodTypes(); + void register(IWoodType woodType, WoodBlockKind woodBlockKind, boolean fireproof, IBlockState blockState, ItemStack itemStack); } diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index 084bb38ce..5e48be22e 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -142,7 +142,7 @@ public class PluginArboriculture extends BlankForestryPlugin { TreeManager.treeFactory = new TreeFactory(); TreeManager.treeMutationFactory = new TreeMutationFactory(); - TreeManager.woodAccess = new WoodAccess(); + TreeManager.woodAccess = WoodAccess.getInstance(); // Init tree interface TreeManager.treeRoot = new TreeRoot(); @@ -161,7 +161,7 @@ public class PluginArboriculture extends BlankForestryPlugin { @Override public void disabledSetupAPI() { - TreeManager.woodAccess = new WoodAccess(); + TreeManager.woodAccess = WoodAccess.getInstance(); // Capabilities CapabilityManager.INSTANCE.register(IArmorNaturalist.class, new NullStorage<>(), () -> ArmorNaturalist.INSTANCE); @@ -181,27 +181,29 @@ public class PluginArboriculture extends BlankForestryPlugin { BlockRegistryArboriculture blocks = getBlocks(); - WoodAccess.registerLogs(blocks.logs); - WoodAccess.registerPlanks(blocks.planks); - WoodAccess.registerSlabs(blocks.slabs); - WoodAccess.registerFences(blocks.fences); - WoodAccess.registerFenceGates(blocks.fenceGates); - WoodAccess.registerStairs(blocks.stairs); - WoodAccess.registerDoors(blocks.doors); + WoodAccess woodAccess = WoodAccess.getInstance(); - WoodAccess.registerLogs(blocks.logsFireproof); - WoodAccess.registerPlanks(blocks.planksFireproof); - WoodAccess.registerSlabs(blocks.slabsFireproof); - WoodAccess.registerFences(blocks.fencesFireproof); - WoodAccess.registerFenceGates(blocks.fenceGatesFireproof); - WoodAccess.registerStairs(blocks.stairsFireproof); + woodAccess.registerLogs(blocks.logs); + woodAccess.registerPlanks(blocks.planks); + woodAccess.registerSlabs(blocks.slabs); + woodAccess.registerFences(blocks.fences); + woodAccess.registerFenceGates(blocks.fenceGates); + woodAccess.registerStairs(blocks.stairs); + woodAccess.registerDoors(blocks.doors); - WoodAccess.registerLogs(blocks.logsVanillaFireproof); - WoodAccess.registerPlanks(blocks.planksVanillaFireproof); - WoodAccess.registerSlabs(blocks.slabsVanillaFireproof); - WoodAccess.registerFences(blocks.fencesVanillaFireproof); - WoodAccess.registerFenceGates(blocks.fenceGatesVanillaFireproof); - WoodAccess.registerStairs(blocks.stairsVanillaFireproof); + woodAccess.registerLogs(blocks.logsFireproof); + woodAccess.registerPlanks(blocks.planksFireproof); + woodAccess.registerSlabs(blocks.slabsFireproof); + woodAccess.registerFences(blocks.fencesFireproof); + woodAccess.registerFenceGates(blocks.fenceGatesFireproof); + woodAccess.registerStairs(blocks.stairsFireproof); + + woodAccess.registerLogs(blocks.logsVanillaFireproof); + woodAccess.registerPlanks(blocks.planksVanillaFireproof); + woodAccess.registerSlabs(blocks.slabsVanillaFireproof); + woodAccess.registerFences(blocks.fencesVanillaFireproof); + woodAccess.registerFenceGates(blocks.fenceGatesVanillaFireproof); + woodAccess.registerStairs(blocks.stairsVanillaFireproof); // Init rendering proxy.initializeModels(); diff --git a/src/main/java/forestry/arboriculture/WoodAccess.java b/src/main/java/forestry/arboriculture/WoodAccess.java index 2850882f8..2b5b34d5c 100644 --- a/src/main/java/forestry/arboriculture/WoodAccess.java +++ b/src/main/java/forestry/arboriculture/WoodAccess.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; import java.util.EnumMap; @@ -41,87 +42,73 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; public class WoodAccess implements IWoodAccess { - private static final Map woodMaps = new EnumMap<>(WoodBlockKind.class); - private static final List registeredWoodTypes = new ArrayList<>(); + @Nullable + private static WoodAccess INSTANCE; - static { + public static WoodAccess getInstance() { + if (INSTANCE == null) { + INSTANCE = new WoodAccess(); + } + return INSTANCE; + } + + private final Map woodMaps = new EnumMap<>(WoodBlockKind.class); + private final List registeredWoodTypes = new ArrayList<>(); + + private WoodAccess() { for (WoodBlockKind woodBlockKind : WoodBlockKind.values()) { woodMaps.put(woodBlockKind, new WoodMap(woodBlockKind)); } registerVanilla(); } - private static class WoodMap { - private final Map normalItems = new HashMap<>(); - private final Map fireproofItems = new HashMap<>(); - private final Map normalBlocks = new HashMap<>(); - private final Map fireproofBlocks = new HashMap<>(); - private final WoodBlockKind woodBlockKind; - - public WoodMap(WoodBlockKind woodBlockKind) { - this.woodBlockKind = woodBlockKind; - } - - public String getName() { - return woodBlockKind.name(); - } - - public Map getItem(boolean fireproof) { - return fireproof ? this.fireproofItems : this.normalItems; - } - - public Map getBlock(boolean fireproof) { - return fireproof ? this.fireproofBlocks : this.normalBlocks; - } - } - - public static void registerLogs(List blocks) { + public void registerLogs(List blocks) { for (BlockForestryLog block : blocks) { //noinspection unchecked registerWithVariants(block, WoodBlockKind.LOG, block.getVariant()); } } - public static void registerPlanks(List blocks) { + public void registerPlanks(List blocks) { for (BlockForestryPlanks block : blocks) { //noinspection unchecked registerWithVariants(block, WoodBlockKind.PLANKS, block.getVariant()); } } - public static void registerSlabs(List blocks) { + public void registerSlabs(List blocks) { for (BlockForestrySlab block : blocks) { //noinspection unchecked registerWithVariants(block, WoodBlockKind.SLAB, block.getVariant()); } } - public static void registerFences(List blocks) { + public void registerFences(List blocks) { for (BlockForestryFence block : blocks) { //noinspection unchecked registerWithVariants(block, WoodBlockKind.FENCE, block.getVariant()); } } - public static void registerFenceGates(List blocks) { + public void registerFenceGates(List blocks) { for (BlockForestryFenceGate block : blocks) { registerWithoutVariants(block, WoodBlockKind.FENCE_GATE); } } - public static void registerStairs(List blocks) { + public void registerStairs(List blocks) { for (BlockForestryStairs block : blocks) { registerWithoutVariants(block, WoodBlockKind.STAIRS); } } - public static void registerDoors(List blocks) { + public void registerDoors(List blocks) { for (BlockArbDoor block : blocks) { registerWithoutVariants(block, WoodBlockKind.DOOR); } } - private static void registerVanilla() { + private void registerVanilla() { IBlockState defaultLogState = Blocks.LOG.getDefaultState(); List oldLogTypes = Arrays.asList(EnumVanillaWoodType.OAK, EnumVanillaWoodType.SPRUCE, EnumVanillaWoodType.BIRCH, EnumVanillaWoodType.JUNGLE); for (EnumVanillaWoodType woodType : oldLogTypes) { @@ -183,7 +170,7 @@ public class WoodAccess implements IWoodAccess { register(EnumVanillaWoodType.DARK_OAK, WoodBlockKind.DOOR, false, Blocks.DARK_OAK_DOOR.getDefaultState(), new ItemStack(Items.DARK_OAK_DOOR)); } - private static & IWoodType> void registerWithVariants(T woodTyped, WoodBlockKind woodBlockKind, PropertyWoodType property) { + private & IWoodType> void registerWithVariants(T woodTyped, WoodBlockKind woodBlockKind, PropertyWoodType property) { boolean fireproof = woodTyped.isFireproof(); for (V value : property.getAllowedValues()) { @@ -201,7 +188,7 @@ public class WoodAccess implements IWoodAccess { /** * Register wood blocks that have no variant property */ - private static void registerWithoutVariants(T woodTyped, WoodBlockKind woodBlockKind) { + private void registerWithoutVariants(T woodTyped, WoodBlockKind woodBlockKind) { boolean fireproof = woodTyped.isFireproof(); IBlockState blockState = woodTyped.getDefaultState(); IWoodType woodType = woodTyped.getWoodType(0); @@ -212,7 +199,8 @@ public class WoodAccess implements IWoodAccess { register(woodType, woodBlockKind, fireproof, blockState, itemStack); } - private static void register(IWoodType woodType, WoodBlockKind woodBlockKind, boolean fireproof, IBlockState blockState, ItemStack itemStack) { + @Override + public void register(IWoodType woodType, WoodBlockKind woodBlockKind, boolean fireproof, IBlockState blockState, ItemStack itemStack) { if (woodBlockKind == WoodBlockKind.DOOR) { fireproof = true; } @@ -257,4 +245,28 @@ public class WoodAccess implements IWoodAccess { public List getRegisteredWoodTypes() { return registeredWoodTypes; } + + private static class WoodMap { + private final Map normalItems = new HashMap<>(); + private final Map fireproofItems = new HashMap<>(); + private final Map normalBlocks = new HashMap<>(); + private final Map fireproofBlocks = new HashMap<>(); + private final WoodBlockKind woodBlockKind; + + public WoodMap(WoodBlockKind woodBlockKind) { + this.woodBlockKind = woodBlockKind; + } + + public String getName() { + return woodBlockKind.name(); + } + + public Map getItem(boolean fireproof) { + return fireproof ? this.fireproofItems : this.normalItems; + } + + public Map getBlock(boolean fireproof) { + return fireproof ? this.fireproofBlocks : this.normalBlocks; + } + } }