diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ConfigManager.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ConfigManager.java index c702ecf..1a98fe0 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ConfigManager.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ConfigManager.java @@ -6,14 +6,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraftforge.common.config.ConfigCategory; +import net.minecraftforge.common.config.Configuration; + import com.jaquadro.minecraft.storagedrawers.api.config.IAddonConfig; import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig; import com.jaquadro.minecraft.storagedrawers.api.config.IIntegrationConfig; import com.jaquadro.minecraft.storagedrawers.api.config.IPacksConfig; import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig; -import net.minecraftforge.common.config.ConfigCategory; -import net.minecraftforge.common.config.Configuration; - import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; public class ConfigManager { @@ -190,19 +190,29 @@ public class ConfigManager { private class PacksConfig implements IPacksConfig { @Override - public boolean isNaturaPackEnabled() { return cache.enableNaturaPack; } + public boolean isNaturaPackEnabled() { + return cache.enableNaturaPack; + } @Override - public boolean isBopPackEnabled() { return cache.enableBopPack; } + public boolean isBopPackEnabled() { + return cache.enableBopPack; + } @Override - public boolean isForestryPackEnabled() { return cache.enableForestryPack; } + public boolean isForestryPackEnabled() { + return cache.enableForestryPack; + } @Override - public boolean isErebusPackEnabled() { return cache.enableErebusPack; } + public boolean isErebusPackEnabled() { + return cache.enableErebusPack; + } @Override - public boolean isMiscPackEnabled() { return cache.enableMiscPack; } + public boolean isMiscPackEnabled() { + return cache.enableMiscPack; + } } private class UserConfig implements IUserConfig { @@ -223,7 +233,9 @@ public class ConfigManager { } @Override - public IPacksConfig packsConfig() { return packsConfig; } + public IPacksConfig packsConfig() { + return packsConfig; + } } private static final String LANG_PREFIX = "storageDrawers.config."; @@ -406,15 +418,15 @@ public class ConfigManager { .setLanguageKey(LANG_PREFIX + "integration.enableGTNH").setRequiresMcRestart(true).getBoolean(); cache.enableNaturaPack = config.get(sectionPacks.getQualifiedName(), "enableNatura", true) - .setLanguageKey(LANG_PREFIX + "packs.enableNatura").setRequiresMcRestart(true).getBoolean(); + .setLanguageKey(LANG_PREFIX + "packs.enableNatura").setRequiresMcRestart(true).getBoolean(); cache.enableBopPack = config.get(sectionPacks.getQualifiedName(), "enableBiomesOPlenty", true) - .setLanguageKey(LANG_PREFIX + "packs.enableBop").setRequiresMcRestart(true).getBoolean(); + .setLanguageKey(LANG_PREFIX + "packs.enableBop").setRequiresMcRestart(true).getBoolean(); cache.enableForestryPack = config.get(sectionPacks.getQualifiedName(), "enableForestry", true) - .setLanguageKey(LANG_PREFIX + "packs.enableForestry").setRequiresMcRestart(true).getBoolean(); + .setLanguageKey(LANG_PREFIX + "packs.enableForestry").setRequiresMcRestart(true).getBoolean(); cache.enableErebusPack = config.get(sectionPacks.getQualifiedName(), "enableErebus", true) - .setLanguageKey(LANG_PREFIX + "packs.enableErebus").setRequiresMcRestart(true).getBoolean(); + .setLanguageKey(LANG_PREFIX + "packs.enableErebus").setRequiresMcRestart(true).getBoolean(); cache.enableMiscPack = config.get(sectionPacks.getQualifiedName(), "enableMisc", true) - .setLanguageKey(LANG_PREFIX + "packs.enableMisc").setRequiresMcRestart(true).getBoolean(); + .setLanguageKey(LANG_PREFIX + "packs.enableMisc").setRequiresMcRestart(true).getBoolean(); config.get(sectionBlocksFullDrawers1x1.getQualifiedName(), "enabled", true) .setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/CommonProxy.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/CommonProxy.java index 121c30a..6a162b4 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/CommonProxy.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/CommonProxy.java @@ -1,6 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.packs.erebus; -public class CommonProxy -{ +public class CommonProxy { } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/StorageDrawersPack.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/StorageDrawersPack.java index 0a59705..9920533 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/StorageDrawersPack.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/StorageDrawersPack.java @@ -4,16 +4,20 @@ import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; import com.jaquadro.minecraft.storagedrawers.packs.erebus.core.*; + import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +@Mod( + modid = StorageDrawersPack.MOD_ID, + name = StorageDrawersPack.MOD_NAME, + version = StorageDrawers.MOD_VERSION, + dependencies = "required-after:StorageDrawers;") +public class StorageDrawersPack { -@Mod(modid = StorageDrawersPack.MOD_ID, name = StorageDrawersPack.MOD_NAME, version = StorageDrawers.MOD_VERSION, dependencies = "required-after:StorageDrawers;") -public class StorageDrawersPack -{ public static final String MOD_ID = "StorageDrawersErebus"; public static final String MOD_NAME = "Storage Drawers: Erebus Pack"; public static final String SOURCE_PATH = "com.jaquadro.minecraft.storagedrawers.packs.erebus."; @@ -29,7 +33,7 @@ public class StorageDrawersPack public static CommonProxy proxy; @Mod.EventHandler - public void preInit (FMLPreInitializationEvent event) { + public void preInit(FMLPreInitializationEvent event) { if (!StorageDrawers.config.userConfig.packsConfig().isErebusPackEnabled()) { return; } @@ -38,7 +42,7 @@ public class StorageDrawersPack } @Mod.EventHandler - public void init (FMLInitializationEvent event) { + public void init(FMLInitializationEvent event) { if (!StorageDrawers.config.userConfig.packsConfig().isErebusPackEnabled()) { return; } @@ -48,7 +52,7 @@ public class StorageDrawersPack } @Mod.EventHandler - public void postInit (FMLPostInitializationEvent event) { + public void postInit(FMLPostInitializationEvent event) { if (!StorageDrawers.config.userConfig.packsConfig().isErebusPackEnabled()) { return; } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/DataResolver.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/DataResolver.java index 5573b27..20dda91 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/DataResolver.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/DataResolver.java @@ -1,53 +1,49 @@ package com.jaquadro.minecraft.storagedrawers.packs.erebus.core; +import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; + import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; import com.jaquadro.minecraft.storagedrawers.api.pack.BlockType; import com.jaquadro.minecraft.storagedrawers.api.pack.ExtendedDataResolver; -import com.jaquadro.minecraft.storagedrawers.api.pack.StandardDataResolver; + import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; -public class DataResolver extends ExtendedDataResolver -{ - public static String[] blockNames = new String[] { "Baobab", "Eucalyptus", "Mahogany", "Mossbark", "Asper", "Cypress", null, "White", "Bamboo", "Rotten", "Marshwood", null, null, null, "Scorched", "Varnished" }; - public static String[] textureNames = new String[] { "baobab", "eucalyptus", "mahogany", "mossbark", "asper", "cypress", null, "white", "bamboo", "rotten", "marshwood", null, null, null, "scorched", "varnished" }; +public class DataResolver extends ExtendedDataResolver { - public DataResolver (String modID) { + public static String[] blockNames = new String[] { "Baobab", "Eucalyptus", "Mahogany", "Mossbark", "Asper", + "Cypress", null, "White", "Bamboo", "Rotten", "Marshwood", null, null, null, "Scorched", "Varnished" }; + public static String[] textureNames = new String[] { "baobab", "eucalyptus", "mahogany", "mossbark", "asper", + "cypress", null, "white", "bamboo", "rotten", "marshwood", null, null, null, "scorched", "varnished" }; + + public DataResolver(String modID) { super(modID, blockNames); } @Override - public CreativeTabs getCreativeTabs (BlockType type) { + public CreativeTabs getCreativeTabs(BlockType type) { return ModCreativeTabs.getTabStorageDrawers(); } @Override - public String getUnlocalizedName (int meta) { - if (!isValidMetaValue(meta)) - return null; + public String getUnlocalizedName(int meta) { + if (!isValidMetaValue(meta)) return null; return textureNames[meta]; } @Override - public Block getBlock (BlockConfiguration blockConfig) { + public Block getBlock(BlockConfiguration blockConfig) { switch (blockConfig.getBlockType()) { case Drawers: - if (blockConfig.getDrawerCount() == 1) - return ModBlocks.fullDrawers1; - if (blockConfig.getDrawerCount() == 2 && !blockConfig.isHalfDepth()) - return ModBlocks.fullDrawers2; - if (blockConfig.getDrawerCount() == 4 && !blockConfig.isHalfDepth()) - return ModBlocks.fullDrawers4; - if (blockConfig.getDrawerCount() == 2 && blockConfig.isHalfDepth()) - return ModBlocks.halfDrawers2; - if (blockConfig.getDrawerCount() == 4 && blockConfig.isHalfDepth()) - return ModBlocks.halfDrawers4; + if (blockConfig.getDrawerCount() == 1) return ModBlocks.fullDrawers1; + if (blockConfig.getDrawerCount() == 2 && !blockConfig.isHalfDepth()) return ModBlocks.fullDrawers2; + if (blockConfig.getDrawerCount() == 4 && !blockConfig.isHalfDepth()) return ModBlocks.fullDrawers4; + if (blockConfig.getDrawerCount() == 2 && blockConfig.isHalfDepth()) return ModBlocks.halfDrawers2; + if (blockConfig.getDrawerCount() == 4 && blockConfig.isHalfDepth()) return ModBlocks.halfDrawers4; break; case DrawersSorting: - if (blockConfig.getDrawerCount() == 1) - return RefinedRelocation.fullDrawers1; + if (blockConfig.getDrawerCount() == 1) return RefinedRelocation.fullDrawers1; if (blockConfig.getDrawerCount() == 2 && !blockConfig.isHalfDepth()) return RefinedRelocation.fullDrawers2; if (blockConfig.getDrawerCount() == 4 && !blockConfig.isHalfDepth()) @@ -66,19 +62,27 @@ public class DataResolver extends ExtendedDataResolver } @Override - public void init () { + public void init() { Block planks = GameRegistry.findBlock("erebus", "planks"); for (int i = 0, p = 0; i < 6; i++, p++) setPlankSlab(i, planks, p, GameRegistry.findBlock("erebus", getPlankName(getUnlocalizedName(i))), 0); for (int i = 7, p = 7; i < 11; i++, p++) setPlankSlab(i, planks, p, GameRegistry.findBlock("erebus", getPlankName(getUnlocalizedName(i))), 0); - for (int i = 14, p = 14; i < 15; i++, p++) - setPlankSlab(i, GameRegistry.findBlock("erebus", "planks_scorched"), p, GameRegistry.findBlock("erebus", getPlankName(getUnlocalizedName(i))), 0); - for (int i = 15, p = 15; i < 16; i++, p++) - setPlankSlab(i, GameRegistry.findBlock("erebus", "planks_varnished"), p, GameRegistry.findBlock("erebus", getPlankName(getUnlocalizedName(i))), 0); + for (int i = 14, p = 14; i < 15; i++, p++) setPlankSlab( + i, + GameRegistry.findBlock("erebus", "planks_scorched"), + p, + GameRegistry.findBlock("erebus", getPlankName(getUnlocalizedName(i))), + 0); + for (int i = 15, p = 15; i < 16; i++, p++) setPlankSlab( + i, + GameRegistry.findBlock("erebus", "planks_varnished"), + p, + GameRegistry.findBlock("erebus", getPlankName(getUnlocalizedName(i))), + 0); } - private String getPlankName (String name) { + private String getPlankName(String name) { return "slabPlanks" + Character.toUpperCase(name.charAt(0)) + name.substring(1); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/ModBlocks.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/ModBlocks.java index 66f5526..def7457 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/ModBlocks.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/ModBlocks.java @@ -1,5 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.packs.erebus.core; +import net.minecraft.block.Block; + import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig; @@ -8,11 +10,11 @@ import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; import com.jaquadro.minecraft.storagedrawers.api.pack.IPackBlockFactory; import com.jaquadro.minecraft.storagedrawers.api.pack.IPackDataResolver; import com.jaquadro.minecraft.storagedrawers.packs.erebus.StorageDrawersPack; -import cpw.mods.fml.common.registry.GameData; -import net.minecraft.block.Block; -public class ModBlocks -{ +import cpw.mods.fml.common.registry.GameData; + +public class ModBlocks { + public static Block fullDrawers1; public static Block fullDrawers2; public static Block fullDrawers4; @@ -20,10 +22,9 @@ public class ModBlocks public static Block halfDrawers4; public static Block trim; - public void init () { + public void init() { IStorageDrawersApi api = StorageDrawersApi.instance(); - if (api == null) - return; + if (api == null) return; IPackBlockFactory factory = api.packFactory(); IPackDataResolver resolver = StorageDrawersPack.instance.resolver; @@ -61,11 +62,11 @@ public class ModBlocks } } - public static String getQualifiedName (Block block) { + public static String getQualifiedName(Block block) { return GameData.getBlockRegistry().getNameForObject(block); } - public static String makeName (String name) { + public static String makeName(String name) { return StorageDrawersPack.MOD_ID.toLowerCase() + "." + name; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/ModCreativeTabs.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/ModCreativeTabs.java index f6c8631..6db34e6 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/ModCreativeTabs.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/ModCreativeTabs.java @@ -1,37 +1,37 @@ package com.jaquadro.minecraft.storagedrawers.packs.erebus.core; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; + import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig; import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig; import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -public final class ModCreativeTabs -{ - private ModCreativeTabs () { } +public final class ModCreativeTabs { + + private ModCreativeTabs() {} private static CreativeTabs tabStorageDrawers = null; - public static CreativeTabs getTabStorageDrawers () { - if (tabStorageDrawers != null) - return tabStorageDrawers; + public static CreativeTabs getTabStorageDrawers() { + if (tabStorageDrawers != null) return tabStorageDrawers; IStorageDrawersApi api = StorageDrawersApi.instance(); - if (api == null) - return null; + if (api == null) return null; IUserConfig config = api.userConfig(); if (config.addonConfig().addonItemsUseSeparateTab() && config.addonConfig().showAddonItemsVanilla()) { - tabStorageDrawers = new CreativeTabs("storageDrawersErebus") - { + tabStorageDrawers = new CreativeTabs("storageDrawersErebus") { + @Override @SideOnly(Side.CLIENT) - public Item getTabIconItem () { + public Item getTabIconItem() { return getTabItem(); } }; @@ -40,10 +40,9 @@ public final class ModCreativeTabs return tabStorageDrawers; } - private static Item getTabItem () { + private static Item getTabItem() { IStorageDrawersApi api = StorageDrawersApi.instance(); - if (api == null) - return Item.getItemFromBlock(Blocks.chest); + if (api == null) return Item.getItemFromBlock(Blocks.chest); IBlockConfig blockConfig = api.userConfig().blockConfig(); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/RefinedRelocation.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/RefinedRelocation.java index d7f5ab1..9308f34 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/RefinedRelocation.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/RefinedRelocation.java @@ -1,5 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.packs.erebus.core; +import net.minecraft.block.Block; + import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig; @@ -8,11 +10,11 @@ import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; import com.jaquadro.minecraft.storagedrawers.api.pack.IPackBlockFactory; import com.jaquadro.minecraft.storagedrawers.api.pack.IPackDataResolver; import com.jaquadro.minecraft.storagedrawers.packs.erebus.StorageDrawersPack; -import cpw.mods.fml.common.Loader; -import net.minecraft.block.Block; -public class RefinedRelocation -{ +import cpw.mods.fml.common.Loader; + +public class RefinedRelocation { + public static Block fullDrawers1; public static Block fullDrawers2; public static Block fullDrawers4; @@ -20,12 +22,12 @@ public class RefinedRelocation public static Block halfDrawers4; public static Block trim; - public static void init () { + public static void init() { IStorageDrawersApi api = StorageDrawersApi.instance(); - if (api == null) - return; + if (api == null) return; - if (!Loader.isModLoaded("RefinedRelocation") || !api.userConfig().integrationConfig().isRefinedRelocationEnabled()) + if (!Loader.isModLoaded("RefinedRelocation") + || !api.userConfig().integrationConfig().isRefinedRelocationEnabled()) return; IPackBlockFactory factory = api.packFactory();