diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java index 829fbbf..45f05e9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java @@ -20,13 +20,16 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; +import java.io.File; import net.minecraftforge.common.MinecraftForge; -import java.io.File; - -@Mod(modid = StorageDrawers.MOD_ID, name = StorageDrawers.MOD_NAME, version = StorageDrawers.MOD_VERSION, dependencies = "after:waila;", guiFactory = StorageDrawers.SOURCE_PATH + "core.ModGuiFactory") -public class StorageDrawers -{ +@Mod( + modid = StorageDrawers.MOD_ID, + name = StorageDrawers.MOD_NAME, + version = StorageDrawers.MOD_VERSION, + dependencies = "after:waila;", + guiFactory = StorageDrawers.SOURCE_PATH + "core.ModGuiFactory") +public class StorageDrawers { public static final String MOD_ID = "StorageDrawers"; public static final String MOD_NAME = "Storage Drawers"; public static final String MOD_VERSION = "GRADLETOKEN_VERSION"; @@ -56,7 +59,7 @@ public class StorageDrawers public static CommonProxy proxy; @Mod.EventHandler - public void preInit (FMLPreInitializationEvent event) { + public void preInit(FMLPreInitializationEvent event) { config = new ConfigManager(new File(event.getModConfigurationDirectory(), MOD_ID + ".cfg")); network = NetworkRegistry.INSTANCE.newSimpleChannel(MOD_ID); @@ -64,8 +67,7 @@ public class StorageDrawers if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { network.registerMessage(CountUpdateMessage.Handler.class, CountUpdateMessage.class, 1, Side.CLIENT); - } - else { + } else { network.registerMessage(CountUpdateMessage.HandlerStub.class, CountUpdateMessage.class, 1, Side.CLIENT); } @@ -82,7 +84,7 @@ public class StorageDrawers } @Mod.EventHandler - public void init (FMLInitializationEvent event) { + public void init(FMLInitializationEvent event) { proxy.registerRenderers(); NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler()); @@ -93,7 +95,7 @@ public class StorageDrawers } @Mod.EventHandler - public void postInit (FMLPostInitializationEvent event) { + public void postInit(FMLPostInitializationEvent event) { recipes.init(); IntegrationRegistry.instance().postInit(); @@ -102,8 +104,7 @@ public class StorageDrawers } @SubscribeEvent - public void onConfigChanged (ConfigChangedEvent.OnConfigChangedEvent event) { - if (event.modID.equals(MOD_ID)) - config.syncConfig(); + public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { + if (event.modID.equals(MOD_ID)) config.syncConfig(); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java index 04b0f35..55d1745 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java @@ -7,23 +7,22 @@ import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandlerRegistry import com.jaquadro.minecraft.storagedrawers.api.registry.IRenderRegistry; import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaRegistry; -public interface IStorageDrawersApi -{ +public interface IStorageDrawersApi { /** * Recipe handlers are used to make custom recipes compatible with compacting drawers. */ - IRecipeHandlerRegistry recipeHandlerRegistry (); + IRecipeHandlerRegistry recipeHandlerRegistry(); - IRenderRegistry renderRegistry (); + IRenderRegistry renderRegistry(); - IWailaRegistry wailaRegistry (); + IWailaRegistry wailaRegistry(); - IPackBlockFactory packFactory (); + IPackBlockFactory packFactory(); /** * User-managed configuration for the Storage Drawers mod. */ - IUserConfig userConfig (); + IUserConfig userConfig(); - void registerStandardPackRecipes (IExtendedDataResolver resolver); + void registerStandardPackRecipes(IExtendedDataResolver resolver); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java index f817108..016b19e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java @@ -3,8 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.api; /** * Entry point for the public API. */ -public class StorageDrawersApi -{ +public class StorageDrawersApi { private static IStorageDrawersApi instance; public static final String VERSION = "1.7.10-1.2.0"; @@ -14,13 +13,12 @@ public class StorageDrawersApi * * @return The {@link IStorageDrawersApi} instance or null if the API or Storage Drawers is unavailable. */ - public static IStorageDrawersApi instance () { + public static IStorageDrawersApi instance() { if (instance == null) { try { - Class classApi = Class.forName( "com.jaquadro.minecraft.storagedrawers.core.Api" ); + Class classApi = Class.forName("com.jaquadro.minecraft.storagedrawers.core.Api"); instance = (IStorageDrawersApi) classApi.getField("instance").get(null); - } - catch (Throwable t) { + } catch (Throwable t) { return null; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java index ca17579..55356ab 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java @@ -1,21 +1,20 @@ package com.jaquadro.minecraft.storagedrawers.api.config; -public interface IAddonConfig -{ +public interface IAddonConfig { /** * Gets whether the user has configured a preference for addon packs to hide their blocks and items from Vanilla * creative tabs. */ - boolean showAddonItemsNEI (); + boolean showAddonItemsNEI(); /** * Gets whether the user has configured a preference for addon packs to hide their blocks and items from NEI. */ - boolean showAddonItemsVanilla (); + boolean showAddonItemsVanilla(); /** * Gets whether the user has configured a preference for addon packs to provide their blocks and items through * their own vanilla tab. */ - boolean addonItemsUseSeparateTab (); + boolean addonItemsUseSeparateTab(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java index f4101e7..514578b 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java @@ -2,13 +2,12 @@ package com.jaquadro.minecraft.storagedrawers.api.config; import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; -public interface IBlockConfig -{ - String getBlockConfigName (BlockConfiguration blockConfig); +public interface IBlockConfig { + String getBlockConfigName(BlockConfiguration blockConfig); - boolean isBlockEnabled (String blockConfigName); + boolean isBlockEnabled(String blockConfigName); - int getBlockRecipeOutput (String blockConfigName); + int getBlockRecipeOutput(String blockConfigName); - int getBaseCapacity (String blockConfigName); + int getBaseCapacity(String blockConfigName); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java index fe18130..5739c1e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java @@ -1,8 +1,9 @@ package com.jaquadro.minecraft.storagedrawers.api.config; -public interface IIntegrationConfig -{ - boolean isRefinedRelocationEnabled (); - boolean isChiselEnabled (); - boolean isGTNHEnabled (); +public interface IIntegrationConfig { + boolean isRefinedRelocationEnabled(); + + boolean isChiselEnabled(); + + boolean isGTNHEnabled(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java index f7db9b7..bc9229b 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java @@ -3,20 +3,19 @@ package com.jaquadro.minecraft.storagedrawers.api.config; /** * The main hub for user-managed mod configuration. */ -public interface IUserConfig -{ +public interface IUserConfig { /** * Configuration options related to third party addon packs for Storage Drawers. */ - IAddonConfig addonConfig (); + IAddonConfig addonConfig(); /** * Configuration options related to individual blocks. */ - IBlockConfig blockConfig (); + IBlockConfig blockConfig(); /** * Configuration options related to third party mod integration. */ - IIntegrationConfig integrationConfig (); + IIntegrationConfig integrationConfig(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java index db4abd8..0582c9e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java @@ -2,4 +2,4 @@ package com.jaquadro.minecraft.storagedrawers.api.config; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java index f5dca19..866f371 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java @@ -9,11 +9,10 @@ import cpw.mods.fml.common.eventhandler.Event; * * This event is also called when the drawer is changed to empty. */ -public class DrawerPopulatedEvent extends Event -{ +public class DrawerPopulatedEvent extends Event { public final IDrawer drawer; - public DrawerPopulatedEvent (IDrawer drawer) { + public DrawerPopulatedEvent(IDrawer drawer) { this.drawer = drawer; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java index 2c8ad0e..04d56f3 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java @@ -2,4 +2,4 @@ package com.jaquadro.minecraft.storagedrawers.api.event; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IDrawerInventory.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IDrawerInventory.java index 47396c7..d0e1f41 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IDrawerInventory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IDrawerInventory.java @@ -3,14 +3,13 @@ package com.jaquadro.minecraft.storagedrawers.api.inventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; -public interface IDrawerInventory extends ISidedInventory -{ +public interface IDrawerInventory extends ISidedInventory { /** * Gets a drawer's group slot index from an IInventory slot index. * * @param inventorySlot An IInventory slot index returned from getInventorySlot. */ - int getDrawerSlot (int inventorySlot); + int getDrawerSlot(int inventorySlot); /** * Gets an IInventory slot index suitable for operations for the given type. @@ -18,18 +17,18 @@ public interface IDrawerInventory extends ISidedInventory * @param drawerSlot The index of the drawer within its group. * @param type The type of IInventory slot to return an index for. */ - int getInventorySlot (int drawerSlot, SlotType type); + int getInventorySlot(int drawerSlot, SlotType type); /** * Gets the type associated with a given IInventory slot index. * * @param inventorySlot An IInventory slot index returned from getInventorySlot. */ - SlotType getInventorySlotType (int inventorySlot); + SlotType getInventorySlotType(int inventorySlot); - boolean canInsertItem (int slot, ItemStack stack); + boolean canInsertItem(int slot, ItemStack stack); - boolean canExtractItem (int slot, ItemStack stack); + boolean canExtractItem(int slot, ItemStack stack); - boolean syncInventoryIfNeeded (); + boolean syncInventoryIfNeeded(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IInventoryAdapter.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IInventoryAdapter.java index 71f55e3..0c7a451 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IInventoryAdapter.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IInventoryAdapter.java @@ -2,15 +2,14 @@ package com.jaquadro.minecraft.storagedrawers.api.inventory; import net.minecraft.item.ItemStack; -public interface IInventoryAdapter -{ - ItemStack getInventoryStack (SlotType slotType); +public interface IInventoryAdapter { + ItemStack getInventoryStack(SlotType slotType); - void setInStack (ItemStack stack); + void setInStack(ItemStack stack); - void setOutStack (ItemStack stack); + void setOutStack(ItemStack stack); - void syncInventory (); + void syncInventory(); - boolean syncInventoryIfNeeded (); + boolean syncInventoryIfNeeded(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java index dbb002e..8736505 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java @@ -3,8 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.api.inventory; /** * Classifies different IInventory slots according to how they should be used. */ -public enum SlotType -{ +public enum SlotType { /** An inventory slot for input-only operations; stack sizes artificially held low. */ INPUT, diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/package-info.java index 1b5b4c3..30c0890 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/package-info.java @@ -2,4 +2,4 @@ package com.jaquadro.minecraft.storagedrawers.api.inventory; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java index 7807d17..edc6a36 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java @@ -1,7 +1,6 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; -public enum BlockConfiguration -{ +public enum BlockConfiguration { BasicFull1(BlockType.Drawers, 1, false), BasicFull2(BlockType.Drawers, 2, false), BasicFull4(BlockType.Drawers, 4, false), @@ -21,25 +20,25 @@ public enum BlockConfiguration private final int drawerCount; private final boolean halfDepth; - BlockConfiguration (BlockType type, int count, boolean half) { + BlockConfiguration(BlockType type, int count, boolean half) { this.type = type; this.drawerCount = count; - this.halfDepth = half; + this.halfDepth = half; } - public BlockType getBlockType () { + public BlockType getBlockType() { return type; } - public int getDrawerCount () { + public int getDrawerCount() { return drawerCount; } - public boolean isHalfDepth () { + public boolean isHalfDepth() { return halfDepth; } - public static BlockConfiguration by (BlockType type, int drawerCount, boolean halfDepth) { + public static BlockConfiguration by(BlockType type, int drawerCount, boolean halfDepth) { for (BlockConfiguration config : values()) { if (config.type == type && config.drawerCount == drawerCount && config.halfDepth == halfDepth) return config; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java index e2003fd..1bc58de 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java @@ -1,7 +1,6 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; -public enum BlockType -{ +public enum BlockType { Drawers, DrawersSorting, Trim, diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/ExtendedDataResolver.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/ExtendedDataResolver.java index 2cbdf45..879f984 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/ExtendedDataResolver.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/ExtendedDataResolver.java @@ -3,52 +3,49 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; -public class ExtendedDataResolver extends StandardDataResolver implements IExtendedDataResolver -{ +public class ExtendedDataResolver extends StandardDataResolver implements IExtendedDataResolver { private Block[] planks = new Block[16]; private int[] planksMeta = new int[16]; private Block[] slabs = new Block[16]; - private int[] slabsMeta = new int [16]; + private int[] slabsMeta = new int[16]; - public ExtendedDataResolver (String modID, String[] unlocalizedNames) { + public ExtendedDataResolver(String modID, String[] unlocalizedNames) { super(modID, unlocalizedNames); } - public ExtendedDataResolver (String modID, String[] unlocalizedNames, CreativeTabs creativeTab) { + public ExtendedDataResolver(String modID, String[] unlocalizedNames, CreativeTabs creativeTab) { super(modID, unlocalizedNames, creativeTab); } @Override - public Block getBlock (BlockConfiguration blockConfig) { + public Block getBlock(BlockConfiguration blockConfig) { return null; } @Override - public Block getPlankBlock (int meta) { + public Block getPlankBlock(int meta) { return planks[meta]; } @Override - public Block getSlabBlock (int meta) { + public Block getSlabBlock(int meta) { return slabs[meta]; } @Override - public int getPlankMeta (int meta) { + public int getPlankMeta(int meta) { return planksMeta[meta]; } @Override - public int getSlabMeta (int meta) { + public int getSlabMeta(int meta) { return slabsMeta[meta]; } - public void init () { + public void init() {} - } - - protected void setPlankSlab (int meta, Block plank, int plankMeta, Block slab, int slabMeta) { + protected void setPlankSlab(int meta, Block plank, int plankMeta, Block slab, int slabMeta) { if (plank != null) { planks[meta] = plank; planksMeta[meta] = plankMeta; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IExtendedDataResolver.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IExtendedDataResolver.java index 236784d..0ed22bf 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IExtendedDataResolver.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IExtendedDataResolver.java @@ -2,15 +2,14 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; import net.minecraft.block.Block; -public interface IExtendedDataResolver extends IPackDataResolver -{ - Block getBlock (BlockConfiguration blockConfig); +public interface IExtendedDataResolver extends IPackDataResolver { + Block getBlock(BlockConfiguration blockConfig); - Block getPlankBlock (int meta); + Block getPlankBlock(int meta); - Block getSlabBlock (int meta); + Block getSlabBlock(int meta); - int getPlankMeta (int meta); + int getPlankMeta(int meta); - int getSlabMeta (int meta); + int getSlabMeta(int meta); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackBlock.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackBlock.java index 7c33056..14e3f08 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackBlock.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackBlock.java @@ -1,6 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; -public interface IPackBlock -{ - IPackDataResolver getDataResolver (); +public interface IPackBlock { + IPackDataResolver getDataResolver(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackBlockFactory.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackBlockFactory.java index 0f399b0..f0e8846 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackBlockFactory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackBlockFactory.java @@ -1,29 +1,27 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; -public interface IPackBlockFactory -{ - Block createBlock (BlockConfiguration blockConfig, IPackDataResolver dataResolver); +public interface IPackBlockFactory { + Block createBlock(BlockConfiguration blockConfig, IPackDataResolver dataResolver); /** * Registers a factory-produced block with an appropriate item class. */ - void registerBlock (Block block, String name); + void registerBlock(Block block, String name); /** * Associates a sorting variant of a block with its corresponding basic block. */ - void bindSortingBlock (Block basicBlock, Block sortingBlock); + void bindSortingBlock(Block basicBlock, Block sortingBlock); /** * Hides block from NEI if NEI is active. */ - void hideBlock (String blockID); + void hideBlock(String blockID); /** * Registers block metadata from an initialized DataResolver with Storage Drawers. */ - void registerResolver (IExtendedDataResolver resolver); + void registerResolver(IExtendedDataResolver resolver); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackDataResolver.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackDataResolver.java index bc9627b..b10563b 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackDataResolver.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackDataResolver.java @@ -2,17 +2,16 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; import net.minecraft.creativetab.CreativeTabs; -public interface IPackDataResolver -{ - String getPackModID (); +public interface IPackDataResolver { + String getPackModID(); - String getBlockName (BlockConfiguration blockConfig); + String getBlockName(BlockConfiguration blockConfig); - CreativeTabs getCreativeTabs (BlockType type); + CreativeTabs getCreativeTabs(BlockType type); - boolean isValidMetaValue (int meta); + boolean isValidMetaValue(int meta); - String getUnlocalizedName (int meta); + String getUnlocalizedName(int meta); - String getTexturePath (TextureType type, int meta); + String getTexturePath(TextureType type, int meta); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/StandardDataResolver.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/StandardDataResolver.java index 3d3e4d3..90bacb0 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/StandardDataResolver.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/StandardDataResolver.java @@ -2,38 +2,36 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; import net.minecraft.creativetab.CreativeTabs; -public class StandardDataResolver implements IPackDataResolver -{ +public class StandardDataResolver implements IPackDataResolver { private String modID; private String[] unlocalizedNames; private CreativeTabs creativeTab; - public StandardDataResolver (String modID, String[] unlocalizedNames) { + public StandardDataResolver(String modID, String[] unlocalizedNames) { this.modID = modID; this.unlocalizedNames = unlocalizedNames; } - public StandardDataResolver (String modID, String[] unlocalizedNames, CreativeTabs creativeTab) { + public StandardDataResolver(String modID, String[] unlocalizedNames, CreativeTabs creativeTab) { this(modID, unlocalizedNames); this.creativeTab = creativeTab; } @Override - public String getPackModID () { + public String getPackModID() { return modID; } - protected String makeBlockName (String name) { + protected String makeBlockName(String name) { return getPackModID().toLowerCase() + "." + name; } @Override - public String getBlockName (BlockConfiguration blockConfig) { + public String getBlockName(BlockConfiguration blockConfig) { switch (blockConfig.getBlockType()) { case Drawers: case DrawersSorting: - if (blockConfig.getDrawerCount() == 1) - return makeBlockName("fullDrawers1"); + if (blockConfig.getDrawerCount() == 1) return makeBlockName("fullDrawers1"); if (blockConfig.getDrawerCount() == 2 && !blockConfig.isHalfDepth()) return makeBlockName("fullDrawers2"); if (blockConfig.getDrawerCount() == 4 && !blockConfig.isHalfDepth()) @@ -51,36 +49,34 @@ public class StandardDataResolver implements IPackDataResolver } @Override - public CreativeTabs getCreativeTabs (BlockType type) { + public CreativeTabs getCreativeTabs(BlockType type) { return creativeTab; } @Override - public boolean isValidMetaValue (int meta) { - if (meta < 0 || meta >= unlocalizedNames.length) - return false; + public boolean isValidMetaValue(int meta) { + if (meta < 0 || meta >= unlocalizedNames.length) return false; return unlocalizedNames != null && unlocalizedNames[meta] != null; } @Override - public String getUnlocalizedName (int meta) { - if (!isValidMetaValue(meta)) - return null; + public String getUnlocalizedName(int meta) { + if (!isValidMetaValue(meta)) return null; return unlocalizedNames[meta]; } - protected String getBaseTexturePath () { + protected String getBaseTexturePath() { return getPackModID() + ":"; } - protected String getTextureMetaName (int meta) { + protected String getTextureMetaName(int meta) { return getUnlocalizedName(meta); } @Override - public String getTexturePath (TextureType type, int meta) { + public String getTexturePath(TextureType type, int meta) { switch (type) { case Front1: return getBaseTexturePath() + "drawers_" + getTextureMetaName(meta) + "_front_1"; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java index e1c9eb0..423bc3f 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java @@ -1,7 +1,6 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; -public enum TextureType -{ +public enum TextureType { Front1, Front2, Front4, diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java index ec6cf36..314183f 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java @@ -2,4 +2,4 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java index e581c54..b2b58bf 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java @@ -1,4 +1,4 @@ @API(owner = "StorageDrawers", provides = "StorageDrawersAPI", apiVersion = StorageDrawersApi.VERSION) package com.jaquadro.minecraft.storagedrawers.api; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java index a7432b2..714bc6d 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java @@ -7,13 +7,12 @@ import net.minecraft.item.ItemStack; * registered an IRecipeHandler that returns lists of objects that aren't ItemStacks, then you will need to * implement an ingredient handler for those objects. */ -public interface IIngredientHandler -{ +public interface IIngredientHandler { /** * Gets an ItemStack from an object that represents an ingredient in an IRecipe. * * @param object An ingredient object. * @return An ItemStack for the given ingredient. */ - ItemStack getItemStack (Object object); + ItemStack getItemStack(Object object); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java index d4311ea..0b4fec9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java @@ -1,15 +1,13 @@ package com.jaquadro.minecraft.storagedrawers.api.registry; -import net.minecraft.item.crafting.IRecipe; - import java.util.List; +import net.minecraft.item.crafting.IRecipe; /** * Recipe handlers are used by compacting drawers to find more-compressed forms of blocks and items. If your recipe * to craft compressed items is a custom IRecipe implementation, you will need to register a handler for it. */ -public interface IRecipeHandler -{ +public interface IRecipeHandler { /** * Get the recipe ingredient list as an array of objects (usually used for shaped recipes). * If your array does not contain ItemStack objects, you will need to register an {@link IIngredientHandler} to @@ -20,7 +18,7 @@ public interface IRecipeHandler * @param recipe An instance of a custom {@link IRecipe}. * @return An array of ItemStacks or objects with a registered {@link IIngredientHandler}. */ - Object[] getInputAsArray (IRecipe recipe); + Object[] getInputAsArray(IRecipe recipe); /** * Get the recipe ingredient list as a list of objects (usually used for shapeless recipes). @@ -32,5 +30,5 @@ public interface IRecipeHandler * @param recipe An instance of a custom {@link IRecipe}. * @return A list of ItemStacks or objects with a registered {@link IIngredientHandler}. */ - List getInputAsList (IRecipe recipe); + List getInputAsList(IRecipe recipe); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java index b83d534..8645fb3 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java @@ -1,12 +1,11 @@ package com.jaquadro.minecraft.storagedrawers.api.registry; -public interface IRecipeHandlerRegistry -{ - void registerRecipeHandler (Class clazz, IRecipeHandler handler); +public interface IRecipeHandlerRegistry { + void registerRecipeHandler(Class clazz, IRecipeHandler handler); - void registerIngredientHandler (Class clazz, IIngredientHandler handler); + void registerIngredientHandler(Class clazz, IIngredientHandler handler); - IRecipeHandler getRecipeHandler (Class clazz); + IRecipeHandler getRecipeHandler(Class clazz); - IIngredientHandler getIngredientHandler (Class clazz); + IIngredientHandler getIngredientHandler(Class clazz); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java index cfa4543..dc605b3 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java @@ -2,7 +2,6 @@ package com.jaquadro.minecraft.storagedrawers.api.registry; import com.jaquadro.minecraft.storagedrawers.api.render.IRenderLabel; -public interface IRenderRegistry -{ - void registerPreLabelRenderHandler (IRenderLabel renderHandler); +public interface IRenderRegistry { + void registerPreLabelRenderHandler(IRenderLabel renderHandler); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java index a4ee987..5cc8909 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java @@ -1,6 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.api.registry; -public interface IWailaRegistry -{ - void registerTooltipHandler (IWailaTooltipHandler handler); +public interface IWailaRegistry { + void registerTooltipHandler(IWailaTooltipHandler handler); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java index d0f3328..acd724d 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java @@ -2,7 +2,6 @@ package com.jaquadro.minecraft.storagedrawers.api.registry; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -public interface IWailaTooltipHandler -{ - String transformItemName (IDrawer drawer, String defaultName); +public interface IWailaTooltipHandler { + String transformItemName(IDrawer drawer, String defaultName); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java index 86449b8..7392f26 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java @@ -2,4 +2,4 @@ package com.jaquadro.minecraft.storagedrawers.api.registry; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java index 500030a..23e0c6d 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java @@ -3,7 +3,6 @@ package com.jaquadro.minecraft.storagedrawers.api.render; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import net.minecraft.tileentity.TileEntity; -public interface IRenderLabel -{ - void render (TileEntity tileEntity, IDrawerGroup drawerGroup, int slot, float brightness, float partialTickTime); +public interface IRenderLabel { + void render(TileEntity tileEntity, IDrawerGroup drawerGroup, int slot, float brightness, float partialTickTime); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java index d9f3e1c..f2a07c5 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java @@ -2,4 +2,4 @@ package com.jaquadro.minecraft.storagedrawers.api.render; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java index 66752c0..3b8e086 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java @@ -3,11 +3,10 @@ package com.jaquadro.minecraft.storagedrawers.api.security; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IProtectable; import com.mojang.authlib.GameProfile; -public interface ISecurityProvider -{ - String getProviderID (); +public interface ISecurityProvider { + String getProviderID(); - boolean hasOwnership (GameProfile profile, IProtectable target); + boolean hasOwnership(GameProfile profile, IProtectable target); - boolean hasAccess (GameProfile profile, IProtectable target); + boolean hasAccess(GameProfile profile, IProtectable target); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java index 8105438..d8fd3e5 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java @@ -3,19 +3,18 @@ package com.jaquadro.minecraft.storagedrawers.api.storage; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -public interface IDrawer -{ +public interface IDrawer { /** * Gets an ItemStack of size 1 representing the type, metadata, and tags of the stored items. * The returned ItemStack should not be modified for any reason. Make a copy if you need to store or modify it. */ - ItemStack getStoredItemPrototype (); + ItemStack getStoredItemPrototype(); /** * Gets an ItemStack initialized to the number of items stored in this drawer. * The returned ItemStack is guaranteed to be a new copy and can be used for any purpose. Does not affect drawer contents. */ - ItemStack getStoredItemCopy (); + ItemStack getStoredItemCopy(); /** * Sets the type of the stored item and initializes it to the given amount. Any existing item will be replaced. @@ -25,7 +24,7 @@ public interface IDrawer * @deprecated setStoredItem may redirect its set to another IDrawer, so use setStoredItemRedir instead. */ @Deprecated - void setStoredItem (ItemStack itemPrototype, int amount); + void setStoredItem(ItemStack itemPrototype, int amount); /** * Sets the type of the stored item and initializes it to the given amount. Any existing item will be replaced. @@ -34,12 +33,12 @@ public interface IDrawer * @param amount The amount to initialize the stored item count to. * @return The IDrawer actually set with the prototype. Some drawer groups can redirect a set operation to another member. */ - IDrawer setStoredItemRedir (ItemStack itemPrototype, int amount); + IDrawer setStoredItemRedir(ItemStack itemPrototype, int amount); /** * Gets the number of items stored in this drawer. */ - int getStoredItemCount (); + int getStoredItemCount(); /** * Sets the number of items stored in this drawer. Triggers syncing of inventories and client data. @@ -47,30 +46,30 @@ public interface IDrawer * * @param amount The new amount of items stored in this drawer. */ - void setStoredItemCount (int amount); + void setStoredItemCount(int amount); /** * Gets the maximum number of items that can be stored in this drawer. * This value will vary depending on the max stack size of the stored item type. */ - int getMaxCapacity (); + int getMaxCapacity(); /** * Gets the maximum number of items that could be stored in this drawer if it held the given item. * * @param itemPrototype The item type to query. */ - int getMaxCapacity (ItemStack itemPrototype); + int getMaxCapacity(ItemStack itemPrototype); /** * Gets the number of items that could still be added to this drawer before it is full. */ - int getRemainingCapacity (); + int getRemainingCapacity(); /** * Gets the max stack size of the item type stored in this drawer. Convenience method. */ - int getStoredItemStackSize (); + int getStoredItemStackSize(); /** * Gets whether or not an item of the given type and data can be stored in this drawer. @@ -82,7 +81,7 @@ public interface IDrawer * * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item. */ - boolean canItemBeStored (ItemStack itemPrototype); + boolean canItemBeStored(ItemStack itemPrototype); /** * Gets whether or not an item of the given type and data can be extracted from this drawer. @@ -92,13 +91,13 @@ public interface IDrawer * * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item. */ - boolean canItemBeExtracted (ItemStack itemPrototype); + boolean canItemBeExtracted(ItemStack itemPrototype); /** * Gets whether or not the drawer has items. * A drawer set with an item type and 0 count is not considered empty. */ - boolean isEmpty (); + boolean isEmpty(); /** * Gets auxiliary data that has been associated with this drawer. @@ -106,16 +105,16 @@ public interface IDrawer * @param key The key used to identify the data. * @return An opaque object that was previously stored. */ - Object getExtendedData (String key); + Object getExtendedData(String key); /** * Stores auxiliary data with this drawer, mainly for use in integration. * @param key The key to identify the data with. * @param data The data to store. */ - void setExtendedData (String key, Object data); + void setExtendedData(String key, Object data); - void writeToNBT (NBTTagCompound tag); + void writeToNBT(NBTTagCompound tag); - void readFromNBT (NBTTagCompound tag); + void readFromNBT(NBTTagCompound tag); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java index 1f1eefe..790fc52 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java @@ -2,24 +2,23 @@ package com.jaquadro.minecraft.storagedrawers.api.storage; import com.jaquadro.minecraft.storagedrawers.api.inventory.IDrawerInventory; -public interface IDrawerGroup -{ +public interface IDrawerGroup { /** * Gets the number of drawers contained within this group. */ - int getDrawerCount (); + int getDrawerCount(); /** * Gets the drawer at the given slot within this group. */ - IDrawer getDrawer (int slot); + IDrawer getDrawer(int slot); /** * Gets whether the drawer in the given slot is usable. */ - boolean isDrawerEnabled (int slot); + boolean isDrawerEnabled(int slot); - IDrawerInventory getDrawerInventory (); + IDrawerInventory getDrawerInventory(); - boolean markDirtyIfNeeded (); + boolean markDirtyIfNeeded(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java index bd8a0ea..fe23227 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java @@ -3,13 +3,12 @@ package com.jaquadro.minecraft.storagedrawers.api.storage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -public interface IDrawerGroupInteractive extends IDrawerGroup -{ - ItemStack takeItemsFromSlot (int slot, int count); +public interface IDrawerGroupInteractive extends IDrawerGroup { + ItemStack takeItemsFromSlot(int slot, int count); - int putItemsIntoSlot (int slot, ItemStack stack, int count); + int putItemsIntoSlot(int slot, ItemStack stack, int count); - int interactPutCurrentItemIntoSlot (int slot, EntityPlayer player); + int interactPutCurrentItemIntoSlot(int slot, EntityPlayer player); - int interactPutCurrentInventoryIntoSlot (int slot, EntityPlayer player); + int interactPutCurrentInventoryIntoSlot(int slot, EntityPlayer player); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java index bd87a80..ba47d96 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java @@ -4,25 +4,24 @@ package com.jaquadro.minecraft.storagedrawers.api.storage; * Represents a drawer with items that are a fractional component of another item within the drawer group. Compacting * Drawers are a primary example of this drawer type. */ -public interface IFractionalDrawer extends IDrawer -{ +public interface IFractionalDrawer extends IDrawer { /** * Gets the storage ratio between the held item and the most compressed item within the drawer group. * * For example, most ingots have a conversion rate of 9 compared to metal blocks, and nuggets a rate of 81. * Actual conversion rates are implementation-defined. */ - int getConversionRate (); + int getConversionRate(); /** * Gets the number of items left in the drawer if the maximum number of equivalent compressed items had been removed. * The equivalency is determined by the next compression tier, and not necessarily the conversion rate. */ - int getStoredItemRemainder (); + int getStoredItemRemainder(); /** * Gets whether or not the stored item represents the smallest granularity of material that can be stored within * the drawer group. */ - boolean isSmallestUnit (); + boolean isSmallestUnit(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java index fba20d4..fe5b52f 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java @@ -1,5 +1,3 @@ package com.jaquadro.minecraft.storagedrawers.api.storage; -public interface INetworked -{ -} +public interface INetworked {} diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java index 97b293e..9dd708f 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java @@ -1,10 +1,8 @@ package com.jaquadro.minecraft.storagedrawers.api.storage; - -public interface IPriorityGroup -{ +public interface IPriorityGroup { /** * Gets the list of available drawer slots in priority order. */ - int[] getAccessibleDrawerSlots (); + int[] getAccessibleDrawerSlots(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java index c441a76..ad6a13a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java @@ -2,17 +2,16 @@ package com.jaquadro.minecraft.storagedrawers.api.storage; import net.minecraft.item.ItemStack; -public interface ISmartGroup -{ +public interface ISmartGroup { /** * Gets a lazy enumeration of all slots that will accept at least one item of the given stack, ordered by * insertion preference. */ - Iterable enumerateDrawersForInsertion (ItemStack stack, boolean strict); + Iterable enumerateDrawersForInsertion(ItemStack stack, boolean strict); /** * Gets a lazy enumeration of all slots that will provide at least one item of the given stack, ordered by * extraction preference. */ - Iterable enumerateDrawersForExtraction (ItemStack stack, boolean strict); + Iterable enumerateDrawersForExtraction(ItemStack stack, boolean strict); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IDowngradable.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IDowngradable.java index 6886893..cb3b5fe 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IDowngradable.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IDowngradable.java @@ -9,5 +9,4 @@ public interface IDowngradable { boolean checkDowngraded(); void setDowngraded(boolean state); - } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ILockable.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ILockable.java index 7645c83..fd6fda0 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ILockable.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ILockable.java @@ -1,21 +1,20 @@ package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; -public interface ILockable -{ +public interface ILockable { /** * Gets whether or not a drawer or group is locked for the given lock attribute. */ - boolean isLocked (LockAttribute attr); + boolean isLocked(LockAttribute attr); /** * Gets whether or not the lock state can be changed for the given lock attribute. * If this method returns false, isLocked may still return true. */ - boolean canLock (LockAttribute attr); + boolean canLock(LockAttribute attr); /** * Sets the lock state of a drawer or group for the given lock attribute. * If canLock returns false, this is a no-op. */ - void setLocked (LockAttribute attr, boolean isLocked); + void setLocked(LockAttribute attr, boolean isLocked); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java index b08649f..428ef94 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java @@ -1,31 +1,29 @@ package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; - import java.util.UUID; -public interface IProtectable -{ +public interface IProtectable { /** * Gets the owner of the drawer, or null if there is no owner. */ - UUID getOwner (); + UUID getOwner(); /** * Sets the owner of the drawer. Set to null to set no owner. * @return false if the operation is not supported, true otherwise. */ - boolean setOwner (UUID owner); + boolean setOwner(UUID owner); /** * Gets the provider managing security for the target. * @return null to use the default provider, which enforces strict owner access. */ - ISecurityProvider getSecurityProvider (); + ISecurityProvider getSecurityProvider(); /** * Sets the provider managing security for the target. Set to null for default provider. * @return false if the operation is not supported, true otherwise. */ - boolean setSecurityProvider (ISecurityProvider provder); + boolean setSecurityProvider(ISecurityProvider provder); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java index 7330780..eb9a951 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java @@ -1,16 +1,15 @@ package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; -public interface ISealable -{ +public interface ISealable { /** * Gets whether or not the drawer has the sealed attribute. * A sealed drawer cannot be interacted with, and when broken will retain all of its items and upgrades. */ - boolean isSealed (); + boolean isSealed(); /** * Sets whether or not the drawer is currently sealed. * @return false if the operation is not supported, true otherwise. */ - boolean setIsSealed (boolean state); + boolean setIsSealed(boolean state); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java index b7f0bf0..025420c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java @@ -1,16 +1,15 @@ package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; -public interface IShroudable -{ +public interface IShroudable { /** * Gets whether or not the drawer has the shrouded attribute. * The shrouded attribute instructs the drawer to not render its item label. */ - boolean isShrouded (); + boolean isShrouded(); /** * Sets whether or not the drawer is currently shrouded. * @return false if the operation is not supported, true otherwise. */ - boolean setIsShrouded (boolean state); + boolean setIsShrouded(boolean state); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java index 9fc5806..7d04516 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java @@ -1,9 +1,8 @@ package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; -public interface IVoidable -{ +public interface IVoidable { /** * Gets whether or not the drawer has a voiding attribute. */ - boolean isVoid (); + boolean isVoid(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java index cb726b4..f626b79 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java @@ -2,34 +2,29 @@ package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; import java.util.EnumSet; -public enum LockAttribute -{ +public enum LockAttribute { LOCK_POPULATED, LOCK_EMPTY; - public int getFlagValue () { + public int getFlagValue() { return 1 << ordinal(); } - public static int getBitfield (EnumSet attributes) { + public static int getBitfield(EnumSet attributes) { int value = 0; - if (attributes == null) - return value; + if (attributes == null) return value; - for (LockAttribute attr : attributes) - value |= attr.getFlagValue(); + for (LockAttribute attr : attributes) value |= attr.getFlagValue(); return value; } - public static EnumSet getEnumSet (int bitfield) { - if (bitfield == 0) - return null; + public static EnumSet getEnumSet(int bitfield) { + if (bitfield == 0) return null; EnumSet set = EnumSet.noneOf(LockAttribute.class); for (LockAttribute attr : values()) { - if ((bitfield & attr.getFlagValue()) != 0) - set.add(attr); + if ((bitfield & attr.getFlagValue()) != 0) set.add(attr); } return set; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java index 43de6b4..4d3f03e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java @@ -1,5 +1,8 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|storage-attribute", apiVersion = StorageDrawersApi.VERSION) +@API( + owner = "StorageDrawersAPI", + provides = "StorageDrawersAPI|storage-attribute", + apiVersion = StorageDrawersApi.VERSION) package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java index 3453e55..2c4b6e5 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java @@ -2,4 +2,4 @@ package com.jaquadro.minecraft.storagedrawers.api.storage; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java index 28fc504..37e5b00 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java @@ -8,6 +8,7 @@ import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersComp; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,10 +20,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import java.util.List; - -public class BlockCompDrawers extends BlockDrawers implements INetworked -{ +public class BlockCompDrawers extends BlockDrawers implements INetworked { @SideOnly(Side.CLIENT) private IIcon[] iconFront; @@ -31,52 +29,51 @@ public class BlockCompDrawers extends BlockDrawers implements INetworked @SideOnly(Side.CLIENT) private IIcon iconTrim; + @SideOnly(Side.CLIENT) private IIcon iconSide; + @SideOnly(Side.CLIENT) private IIcon iconSideEtched; - public BlockCompDrawers (String blockName) { + public BlockCompDrawers(String blockName) { super(Material.rock, blockName, 3, false); setStepSound(Block.soundTypeStone); } @Override - protected int getDrawerSlot (int side, float hitX, float hitY, float hitZ) { - if (hitTop(hitY)) - return 0; + protected int getDrawerSlot(int side, float hitX, float hitY, float hitZ) { + if (hitTop(hitY)) return 0; - if (hitLeft(side, hitX, hitZ)) - return 1; - else - return 2; + if (hitLeft(side, hitX, hitZ)) return 1; + else return 2; } @Override - public BlockType retrimType () { + public BlockType retrimType() { return null; } @Override - public TileEntityDrawers createNewTileEntity (World world, int meta) { + public TileEntityDrawers createNewTileEntity(World world, int meta) { return new TileEntityDrawersComp(); } @Override - public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) { + public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) { list.add(new ItemStack(item, 1, 0)); } @Override @SideOnly(Side.CLIENT) - public IIcon getIconTrim (int meta) { + public IIcon getIconTrim(int meta) { return iconTrim; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) { + public IIcon getIcon(int side, int meta) { switch (side) { case 0: case 1: @@ -89,21 +86,16 @@ public class BlockCompDrawers extends BlockDrawers implements INetworked } @Override - public IIcon getIcon (IBlockAccess blockAccess, int x, int y, int z, int side) { + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { TileEntityDrawers tile = getTileEntity(blockAccess, x, y, z); - if (tile == null) - return iconFront[0]; + if (tile == null) return iconFront[0]; if (side == tile.getDirection()) { if (tile.getEffectiveStatusLevel() == 0) { - if (tile.isDrawerEnabled(2) && tile.getDrawer(2).getStoredItemStackSize() > 0) - return iconFront[2]; - else if (tile.isDrawerEnabled(1) && tile.getDrawer(1).getStoredItemStackSize() > 0) - return iconFront[1]; - else - return iconFront[0]; - } - else { + if (tile.isDrawerEnabled(2) && tile.getDrawer(2).getStoredItemStackSize() > 0) return iconFront[2]; + else if (tile.isDrawerEnabled(1) && tile.getDrawer(1).getStoredItemStackSize() > 0) return iconFront[1]; + else return iconFront[0]; + } else { IDrawer main = tile.getDrawer(0); int plev = 0; @@ -118,8 +110,7 @@ public class BlockCompDrawers extends BlockDrawers implements INetworked return iconFrontInd[2][plev]; else if (tile.isDrawerEnabled(1) && tile.getDrawer(1).getStoredItemStackSize() > 0) return iconFrontInd[1][plev]; - else - return iconFrontInd[0][plev]; + else return iconFrontInd[0][plev]; } } @@ -133,7 +124,7 @@ public class BlockCompDrawers extends BlockDrawers implements INetworked } @Override - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { super.registerBlockIcons(register); iconFront = new IIcon[3]; @@ -143,7 +134,8 @@ public class BlockCompDrawers extends BlockDrawers implements INetworked iconFront[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_front_" + i); iconFrontInd[i][0] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_front_" + i + "_ind"); for (int j = 1; j <= 6; j++) - iconFrontInd[i][j] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_front_" + i + "_ind" + j); + iconFrontInd[i][j] = + register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_front_" + i + "_ind" + j); } iconTrim = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_trim"); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockController.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockController.java index d56624d..870fa45 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockController.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockController.java @@ -10,6 +10,8 @@ import com.jaquadro.minecraft.storagedrawers.core.ModItems; import com.jaquadro.minecraft.storagedrawers.item.ItemPersonalKey; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.EnumSet; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -24,21 +26,20 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.EnumSet; -import java.util.Random; - -public class BlockController extends BlockContainer implements INetworked -{ +public class BlockController extends BlockContainer implements INetworked { @SideOnly(Side.CLIENT) private IIcon iconFront; + @SideOnly(Side.CLIENT) private IIcon iconSide; + @SideOnly(Side.CLIENT) private IIcon iconSideEtched; + @SideOnly(Side.CLIENT) private IIcon iconTrim; - public BlockController (String blockName) { + public BlockController(String blockName) { super(Material.rock); this.useNeighborBrightness = true; @@ -53,30 +54,29 @@ public class BlockController extends BlockContainer implements INetworked } @Override - public boolean renderAsNormalBlock () { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean isOpaqueCube () { + public boolean isOpaqueCube() { return false; } @Override - public int getRenderType () { + public int getRenderType() { return StorageDrawers.proxy.controllerRenderID; } @Override - public int tickRate (World world) { + public int tickRate(World world) { return 100; } @Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entity, ItemStack itemStack) { + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack itemStack) { TileEntityController tile = getTileEntitySafe(world, x, y, z); - if (tile.getDirection() > 1) - return; + if (tile.getDirection() > 1) return; int quadrant = MathHelper.floor_double((entity.rotationYaw * 4f / 360f) + .5) & 3; switch (quadrant) { @@ -94,8 +94,7 @@ public class BlockController extends BlockContainer implements INetworked break; } - if (itemStack.hasDisplayName()) - tile.setInventoryName(itemStack.getDisplayName()); + if (itemStack.hasDisplayName()) tile.setInventoryName(itemStack.getDisplayName()); if (world.isRemote) { tile.invalidate(); @@ -104,36 +103,34 @@ public class BlockController extends BlockContainer implements INetworked } @Override - public void onPostBlockPlaced (World world, int x, int y, int z, int meta) { - if (world.isRemote) - return; + public void onPostBlockPlaced(World world, int x, int y, int z, int meta) { + if (world.isRemote) return; TileEntityController te = getTileEntity(world, x, y, z); - if (te == null) - return; + if (te == null) return; te.updateCache(); } @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { TileEntityController te = getTileEntitySafe(world, x, y, z); ItemStack item = player.inventory.getCurrentItem(); if (item != null && item.getItem() != null) { if (item.getItem() == ModItems.shroudKey) { - if (!world.isRemote) - te.toggleShroud(player.getGameProfile()); + if (!world.isRemote) te.toggleShroud(player.getGameProfile()); return true; - } - else if (item.getItem() == ModItems.upgradeLock) { + } else if (item.getItem() == ModItems.upgradeLock) { if (!world.isRemote) - te.toggleLock(EnumSet.allOf(LockAttribute.class), LockAttribute.LOCK_POPULATED, player.getGameProfile()); + te.toggleLock( + EnumSet.allOf(LockAttribute.class), LockAttribute.LOCK_POPULATED, player.getGameProfile()); return true; - } - else if (item.getItem() == ModItems.personalKey) { + } else if (item.getItem() == ModItems.personalKey) { if (!world.isRemote) { - String securityKey = ((ItemPersonalKey) item.getItem()).getSecurityProviderKey(item.getItemDamage()); + String securityKey = + ((ItemPersonalKey) item.getItem()).getSecurityProviderKey(item.getItemDamage()); ISecurityProvider provider = StorageDrawers.securityRegistry.getProvider(securityKey); te.toggleProtection(player.getGameProfile(), provider); @@ -143,24 +140,20 @@ public class BlockController extends BlockContainer implements INetworked } } - if (te.getDirection() != side) - return false; + if (te.getDirection() != side) return false; - if (!world.isRemote) - te.interactPutItemsIntoInventory(player); + if (!world.isRemote) te.interactPutItemsIntoInventory(player); return true; } @Override - public boolean rotateBlock (World world, int x, int y, int z, ForgeDirection axis) { + public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) { TileEntityController tile = getTileEntitySafe(world, x, y, z); - if (tile.getDirection() == axis.ordinal()) - return false; + if (tile.getDirection() == axis.ordinal()) return false; - if (axis == ForgeDirection.UP || axis == ForgeDirection.DOWN) - return false; + if (axis == ForgeDirection.UP || axis == ForgeDirection.DOWN) return false; tile.setDirection(axis.ordinal()); world.markBlockForUpdate(x, y, z); @@ -169,23 +162,19 @@ public class BlockController extends BlockContainer implements INetworked } @Override - public boolean isSideSolid (IBlockAccess world, int x, int y, int z, ForgeDirection side) { - if (getTileEntity(world, x, y, z) == null) - return true; - if (side.ordinal() != getTileEntity(world, x, y, z).getDirection()) - return true; + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + if (getTileEntity(world, x, y, z) == null) return true; + if (side.ordinal() != getTileEntity(world, x, y, z).getDirection()) return true; return false; } @Override - public void updateTick (World world, int x, int y, int z, Random rand) { - if (world.isRemote) - return; + public void updateTick(World world, int x, int y, int z, Random rand) { + if (world.isRemote) return; TileEntityController te = getTileEntity(world, x, y, z); - if (te == null) - return; + if (te == null) return; te.updateCache(); @@ -194,7 +183,7 @@ public class BlockController extends BlockContainer implements INetworked @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) { + public IIcon getIcon(int side, int meta) { switch (side) { case 0: case 1: @@ -208,13 +197,11 @@ public class BlockController extends BlockContainer implements INetworked @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (IBlockAccess blockAccess, int x, int y, int z, int side) { + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { TileEntityController tile = getTileEntity(blockAccess, x, y, z); - if (tile == null) - return iconFront; + if (tile == null) return iconFront; - if (side == tile.getDirection()) - return iconFront; + if (side == tile.getDirection()) return iconFront; switch (side) { case 0: @@ -226,21 +213,21 @@ public class BlockController extends BlockContainer implements INetworked } @SideOnly(Side.CLIENT) - public IIcon getIconTrim (int meta) { + public IIcon getIconTrim(int meta) { return iconTrim; } @Override - public TileEntityController createNewTileEntity (World world, int meta) { + public TileEntityController createNewTileEntity(World world, int meta) { return new TileEntityController(); } - public TileEntityController getTileEntity (IBlockAccess blockAccess, int x, int y, int z) { + public TileEntityController getTileEntity(IBlockAccess blockAccess, int x, int y, int z) { TileEntity tile = blockAccess.getTileEntity(x, y, z); return (tile instanceof TileEntityController) ? (TileEntityController) tile : null; } - public TileEntityController getTileEntitySafe (World world, int x, int y, int z) { + public TileEntityController getTileEntitySafe(World world, int x, int y, int z) { TileEntityController tile = getTileEntity(world, x, y, z); if (tile == null) { tile = createNewTileEntity(world, world.getBlockMetadata(x, y, z)); @@ -252,7 +239,7 @@ public class BlockController extends BlockContainer implements INetworked @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { iconFront = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_controller_front"); iconSide = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_side"); iconSideEtched = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_side_2"); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index 6c56e39..f18dfd7 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -19,11 +19,16 @@ import com.jaquadro.minecraft.storagedrawers.item.ItemTrim; import com.jaquadro.minecraft.storagedrawers.item.ItemUpgrade; import com.jaquadro.minecraft.storagedrawers.item.ItemUpgradeCreative; import com.jaquadro.minecraft.storagedrawers.network.BlockClickMessage; - import com.jaquadro.minecraft.storagedrawers.security.SecurityManager; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; @@ -48,16 +53,9 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import org.apache.commons.compress.utils.IOUtils; import org.apache.logging.log4j.Level; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -public class BlockDrawers extends BlockContainer implements IExtendedBlockClickHandler, INetworked -{ - private static final ResourceLocation blockConfig = new ResourceLocation(StorageDrawers.MOD_ID + ":textures/blocks/block_config.mcmeta"); +public class BlockDrawers extends BlockContainer implements IExtendedBlockClickHandler, INetworked { + private static final ResourceLocation blockConfig = + new ResourceLocation(StorageDrawers.MOD_ID + ":textures/blocks/block_config.mcmeta"); public final boolean halfDepth; public final int drawerCount; @@ -72,41 +70,55 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH @SideOnly(Side.CLIENT) protected IIcon[] iconSide; + @SideOnly(Side.CLIENT) protected IIcon[] iconSideV; + @SideOnly(Side.CLIENT) protected IIcon[] iconSideH; + @SideOnly(Side.CLIENT) protected IIcon[] iconFront1; + @SideOnly(Side.CLIENT) protected IIcon[] iconFront2; + @SideOnly(Side.CLIENT) protected IIcon[] iconFront4; + @SideOnly(Side.CLIENT) protected IIcon[] iconTrim; @SideOnly(Side.CLIENT) private IIcon[] iconOverlay; + @SideOnly(Side.CLIENT) private IIcon[] iconOverlayV; + @SideOnly(Side.CLIENT) private IIcon[] iconOverlayH; + @SideOnly(Side.CLIENT) private IIcon[] iconOverlayTrim; @SideOnly(Side.CLIENT) private IIcon[] iconIndicator1; + @SideOnly(Side.CLIENT) private IIcon[] iconIndicator2; + @SideOnly(Side.CLIENT) private IIcon[] iconIndicator4; @SideOnly(Side.CLIENT) private IIcon iconLock; + @SideOnly(Side.CLIENT) private IIcon iconClaim; + @SideOnly(Side.CLIENT) private IIcon iconClaimLock; + @SideOnly(Side.CLIENT) private IIcon iconVoid; @@ -115,11 +127,11 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH private long ignoreEventTime; - public BlockDrawers (String blockName, int drawerCount, boolean halfDepth) { + public BlockDrawers(String blockName, int drawerCount, boolean halfDepth) { this(Material.wood, blockName, drawerCount, halfDepth); } - protected BlockDrawers (Material material, String blockName, int drawerCount, boolean halfDepth) { + protected BlockDrawers(Material material, String blockName, int drawerCount, boolean halfDepth) { super(material); this.drawerCount = drawerCount; @@ -134,9 +146,8 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH setLightOpacity(255); } - public boolean retrimBlock (World world, int x, int y, int z, ItemStack prototype) { - if (retrimType() == null) - return false; + public boolean retrimBlock(World world, int x, int y, int z, ItemStack prototype) { + if (retrimType() == null) return false; Block protoBlock = Block.getBlockFromItem(prototype.getItem()); int protoMeta = prototype.getItemDamage(); @@ -149,8 +160,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH Block newBlock = StorageDrawers.blockRegistry.getBlock(config, plankBlock, plankMeta); int newMeta = StorageDrawers.blockRegistry.getMeta(config, plankBlock, plankMeta); - if (newBlock == null) - return false; + if (newBlock == null) return false; TileEntityDrawers tile = getTileEntity(world, x, y, z); if (newBlock == this && newMeta == world.getBlockMetadata(x, y, z) && !tile.shouldHideUpgrades()) { @@ -158,8 +168,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return true; } - if (newBlock == this) - world.setBlockMetadataWithNotify(x, y, z, newMeta, 3); + if (newBlock == this) world.setBlockMetadataWithNotify(x, y, z, newMeta, 3); else { TileEntity newDrawer = createNewTileEntity(world, newMeta); @@ -178,56 +187,56 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return true; } - public BlockType retrimType () { + public BlockType retrimType() { return BlockType.Drawers; } - public float getTrimWidth () { + public float getTrimWidth() { return trimWidth; } - public float getTrimDepth () { + public float getTrimDepth() { return trimDepth; } - public float getIndStart () { + public float getIndStart() { return indStart; } - public float getIndEnd () { + public float getIndEnd() { return indEnd; } - public int getIndSteps () { + public int getIndSteps() { return indSteps; } - public BlockDrawers setConfigName (String name) { + public BlockDrawers setConfigName(String name) { blockConfigName = name; return this; } - public String getConfigName () { + public String getConfigName() { return blockConfigName; } @Override - public boolean renderAsNormalBlock () { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean isOpaqueCube () { + public boolean isOpaqueCube() { return false; } @Override - public int getRenderType () { + public int getRenderType() { return StorageDrawers.proxy.drawersRenderID; } @Override - public void setBlockBoundsBasedOnState (IBlockAccess blockAccess, int x, int y, int z) { + public void setBlockBoundsBasedOnState(IBlockAccess blockAccess, int x, int y, int z) { TileEntityDrawers tile = getTileEntity(blockAccess, x, y, z); if (tile == null) { setBlockBounds(0, 0, 0, 1, 1, 1); @@ -252,24 +261,22 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } @Override - public void setBlockBoundsForItemRender () { - if (halfDepth) - setBlockBounds(0, 0, 0, 1, 1, .5f); - else - setBlockBounds(0, 0, 0, 1, 1, 1); + public void setBlockBoundsForItemRender() { + if (halfDepth) setBlockBounds(0, 0, 0, 1, 1, .5f); + else setBlockBounds(0, 0, 0, 1, 1, 1); } @Override - public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) { + public void addCollisionBoxesToList( + World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) { setBlockBoundsBasedOnState(world, x, y, z); super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity); } @Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entity, ItemStack itemStack) { + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack itemStack) { TileEntityDrawers tile = getTileEntitySafe(world, x, y, z); - if (tile.getDirection() > 1) - return; + if (tile.getDirection() > 1) return; int quadrant = MathHelper.floor_double((entity.rotationYaw * 4f / 360f) + .5) & 3; switch (quadrant) { @@ -287,8 +294,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH break; } - if (itemStack.hasDisplayName()) - tile.setInventoryName(itemStack.getDisplayName()); + if (itemStack.hasDisplayName()) tile.setInventoryName(itemStack.getDisplayName()); if (world.isRemote) { tile.invalidate(); @@ -297,7 +303,8 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (world.isRemote && Minecraft.getMinecraft().getSystemTime() == ignoreEventTime) { ignoreEventTime = 0; return false; @@ -306,8 +313,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH TileEntityDrawers tileDrawers = getTileEntitySafe(world, x, y, z); ItemStack item = player.inventory.getCurrentItem(); - if (!SecurityManager.hasAccess(player.getGameProfile(), tileDrawers)) - return false; + if (!SecurityManager.hasAccess(player.getGameProfile(), tileDrawers)) return false; if (StorageDrawers.config.cache.debugTrace) { FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "BlockDrawers.onBlockActivated"); @@ -316,8 +322,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH if (item != null && item.getItem() != null) { if (item.getItem() instanceof ItemTrim && player.isSneaking()) { - if (!retrimBlock(world, x, y, z, item)) - return false; + if (!retrimBlock(world, x, y, z, item)) return false; if (player != null && !player.capabilities.isCreativeMode) { if (--item.stackSize <= 0) @@ -331,8 +336,12 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH * and it would great if we could just find if it was an instance of said thing. * Crazy concept! * */ - else if (item.getItem() == ModItems.upgrade || item.getItem() == ModItems.upgradeStatus || item.getItem() == ModItems.upgradeVoid || - item.getItem() == ModItems.upgradeCreative || item.getItem() == ModItems.upgradeRedstone || item.getItem() == ModItems.upgradeDowngrade) { + else if (item.getItem() == ModItems.upgrade + || item.getItem() == ModItems.upgradeStatus + || item.getItem() == ModItems.upgradeVoid + || item.getItem() == ModItems.upgradeCreative + || item.getItem() == ModItems.upgradeRedstone + || item.getItem() == ModItems.upgradeDowngrade) { if (!tileDrawers.addUpgrade(item)) { player.addChatMessage(new ChatComponentTranslation("storagedrawers.msg.maxUpgrades")); return false; @@ -346,82 +355,65 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } return true; - } - else if (item.getItem() == ModItems.upgradeLock) { + } else if (item.getItem() == ModItems.upgradeLock) { boolean locked = tileDrawers.isLocked(LockAttribute.LOCK_POPULATED); tileDrawers.setLocked(LockAttribute.LOCK_POPULATED, !locked); tileDrawers.setLocked(LockAttribute.LOCK_EMPTY, !locked); return true; - } - else if (item.getItem() == ModItems.shroudKey) { + } else if (item.getItem() == ModItems.shroudKey) { tileDrawers.setIsShrouded(!tileDrawers.isShrouded()); return true; - } - else if (item.getItem() instanceof ItemPersonalKey) { + } else if (item.getItem() instanceof ItemPersonalKey) { String securityKey = ((ItemPersonalKey) item.getItem()).getSecurityProviderKey(item.getItemDamage()); ISecurityProvider provider = StorageDrawers.securityRegistry.getProvider(securityKey); if (tileDrawers.getOwner() == null) { tileDrawers.setOwner(player.getPersistentID()); tileDrawers.setSecurityProvider(provider); - } - else if (SecurityManager.hasOwnership(player.getGameProfile(), tileDrawers)) { + } else if (SecurityManager.hasOwnership(player.getGameProfile(), tileDrawers)) { tileDrawers.setOwner(null); tileDrawers.setSecurityProvider(null); - } - else - return false; + } else return false; return true; - } - else if (item.getItem() == ModItems.tape) - return false; - } - else if (item == null && player.isSneaking()) { + } else if (item.getItem() == ModItems.tape) return false; + } else if (item == null && player.isSneaking()) { if (tileDrawers.isSealed()) { tileDrawers.setIsSealed(false); return true; - } - else if (StorageDrawers.config.cache.enableDrawerUI) { + } else if (StorageDrawers.config.cache.enableDrawerUI) { player.openGui(StorageDrawers.instance, GuiHandler.drawersGuiID, world, x, y, z); return true; } } - if (tileDrawers.getDirection() != side) - return false; + if (tileDrawers.getDirection() != side) return false; - if (tileDrawers.isSealed()) - return false; + if (tileDrawers.isSealed()) return false; int slot = getDrawerSlot(side, hitX, hitY, hitZ); IDrawer drawer = tileDrawers.getDrawer(slot); ItemStack currentStack = drawer.getStoredItemPrototype(); int countAdded = tileDrawers.interactPutItemsIntoSlot(slot, player); - if (countAdded > 0 && currentStack != null) - world.markBlockForUpdate(x, y, z); + if (countAdded > 0 && currentStack != null) world.markBlockForUpdate(x, y, z); return true; } - protected int getDrawerSlot (int side, float hitX, float hitY, float hitZ) { - if (drawerCount == 1) - return 0; - if (drawerCount == 2) - return hitTop(hitY) ? 0 : 1; + protected int getDrawerSlot(int side, float hitX, float hitY, float hitZ) { + if (drawerCount == 1) return 0; + if (drawerCount == 2) return hitTop(hitY) ? 0 : 1; - if (hitLeft(side, hitX, hitZ)) - return hitTop(hitY) ? 0 : 1; - else - return hitTop(hitY) ? 2 : 3; + if (hitLeft(side, hitX, hitZ)) return hitTop(hitY) ? 0 : 1; + else return hitTop(hitY) ? 2 : 3; } - protected boolean hitTop (float hitY) { + protected boolean hitTop(float hitY) { return hitY > .5; } - protected boolean hitLeft (int side, float hitX, float hitZ) { + protected boolean hitLeft(int side, float hitX, float hitZ) { switch (side) { case 2: return hitX > .5; @@ -437,14 +429,15 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } @Override - public void onBlockClicked (World world, int x, int y, int z, EntityPlayer player) { + public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) { if (world.isRemote) { MovingObjectPosition posn = Minecraft.getMinecraft().objectMouseOver; - float hitX = (float)(posn.hitVec.xCoord - posn.blockX); - float hitY = (float)(posn.hitVec.yCoord - posn.blockY); - float hitZ = (float)(posn.hitVec.zCoord - posn.blockZ); + float hitX = (float) (posn.hitVec.xCoord - posn.blockX); + float hitY = (float) (posn.hitVec.yCoord - posn.blockY); + float hitZ = (float) (posn.hitVec.zCoord - posn.blockZ); - StorageDrawers.network.sendToServer(new BlockClickMessage(x, y, z, posn.sideHit, hitX, hitY, hitZ, StorageDrawers.config.cache.invertShift)); + StorageDrawers.network.sendToServer(new BlockClickMessage( + x, y, z, posn.sideHit, hitX, hitY, hitZ, StorageDrawers.config.cache.invertShift)); if (StorageDrawers.config.cache.debugTrace) FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "BlockDrawers.onBlockClicked with " + posn.toString()); @@ -452,25 +445,32 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } @Override - public void onBlockClicked (World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ, boolean invertShift) { + public void onBlockClicked( + World world, + int x, + int y, + int z, + EntityPlayer player, + int side, + float hitX, + float hitY, + float hitZ, + boolean invertShift) { if (StorageDrawers.config.cache.debugTrace) FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "IExtendedBlockClickHandler.onBlockClicked"); if (!player.capabilities.isCreativeMode) { - PlayerInteractEvent event = ForgeEventFactory.onPlayerInteract(player, PlayerInteractEvent.Action.LEFT_CLICK_BLOCK, x, y, z, side, world); - if (event.isCanceled()) - return; + PlayerInteractEvent event = ForgeEventFactory.onPlayerInteract( + player, PlayerInteractEvent.Action.LEFT_CLICK_BLOCK, x, y, z, side, world); + if (event.isCanceled()) return; } TileEntityDrawers tileDrawers = getTileEntitySafe(world, x, y, z); - if (tileDrawers.getDirection() != side) - return; + if (tileDrawers.getDirection() != side) return; - if (tileDrawers.isSealed()) - return; + if (tileDrawers.isSealed()) return; - if (!SecurityManager.hasAccess(player.getGameProfile(), tileDrawers)) - return; + if (!SecurityManager.hasAccess(player.getGameProfile(), tileDrawers)) return; int slot = getDrawerSlot(side, hitX, hitY, hitZ); IDrawer drawer = tileDrawers.getDrawer(slot); @@ -479,8 +479,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH // if invertSHift is true this will happen when the player is not shifting if (player.isSneaking() != invertShift) item = tileDrawers.takeItemsFromSlot(slot, drawer.getStoredItemStackSize()); - else - item = tileDrawers.takeItemsFromSlot(slot, 1); + else item = tileDrawers.takeItemsFromSlot(slot, 1); if (StorageDrawers.config.cache.debugTrace) FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, (item == null) ? " null item" : " " + item.toString()); @@ -490,14 +489,19 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH ForgeDirection dir = ForgeDirection.getOrientation(side); dropItemStack(world, x + dir.offsetX, y, z + dir.offsetZ, player, item); world.markBlockForUpdate(x, y, z); - } - else - world.playSoundEffect(x + .5f, y + .5f, z + .5f, "random.pop", .2f, ((world.rand.nextFloat() - world.rand.nextFloat()) * .7f + 1) * 2); + } else + world.playSoundEffect( + x + .5f, + y + .5f, + z + .5f, + "random.pop", + .2f, + ((world.rand.nextFloat() - world.rand.nextFloat()) * .7f + 1) * 2); } } @Override - public boolean rotateBlock (World world, int x, int y, int z, ForgeDirection axis) { + public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) { TileEntityDrawers tile = getTileEntitySafe(world, x, y, z); if (tile.isSealed()) { dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); @@ -505,49 +509,42 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return true; } - if (tile.getDirection() == axis.ordinal()) - return false; + if (tile.getDirection() == axis.ordinal()) return false; - if (axis == ForgeDirection.UP || axis == ForgeDirection.DOWN) - return false; + if (axis == ForgeDirection.UP || axis == ForgeDirection.DOWN) return false; tile.setDirection(axis.ordinal()); world.markBlockForUpdate(x, y, z); - if (world.isRemote) - ignoreEventTime = Minecraft.getMinecraft().getSystemTime(); + if (world.isRemote) ignoreEventTime = Minecraft.getMinecraft().getSystemTime(); return true; } @Override - public boolean isSideSolid (IBlockAccess world, int x, int y, int z, ForgeDirection side) { - if (halfDepth) - return false; + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + if (halfDepth) return false; if (side == ForgeDirection.DOWN) { Block blockUnder = world.getBlock(x, y - 1, z); - if (blockUnder instanceof BlockChest || blockUnder instanceof BlockEnderChest) - return false; + if (blockUnder instanceof BlockChest || blockUnder instanceof BlockEnderChest) return false; } - if (getTileEntity(world, x, y, z) == null) - return true; - if (side.ordinal() != getTileEntity(world, x, y, z).getDirection()) - return true; + if (getTileEntity(world, x, y, z) == null) return true; + if (side.ordinal() != getTileEntity(world, x, y, z).getDirection()) return true; return false; } - private void dropItemStack (World world, int x, int y, int z, EntityPlayer player, ItemStack stack) { + private void dropItemStack(World world, int x, int y, int z, EntityPlayer player, ItemStack stack) { EntityItem entity = new EntityItem(world, x + .5f, y + .5f, z + .5f, stack); entity.addVelocity(-entity.motionX, -entity.motionY, -entity.motionZ); world.spawnEntityInWorld(entity); } @Override - public boolean removedByPlayer (World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { if (world.isRemote && player.capabilities.isCreativeMode) { TileEntityDrawers tile = getTileEntity(world, x, y, z); MovingObjectPosition posn = Minecraft.getMinecraft().objectMouseOver; @@ -562,29 +559,26 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } @Override - public void breakBlock (World world, int x, int y, int z, Block block, int meta) { + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { TileEntityDrawers tile = getTileEntity(world, x, y, z); if (tile != null && !tile.isSealed()) { for (int i = 0; i < tile.getUpgradeSlotCount(); i++) { ItemStack stack = tile.getUpgrade(i); if (stack != null) { - if (stack.getItem() instanceof ItemUpgradeCreative) - continue; + if (stack.getItem() instanceof ItemUpgradeCreative) continue; dropBlockAsItem(world, x, y, z, stack); } } if (!tile.isVending()) { for (int i = 0; i < tile.getDrawerCount(); i++) { - if (!tile.isDrawerEnabled(i)) - continue; + if (!tile.isDrawerEnabled(i)) continue; IDrawer drawer = tile.getDrawer(i); while (drawer.getStoredItemCount() > 0) { ItemStack stack = tile.takeItemsFromSlot(i, drawer.getStoredItemStackSize()); - if (stack == null || stack.stackSize == 0) - break; + if (stack == null || stack.stackSize == 0) break; dropStackInBatches(world, x, y, z, stack); } @@ -597,7 +591,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH super.breakBlock(world, x, y, z, block, meta); } - private void dropStackInBatches (World world, int x, int y, int z, ItemStack stack) { + private void dropStackInBatches(World world, int x, int y, int z, ItemStack stack) { Random rand = world.rand; float ex = rand.nextFloat() * .8f + .1f; @@ -607,11 +601,15 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH EntityItem entity; for (; stack.stackSize > 0; world.spawnEntityInWorld(entity)) { int stackPartSize = rand.nextInt(21) + 10; - if (stackPartSize > stack.stackSize) - stackPartSize = stack.stackSize; + if (stackPartSize > stack.stackSize) stackPartSize = stack.stackSize; stack.stackSize -= stackPartSize; - entity = new EntityItem(world, x + ex, y + ey, z + ez, new ItemStack(stack.getItem(), stackPartSize, stack.getItemDamage())); + entity = new EntityItem( + world, + x + ex, + y + ey, + z + ez, + new ItemStack(stack.getItem(), stackPartSize, stack.getItemDamage())); float motionUnit = .05f; entity.motionX = rand.nextGaussian() * motionUnit; @@ -619,46 +617,44 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH entity.motionZ = rand.nextGaussian() * motionUnit; if (stack.hasTagCompound()) - entity.getEntityItem().setTagCompound((NBTTagCompound)stack.getTagCompound().copy()); + entity.getEntityItem() + .setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); } } @Override - public int damageDropped (int meta) { + public int damageDropped(int meta) { return meta; } @Override - public boolean removedByPlayer (World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { - if (willHarvest) - return true; + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { + if (willHarvest) return true; return super.removedByPlayer(world, player, x, y, z, willHarvest); } @Override - public void harvestBlock (World world, EntityPlayer player, int x, int y, int z, int meta) { + public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { super.harvestBlock(world, player, x, y, z, meta); world.setBlockToAir(x, y, z); } @Override - public ArrayList getDrops (World world, int x, int y, int z, int metadata, int fortune) { + public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { ItemStack dropStack = getMainDrop(world, x, y, z, metadata); ArrayList drops = new ArrayList(); drops.add(dropStack); TileEntityDrawers tile = getTileEntity(world, x, y, z); - if (tile == null || !tile.isSealed()) - return drops; + if (tile == null || !tile.isSealed()) return drops; NBTTagCompound tiledata = new NBTTagCompound(); tile.writeToNBT(tiledata); NBTTagCompound data = dropStack.getTagCompound(); - if (data == null) - data = new NBTTagCompound(); + if (data == null) data = new NBTTagCompound(); data.setTag("tile", tiledata); dropStack.setTagCompound(data); @@ -666,18 +662,25 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return drops; } - protected ItemStack getMainDrop (World world, int x, int y, int z, int metadata) { + protected ItemStack getMainDrop(World world, int x, int y, int z, int metadata) { return new ItemStack(Item.getItemFromBlock(this), 1, metadata); } @Override - public float getExplosionResistance (Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + public float getExplosionResistance( + Entity par1Entity, + World world, + int x, + int y, + int z, + double explosionX, + double explosionY, + double explosionZ) { TileEntityDrawers tile = getTileEntity(world, x, y, z); if (tile != null) { for (int slot = 0; slot < 5; slot++) { ItemStack stack = tile.getUpgrade(slot); - if (stack == null || !(stack.getItem() instanceof ItemUpgrade) || stack.getItemDamage() != 4) - continue; + if (stack == null || !(stack.getItem() instanceof ItemUpgrade) || stack.getItemDamage() != 4) continue; return 1000; } @@ -687,16 +690,16 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } @Override - public TileEntityDrawers createNewTileEntity (World world, int meta) { + public TileEntityDrawers createNewTileEntity(World world, int meta) { return new TileEntityDrawersStandard(); } - public TileEntityDrawers getTileEntity (IBlockAccess blockAccess, int x, int y, int z) { + public TileEntityDrawers getTileEntity(IBlockAccess blockAccess, int x, int y, int z) { TileEntity tile = blockAccess.getTileEntity(x, y, z); return (tile instanceof TileEntityDrawers) ? (TileEntityDrawers) tile : null; } - public TileEntityDrawers getTileEntitySafe (World world, int x, int y, int z) { + public TileEntityDrawers getTileEntitySafe(World world, int x, int y, int z) { TileEntityDrawers tile = getTileEntity(world, x, y, z); if (tile == null) { tile = createNewTileEntity(world, world.getBlockMetadata(x, y, z)); @@ -708,11 +711,10 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH @Override @SideOnly(Side.CLIENT) - public boolean addHitEffects (World worldObj, MovingObjectPosition target, EffectRenderer effectRenderer) { + public boolean addHitEffects(World worldObj, MovingObjectPosition target, EffectRenderer effectRenderer) { TileEntity tile = worldObj.getTileEntity(target.blockX, target.blockY, target.blockZ); if (tile instanceof TileEntityDrawers) { - if (((TileEntityDrawers) tile).getDirection() == target.sideHit) - return true; + if (((TileEntityDrawers) tile).getDirection() == target.sideHit) return true; } return super.addHitEffects(worldObj, target, effectRenderer); @@ -727,46 +729,43 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH }*/ @Override - public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) { + public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) { list.add(new ItemStack(item, 1, 0)); if (StorageDrawers.config.cache.creativeTabVanillaWoods) { - for (int i = 1; i < BlockWood.field_150096_a.length; i++) - list.add(new ItemStack(item, 1, i)); + for (int i = 1; i < BlockWood.field_150096_a.length; i++) list.add(new ItemStack(item, 1, i)); } } @Override - public boolean canProvidePower () { + public boolean canProvidePower() { return true; } @Override - public int isProvidingWeakPower (IBlockAccess blockAccess, int x, int y, int z, int dir) { - if (!canProvidePower()) - return 0; + public int isProvidingWeakPower(IBlockAccess blockAccess, int x, int y, int z, int dir) { + if (!canProvidePower()) return 0; TileEntityDrawers tile = getTileEntity(blockAccess, x, y, z); - if (tile == null || !tile.isRedstone()) - return 0; + if (tile == null || !tile.isRedstone()) return 0; return tile.getRedstoneLevel(); } @Override - public int isProvidingStrongPower (IBlockAccess blockAccess, int x, int y, int z, int dir) { + public int isProvidingStrongPower(IBlockAccess blockAccess, int x, int y, int z, int dir) { return (dir == 1) ? isProvidingWeakPower(blockAccess, x, y, z, dir) : 0; } @SideOnly(Side.CLIENT) - public IIcon getIconTrim (int meta) { + public IIcon getIconTrim(int meta) { meta = (meta < 0 || meta >= iconTrim.length) ? 0 : meta; return iconTrim[meta]; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) { + public IIcon getIcon(int side, int meta) { meta = (meta < 0 || meta >= iconSide.length) ? 0 : meta; switch (side) { @@ -778,9 +777,12 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return halfDepth ? iconSideV[meta] : iconSide[meta]; case 4: switch (drawerCount) { - case 1: return iconFront1[meta]; - case 2: return iconFront2[meta]; - case 4: return iconFront4[meta]; + case 1: + return iconFront1[meta]; + case 2: + return iconFront2[meta]; + case 4: + return iconFront4[meta]; } return null; case 5: @@ -792,22 +794,20 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (IBlockAccess blockAccess, int x, int y, int z, int side) { + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { return getIcon(blockAccess, x, y, z, side, 0); } @SideOnly(Side.CLIENT) - public IIcon getOverlayIcon (IBlockAccess blockAccess, int x, int y, int z, int side, int level) { - if (level == 0) - return null; + public IIcon getOverlayIcon(IBlockAccess blockAccess, int x, int y, int z, int side, int level) { + if (level == 0) return null; return getIcon(blockAccess, x, y, z, side, level); } @SideOnly(Side.CLIENT) - public IIcon getOverlayIconTrim (int level) { - if (level == 0) - return null; + public IIcon getOverlayIconTrim(int level) { + if (level == 0) return null; level = (level < 0 || level >= iconOverlayTrim.length) ? 0 : level; @@ -815,19 +815,16 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } @SideOnly(Side.CLIENT) - protected IIcon getIcon (IBlockAccess blockAccess, int x, int y, int z, int side, int level) { + protected IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side, int level) { int meta = blockAccess.getBlockMetadata(x, y, z); meta = (meta < 0 || meta >= iconSide.length) ? 0 : meta; level = (level < 0 || level >= iconOverlay.length) ? 0 : level; TileEntityDrawers tile = getTileEntity(blockAccess, x, y, z); if (tile == null || side == tile.getDirection()) { - if (drawerCount == 1) - return iconFront1[meta]; - else if (drawerCount == 2) - return iconFront2[meta]; - else - return iconFront4[meta]; + if (drawerCount == 1) return iconFront1[meta]; + else if (drawerCount == 2) return iconFront2[meta]; + else return iconFront4[meta]; } switch (side) { @@ -875,40 +872,41 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } @SideOnly(Side.CLIENT) - public IIcon getIndicatorIcon (int drawerCount, boolean on) { + public IIcon getIndicatorIcon(int drawerCount, boolean on) { int onIndex = on ? 1 : 0; switch (drawerCount) { - case 1: return iconIndicator1[onIndex]; - case 2: return iconIndicator2[onIndex]; - case 4: return iconIndicator4[onIndex]; + case 1: + return iconIndicator1[onIndex]; + case 2: + return iconIndicator2[onIndex]; + case 4: + return iconIndicator4[onIndex]; } return null; } @SideOnly(Side.CLIENT) - public IIcon getLockIcon (boolean locked, boolean claimed) { - if (locked && claimed) - return iconClaimLock; - else if (locked) - return iconLock; - else if (claimed) - return iconClaim; - else - return null; + public IIcon getLockIcon(boolean locked, boolean claimed) { + if (locked && claimed) return iconClaimLock; + else if (locked) return iconLock; + else if (claimed) return iconClaim; + else return null; } @SideOnly(Side.CLIENT) - public IIcon getVoidIcon () { + public IIcon getVoidIcon() { return iconVoid; } @SideOnly(Side.CLIENT) - public IIcon getTapeIcon () { return iconTaped; } + public IIcon getTapeIcon() { + return iconTaped; + } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { String[] subtex = BlockWood.field_150096_a; iconSide = new IIcon[subtex.length]; @@ -931,7 +929,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH iconTaped = register.registerIcon(StorageDrawers.MOD_ID + ":tape"); - String[] overlays = new String[] { null, null, "iron", "gold", "obsidian", "diamond", "emerald" }; + String[] overlays = new String[] {null, null, "iron", "gold", "obsidian", "diamond", "emerald"}; iconOverlay = new IIcon[overlays.length]; iconOverlayH = new IIcon[overlays.length]; @@ -965,9 +963,10 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } @SideOnly(Side.CLIENT) - protected void loadBlockConfig () { + protected void loadBlockConfig() { try { - IResource configResource = Minecraft.getMinecraft().getResourceManager().getResource(blockConfig); + IResource configResource = + Minecraft.getMinecraft().getResourceManager().getResource(blockConfig); BufferedReader reader = null; try { reader = new BufferedReader(new InputStreamReader(configResource.getInputStream())); @@ -979,15 +978,11 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH trimWidth = entry.get("trimWidth").getAsFloat(); if (entry.has("trimDepth")) trimDepth = entry.get("trimDepth").getAsFloat(); - if (entry.has("indStart")) - indStart = entry.get("indStart").getAsFloat(); - if (entry.has("indEnd")) - indEnd = entry.get("indEnd").getAsFloat(); - if (entry.has("indSteps")) - indSteps = entry.get("indSteps").getAsInt(); + if (entry.has("indStart")) indStart = entry.get("indStart").getAsFloat(); + if (entry.has("indEnd")) indEnd = entry.get("indEnd").getAsFloat(); + if (entry.has("indSteps")) indSteps = entry.get("indSteps").getAsInt(); } - } - finally { + } finally { IOUtils.closeQuietly(reader); } } catch (IOException e) { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java index bbcaed3..0200f33 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java @@ -7,24 +7,22 @@ import com.jaquadro.minecraft.storagedrawers.core.ClientProxy; import com.jaquadro.minecraft.storagedrawers.item.ItemCustomDrawers; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import java.util.List; - -public class BlockDrawersCustom extends BlockDrawers -{ +public class BlockDrawersCustom extends BlockDrawers { @SideOnly(Side.CLIENT) private IIcon overlayHandle; + @SideOnly(Side.CLIENT) private IIcon overlayFaceShadow; + @SideOnly(Side.CLIENT) private IIcon overlayTrimShadow; @@ -33,89 +31,87 @@ public class BlockDrawersCustom extends BlockDrawers @SideOnly(Side.CLIENT) private IIcon defaultFace; + @SideOnly(Side.CLIENT) private IIcon defaultTrim; - public BlockDrawersCustom (String blockName, int drawerCount, boolean halfDepth) { + public BlockDrawersCustom(String blockName, int drawerCount, boolean halfDepth) { super(blockName, drawerCount, halfDepth); } @Override - public int getRenderType () { + public int getRenderType() { return StorageDrawers.proxy.drawersCustomRenderID; } @Override - public int getRenderBlockPass () { + public int getRenderBlockPass() { return 1; } @Override - public boolean canRenderInPass (int pass) { + public boolean canRenderInPass(int pass) { ClientProxy.renderPass = pass; return true; } @Override - public BlockType retrimType () { + public BlockType retrimType() { return null; } @Override - protected ItemStack getMainDrop (World world, int x, int y, int z, int metadata) { + protected ItemStack getMainDrop(World world, int x, int y, int z, int metadata) { TileEntityDrawers tile = getTileEntity(world, x, y, z); - if (tile == null) - return ItemCustomDrawers.makeItemStack(this, 1, null, null, null); + if (tile == null) return ItemCustomDrawers.makeItemStack(this, 1, null, null, null); - return ItemCustomDrawers.makeItemStack(this, 1, tile.getMaterialSide(), tile.getMaterialTrim(), tile.getMaterialFront()); + return ItemCustomDrawers.makeItemStack( + this, 1, tile.getMaterialSide(), tile.getMaterialTrim(), tile.getMaterialFront()); } @Override - public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) { - if (StorageDrawers.config.cache.addonShowVanilla) - list.add(new ItemStack(item)); + public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) { + if (StorageDrawers.config.cache.addonShowVanilla) list.add(new ItemStack(item)); } @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { TileEntityDrawers tile = getTileEntity(world, x, y, z); - if (tile != null && tile.getMaterialSide() == null) - return false; + if (tile != null && tile.getMaterialSide() == null) return false; return super.onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ); } @SideOnly(Side.CLIENT) - public IIcon getHandleOverlay () { + public IIcon getHandleOverlay() { return overlayHandle; } @SideOnly(Side.CLIENT) - public IIcon getFaceShadowOverlay () { + public IIcon getFaceShadowOverlay() { return overlayFaceShadow; } @SideOnly(Side.CLIENT) - public IIcon getTrimShadowOverlay (boolean strong) { - if (strong) - return overlayTrimFace; - else - return overlayTrimShadow; + public IIcon getTrimShadowOverlay(boolean strong) { + if (strong) return overlayTrimFace; + else return overlayTrimShadow; } @SideOnly(Side.CLIENT) - public IIcon getDefaultFaceIcon () { + public IIcon getDefaultFaceIcon() { return defaultFace; } @SideOnly(Side.CLIENT) - public IIcon getDefaultTrimIcon () { + public IIcon getDefaultTrimIcon() { return defaultTrim; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { super.registerBlockIcons(register); overlayHandle = register.registerIcon(StorageDrawers.MOD_ID + ":overlay/handle_" + drawerCount); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockFramingTable.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockFramingTable.java index 731dfcf..965605b 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockFramingTable.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockFramingTable.java @@ -8,6 +8,7 @@ import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import com.jaquadro.minecraft.storagedrawers.core.handlers.GuiHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -21,10 +22,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import java.util.Random; - -public class BlockFramingTable extends BlockContainer -{ +public class BlockFramingTable extends BlockContainer { public static final int[][] leftOffset = new int[][] {{0, 0}, {0, 0}, {1, 0}, {-1, 0}, {0, -1}, {0, 1}}; public static final int[][] rightOffset = new int[][] {{0, 0}, {0, 0}, {-1, 0}, {1, 0}, {0, 1}, {0, -1}}; @@ -32,15 +30,17 @@ public class BlockFramingTable extends BlockContainer @SideOnly(Side.CLIENT) IIcon iconBase; + @SideOnly(Side.CLIENT) IIcon iconTrim; @SideOnly(Side.CLIENT) IIcon iconOverlayLeft; + @SideOnly(Side.CLIENT) IIcon iconOverlayRight; - public BlockFramingTable (String blockName) { + public BlockFramingTable(String blockName) { super(Material.wood); setCreativeTab(ModCreativeTabs.tabStorageDrawers); @@ -50,114 +50,107 @@ public class BlockFramingTable extends BlockContainer } @Override - public TileEntity createNewTileEntity (World world, int meta) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityFramingTable(); } @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float vx, float vy, float vz) { + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int side, float vx, float vy, float vz) { int meta = world.getBlockMetadata(x, y, z); int priX = x + getXOff(meta); int priZ = z + getZOff(meta); - if (world.getBlock(priX, y, priZ) != this || (world.getBlockMetadata(priX, y, priZ) & 0x8) != 0) - return false; + if (world.getBlock(priX, y, priZ) != this || (world.getBlockMetadata(priX, y, priZ) & 0x8) != 0) return false; player.openGui(StorageDrawers.instance, GuiHandler.framingGuiID, world, priX, y, priZ); return true; } - private int getXOff (int meta) { - if (isRightBlock(meta)) - return 0; + private int getXOff(int meta) { + if (isRightBlock(meta)) return 0; return rightOffset[getDirection(meta)][0]; } - private int getZOff (int meta) { - if (isRightBlock(meta)) - return 0; + private int getZOff(int meta) { + if (isRightBlock(meta)) return 0; return rightOffset[getDirection(meta)][1]; } @Override - public boolean isOpaqueCube () { + public boolean isOpaqueCube() { return false; } @Override - public boolean renderAsNormalBlock () { + public boolean renderAsNormalBlock() { return false; } @Override - public int getRenderType () { + public int getRenderType() { return StorageDrawers.proxy.framingTableRenderID; } @Override - public int getRenderBlockPass () { + public int getRenderBlockPass() { return 1; } @Override - public boolean canRenderInPass (int pass) { + public boolean canRenderInPass(int pass) { ClientProxy.renderPass = pass; return true; } @Override - public void onNeighborBlockChange (World world, int x, int y, int z, Block block) { + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { int meta = world.getBlockMetadata(x, y, z); int side = getDirection(meta); if (isRightBlock(meta)) { if (world.getBlock(x + leftOffset[side][0], y, z + leftOffset[side][1]) != this) { world.setBlockToAir(x, y, z); - if (!world.isRemote) - dropBlockAsItem(world, x, y, z, 1, 0); + if (!world.isRemote) dropBlockAsItem(world, x, y, z, 1, 0); } - } - else if (world.getBlock(x + rightOffset[side][0], y, z + rightOffset[side][1]) != this) + } else if (world.getBlock(x + rightOffset[side][0], y, z + rightOffset[side][1]) != this) world.setBlockToAir(x, y, z); } @Override - public Item getItemDropped (int meta, Random random, int fortune) { + public Item getItemDropped(int meta, Random random, int fortune) { return isPrimaryBlock(meta) ? Item.getItemFromBlock(ModBlocks.framingTable) : Item.getItemById(0); } @Override - public void dropBlockAsItemWithChance (World world, int x, int y, int z, int meta, float chance, int fortune) { - if (isPrimaryBlock(meta)) - super.dropBlockAsItemWithChance(world, x, y, z, meta, chance, fortune); + public void dropBlockAsItemWithChance(World world, int x, int y, int z, int meta, float chance, int fortune) { + if (isPrimaryBlock(meta)) super.dropBlockAsItemWithChance(world, x, y, z, meta, chance, fortune); } @Override - public int getMobilityFlag () { + public int getMobilityFlag() { return 1; } @Override - public void onBlockHarvested (World world, int x, int y, int z, int meta, EntityPlayer player) { + public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) { if (player.capabilities.isCreativeMode && !isPrimaryBlock(meta)) { int side = getDirection(meta); x += rightOffset[side][0]; z += rightOffset[side][1]; - if (world.getBlock(x, y, z) == this) - world.setBlockToAir(x, y, z); + if (world.getBlock(x, y, z) == this) world.setBlockToAir(x, y, z); } } @Override - public void breakBlock (World world, int x, int y, int z, Block block, int side) { - TileEntityFramingTable tile = (TileEntityFramingTable)world.getTileEntity(x, y, z); + public void breakBlock(World world, int x, int y, int z, Block block, int side) { + TileEntityFramingTable tile = (TileEntityFramingTable) world.getTileEntity(x, y, z); if (tile != null && isPrimaryBlock(world.getBlockMetadata(x, y, z))) { for (int i = 0, n = tile.getSizeInventory(); i < n; i++) { ItemStack stack = tile.getStackInSlot(i); - if (stack == null) - continue; + if (stack == null) continue; float fx = random.nextFloat() * .8f + .1f; float fy = random.nextFloat() * .8f + .1f; @@ -165,14 +158,19 @@ public class BlockFramingTable extends BlockContainer while (stack.stackSize > 0) { int amount = random.nextInt(21) + 10; - if (amount > stack.stackSize) - amount = stack.stackSize; + if (amount > stack.stackSize) amount = stack.stackSize; stack.stackSize -= amount; - EntityItem entity = new EntityItem(world, x + fx, y + fy, z + fz, new ItemStack(stack.getItem(), amount, stack.getItemDamage())); + EntityItem entity = new EntityItem( + world, + x + fx, + y + fy, + z + fz, + new ItemStack(stack.getItem(), amount, stack.getItemDamage())); if (stack.hasTagCompound()) - entity.getEntityItem().setTagCompound((NBTTagCompound)stack.getTagCompound().copy()); + entity.getEntityItem().setTagCompound((NBTTagCompound) + stack.getTagCompound().copy()); entity.motionX = random.nextGaussian() * .05f; entity.motionY = random.nextGaussian() * .05f + .2f; @@ -188,35 +186,35 @@ public class BlockFramingTable extends BlockContainer super.breakBlock(world, x, y, z, block, side); } - public static int getDirection (int meta) { + public static int getDirection(int meta) { return meta & 0x7; } - public static boolean isRightBlock (int meta) { + public static boolean isRightBlock(int meta) { return (meta & 0x8) == 0; } - public static boolean isPrimaryBlock (int meta) { + public static boolean isPrimaryBlock(int meta) { return isRightBlock(meta); } @SideOnly(Side.CLIENT) - public IIcon getIconBase () { + public IIcon getIconBase() { return iconBase; } @SideOnly(Side.CLIENT) - public IIcon getIconTrim () { + public IIcon getIconTrim() { return iconTrim; } @SideOnly(Side.CLIENT) - public IIcon getIconOverlay (boolean left) { + public IIcon getIconOverlay(boolean left) { return left ? iconOverlayLeft : iconOverlayRight; } @Override - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { iconBase = register.registerIcon(StorageDrawers.MOD_ID + ":base/base_oak"); iconTrim = register.registerIcon(StorageDrawers.MOD_ID + ":base/trim_oak"); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockSlave.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockSlave.java index 52d4d9b..1a46434 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockSlave.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockSlave.java @@ -15,14 +15,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class BlockSlave extends BlockContainer implements INetworked -{ +public class BlockSlave extends BlockContainer implements INetworked { @SideOnly(Side.CLIENT) private IIcon iconSide; + @SideOnly(Side.CLIENT) private IIcon iconSideEtched; - public BlockSlave (String blockName) { + public BlockSlave(String blockName) { super(Material.rock); setCreativeTab(ModCreativeTabs.tabStorageDrawers); @@ -33,7 +33,7 @@ public class BlockSlave extends BlockContainer implements INetworked @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) { + public IIcon getIcon(int side, int meta) { switch (side) { case 0: case 1: @@ -44,20 +44,20 @@ public class BlockSlave extends BlockContainer implements INetworked } @Override - public TileEntitySlave createNewTileEntity (World world, int meta) { + public TileEntitySlave createNewTileEntity(World world, int meta) { return new TileEntitySlave(); } - public void bindController (World world, int x, int y, int z) { + public void bindController(World world, int x, int y, int z) { TileEntitySlave te = getTileEntitySafe(world, x, y, z); } - public TileEntitySlave getTileEntity (IBlockAccess blockAccess, int x, int y, int z) { + public TileEntitySlave getTileEntity(IBlockAccess blockAccess, int x, int y, int z) { TileEntity tile = blockAccess.getTileEntity(x, y, z); return (tile instanceof TileEntitySlave) ? (TileEntitySlave) tile : null; } - public TileEntitySlave getTileEntitySafe (World world, int x, int y, int z) { + public TileEntitySlave getTileEntitySafe(World world, int x, int y, int z) { TileEntitySlave tile = getTileEntity(world, x, y, z); if (tile == null) { tile = createNewTileEntity(world, world.getBlockMetadata(x, y, z)); @@ -70,7 +70,7 @@ public class BlockSlave extends BlockContainer implements INetworked @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { iconSide = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_side"); iconSideEtched = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_side_2"); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockTrim.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockTrim.java index 9fe1e70..063cb86 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockTrim.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockTrim.java @@ -5,6 +5,8 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.INetworked; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockWood; import net.minecraft.block.material.Material; @@ -16,15 +18,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import java.util.ArrayList; -import java.util.List; - -public class BlockTrim extends Block implements INetworked -{ +public class BlockTrim extends Block implements INetworked { @SideOnly(Side.CLIENT) protected IIcon[] iconTrim; - public BlockTrim (String name) { + public BlockTrim(String name) { super(Material.wood); setBlockName(name); @@ -34,30 +32,29 @@ public class BlockTrim extends Block implements INetworked } @Override - public int damageDropped (int meta) { + public int damageDropped(int meta) { return meta; } @Override - public boolean removedByPlayer (World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { - if (willHarvest) - return true; + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { + if (willHarvest) return true; return super.removedByPlayer(world, player, x, y, z, willHarvest); } @Override - public void harvestBlock (World world, EntityPlayer player, int x, int y, int z, int meta) { + public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { super.harvestBlock(world, player, x, y, z, meta); world.setBlockToAir(x, y, z); } - protected ItemStack getMainDrop (World world, int x, int y, int z, int metadata) { + protected ItemStack getMainDrop(World world, int x, int y, int z, int metadata) { return new ItemStack(Item.getItemFromBlock(this), 1, metadata); } @Override - public ArrayList getDrops (World world, int x, int y, int z, int metadata, int fortune) { + public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { ItemStack dropStack = getMainDrop(world, x, y, z, metadata); ArrayList drops = new ArrayList(); @@ -67,24 +64,23 @@ public class BlockTrim extends Block implements INetworked } @Override - public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) { + public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) { list.add(new ItemStack(item, 1, 0)); if (StorageDrawers.config.cache.creativeTabVanillaWoods) { - for (int i = 1; i < BlockWood.field_150096_a.length; i++) - list.add(new ItemStack(item, 1, i)); + for (int i = 1; i < BlockWood.field_150096_a.length; i++) list.add(new ItemStack(item, 1, i)); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) { + public IIcon getIcon(int side, int meta) { meta = meta % iconTrim.length; return iconTrim[meta]; } @Override - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { String[] subtex = BlockWood.field_150096_a; iconTrim = new IIcon[subtex.length]; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockTrimCustom.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockTrimCustom.java index c318f94..6c58917 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockTrimCustom.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockTrimCustom.java @@ -6,6 +6,7 @@ import com.jaquadro.minecraft.storagedrawers.core.ClientProxy; import com.jaquadro.minecraft.storagedrawers.item.ItemCustomTrim; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,74 +18,70 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import java.util.List; - -public class BlockTrimCustom extends BlockTrim implements ITileEntityProvider -{ +public class BlockTrimCustom extends BlockTrim implements ITileEntityProvider { @SideOnly(Side.CLIENT) private IIcon defaultFace; + @SideOnly(Side.CLIENT) private IIcon defaultTrim; - public BlockTrimCustom (String name) { + public BlockTrimCustom(String name) { super(name); isBlockContainer = true; } @Override - public int getRenderType () { + public int getRenderType() { return StorageDrawers.proxy.trimCustomRenderID; } @Override - public int getRenderBlockPass () { + public int getRenderBlockPass() { return 1; } @Override - public boolean canRenderInPass (int pass) { + public boolean canRenderInPass(int pass) { ClientProxy.renderPass = pass; return true; } @Override - public boolean isOpaqueCube () { + public boolean isOpaqueCube() { return false; } @Override - protected ItemStack getMainDrop (World world, int x, int y, int z, int metadata) { + protected ItemStack getMainDrop(World world, int x, int y, int z, int metadata) { TileEntityTrim tile = getTileEntity(world, x, y, z); - if (tile == null) - return ItemCustomTrim.makeItemStack(this, 1, null, null); + if (tile == null) return ItemCustomTrim.makeItemStack(this, 1, null, null); return ItemCustomTrim.makeItemStack(this, 1, tile.getMaterialSide(), tile.getMaterialTrim()); } @Override - public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) { - if (StorageDrawers.config.cache.addonShowVanilla) - list.add(new ItemStack(item)); + public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) { + if (StorageDrawers.config.cache.addonShowVanilla) list.add(new ItemStack(item)); } - public TileEntityTrim getTileEntity (IBlockAccess blockAccess, int x, int y, int z) { + public TileEntityTrim getTileEntity(IBlockAccess blockAccess, int x, int y, int z) { TileEntity tile = blockAccess.getTileEntity(x, y, z); return (tile instanceof TileEntityTrim) ? (TileEntityTrim) tile : null; } @SideOnly(Side.CLIENT) - public IIcon getDefaultFaceIcon () { + public IIcon getDefaultFaceIcon() { return defaultFace; } @SideOnly(Side.CLIENT) - public IIcon getDefaultTrimIcon () { + public IIcon getDefaultTrimIcon() { return defaultTrim; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { super.registerBlockIcons(register); defaultFace = register.registerIcon(StorageDrawers.MOD_ID + ":base/base_default"); @@ -94,18 +91,18 @@ public class BlockTrimCustom extends BlockTrim implements ITileEntityProvider } @Override - public TileEntity createNewTileEntity (World world, int meta) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityTrim(); } @Override - public void breakBlock (World world, int x, int y, int z, Block block, int meta) { + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { super.breakBlock(world, x, y, z, block, meta); world.removeTileEntity(x, y, z); } @Override - public boolean onBlockEventReceived (World world, int x, int y, int z, int eventNum, int eventArg) { + public boolean onBlockEventReceived(World world, int x, int y, int z, int eventNum, int eventArg) { super.onBlockEventReceived(world, x, y, z, eventNum, eventArg); TileEntity tile = world.getTileEntity(x, y, z); return (tile != null) && tile.receiveClientEvent(eventNum, eventArg); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/DataResolver.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/DataResolver.java index 7bd1f5e..ad0bed5 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/DataResolver.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/DataResolver.java @@ -11,37 +11,30 @@ import net.minecraft.block.BlockWood; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -public class DataResolver extends ExtendedDataResolver -{ +public class DataResolver extends ExtendedDataResolver { private static String[] textureNames = BlockWood.field_150096_a; - public DataResolver (String modID) { + public DataResolver(String modID) { super(modID, textureNames); } @Override - public CreativeTabs getCreativeTabs (BlockType type) { + public CreativeTabs getCreativeTabs(BlockType type) { return ModCreativeTabs.tabStorageDrawers; } @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()) @@ -60,8 +53,7 @@ public class DataResolver extends ExtendedDataResolver } @Override - public void init () { - for (int i = 0, p = 0, m = 0; i < 6; i++, p++, m++) - setPlankSlab(i, Blocks.planks, p, Blocks.wooden_slab, m); + public void init() { + for (int i = 0, p = 0, m = 0; i < 6; i++, p++, m++) setPlankSlab(i, Blocks.planks, p, Blocks.wooden_slab, m); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/IExtendedBlockClickHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/IExtendedBlockClickHandler.java index 36c2985..b4a07c2 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/IExtendedBlockClickHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/IExtendedBlockClickHandler.java @@ -3,7 +3,16 @@ package com.jaquadro.minecraft.storagedrawers.block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -public interface IExtendedBlockClickHandler -{ - public void onBlockClicked (World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ, boolean invertShift); +public interface IExtendedBlockClickHandler { + public void onBlockClicked( + World world, + int x, + int y, + int z, + EntityPlayer player, + int side, + float hitX, + float hitY, + float hitZ, + boolean invertShift); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockDrawersPack.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockDrawersPack.java index 9786743..cd4fb46 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockDrawersPack.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockDrawersPack.java @@ -7,6 +7,7 @@ import com.jaquadro.minecraft.storagedrawers.core.ModBlocks; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -14,98 +15,85 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import java.util.List; - -public class BlockDrawersPack extends BlockDrawers implements IPackBlock -{ +public class BlockDrawersPack extends BlockDrawers implements IPackBlock { private IPackDataResolver resolver; - public BlockDrawersPack (IPackDataResolver resolver, int drawerCount, boolean halfDepth) { - super(resolver.getBlockName(BlockConfiguration.by(BlockType.Drawers, drawerCount, halfDepth)), drawerCount, halfDepth); + public BlockDrawersPack(IPackDataResolver resolver, int drawerCount, boolean halfDepth) { + super( + resolver.getBlockName(BlockConfiguration.by(BlockType.Drawers, drawerCount, halfDepth)), + drawerCount, + halfDepth); this.resolver = resolver; CreativeTabs tabs = resolver.getCreativeTabs(BlockType.Drawers); - if (StorageDrawers.config.cache.addonSeparateVanilla && tabs != null) - setCreativeTab(tabs); - else - setCreativeTab(ModCreativeTabs.tabStorageDrawers); + if (StorageDrawers.config.cache.addonSeparateVanilla && tabs != null) setCreativeTab(tabs); + else setCreativeTab(ModCreativeTabs.tabStorageDrawers); } - public String[] getUnlocalizedNames () { + public String[] getUnlocalizedNames() { String[] names = new String[16]; for (int i = 0; i < 16; i++) { - if (resolver.isValidMetaValue(i)) - names[i] = resolver.getUnlocalizedName(i); + if (resolver.isValidMetaValue(i)) names[i] = resolver.getUnlocalizedName(i); } return names; } @Override - public IPackDataResolver getDataResolver () { + public IPackDataResolver getDataResolver() { return resolver; } @Override - public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) { - if (!StorageDrawers.config.cache.addonShowVanilla) - return; + public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) { + if (!StorageDrawers.config.cache.addonShowVanilla) return; for (int i = 0; i < 16; i++) { - if (resolver.isValidMetaValue(i)) - list.add(new ItemStack(item, 1, i)); + if (resolver.isValidMetaValue(i)) list.add(new ItemStack(item, 1, i)); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) { + public IIcon getIcon(int side, int meta) { meta = (meta < 0 || meta >= iconSide.length) ? 0 : meta; - if (!resolver.isValidMetaValue(meta)) - getSimilarBlock().getIcon(side, meta); + if (!resolver.isValidMetaValue(meta)) getSimilarBlock().getIcon(side, meta); return super.getIcon(side, meta); } @Override @SideOnly(Side.CLIENT) - protected IIcon getIcon (IBlockAccess blockAccess, int x, int y, int z, int side, int level) { + protected IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side, int level) { int meta = blockAccess.getBlockMetadata(x, y, z); meta = (meta < 0 || meta >= iconSide.length) ? 0 : meta; - if (!resolver.isValidMetaValue(meta)) - getSimilarBlock().getIcon(side, meta); + if (!resolver.isValidMetaValue(meta)) getSimilarBlock().getIcon(side, meta); return super.getIcon(blockAccess, x, y, z, side, level); } @Override @SideOnly(Side.CLIENT) - public IIcon getIconTrim (int meta) { + public IIcon getIconTrim(int meta) { meta = (meta < 0 || meta >= iconSide.length) ? 0 : meta; - if (!resolver.isValidMetaValue(meta)) - getSimilarBlock().getIconTrim(meta); + if (!resolver.isValidMetaValue(meta)) getSimilarBlock().getIconTrim(meta); return super.getIconTrim(meta); } - private BlockDrawers getSimilarBlock () { - if (drawerCount == 1 && !halfDepth) - return ModBlocks.fullDrawers1; - if (drawerCount == 2 && !halfDepth) - return ModBlocks.fullDrawers2; - if (drawerCount == 4 && !halfDepth) - return ModBlocks.fullDrawers4; - if (drawerCount == 2 && halfDepth) - return ModBlocks.halfDrawers2; - if (drawerCount == 4 && halfDepth) - return ModBlocks.halfDrawers4; + private BlockDrawers getSimilarBlock() { + if (drawerCount == 1 && !halfDepth) return ModBlocks.fullDrawers1; + if (drawerCount == 2 && !halfDepth) return ModBlocks.fullDrawers2; + if (drawerCount == 4 && !halfDepth) return ModBlocks.fullDrawers4; + if (drawerCount == 2 && halfDepth) return ModBlocks.halfDrawers2; + if (drawerCount == 4 && halfDepth) return ModBlocks.halfDrawers4; return ModBlocks.fullDrawers1; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { super.registerBlockIcons(register); iconSide = new IIcon[16]; @@ -117,8 +105,7 @@ public class BlockDrawersPack extends BlockDrawers implements IPackBlock iconTrim = new IIcon[16]; for (int i = 0; i < 16; i++) { - if (!resolver.isValidMetaValue(i)) - continue; + if (!resolver.isValidMetaValue(i)) continue; iconFront1[i] = register.registerIcon(resolver.getTexturePath(TextureType.Front1, i)); iconFront2[i] = register.registerIcon(resolver.getTexturePath(TextureType.Front2, i)); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockSortingDrawersPack.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockSortingDrawersPack.java index 7d8e8bd..eca10b1 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockSortingDrawersPack.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockSortingDrawersPack.java @@ -7,6 +7,7 @@ import com.jaquadro.minecraft.storagedrawers.integration.RefinedRelocation; import com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation.BlockSortingDrawers; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -14,98 +15,85 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import java.util.List; - -public class BlockSortingDrawersPack extends BlockSortingDrawers implements IPackBlock -{ +public class BlockSortingDrawersPack extends BlockSortingDrawers implements IPackBlock { private IPackDataResolver resolver; - public BlockSortingDrawersPack (IPackDataResolver resolver, int drawerCount, boolean halfDepth) { - super(resolver.getBlockName(BlockConfiguration.by(BlockType.DrawersSorting, drawerCount, halfDepth)), drawerCount, halfDepth); + public BlockSortingDrawersPack(IPackDataResolver resolver, int drawerCount, boolean halfDepth) { + super( + resolver.getBlockName(BlockConfiguration.by(BlockType.DrawersSorting, drawerCount, halfDepth)), + drawerCount, + halfDepth); this.resolver = resolver; CreativeTabs tabs = resolver.getCreativeTabs(BlockType.DrawersSorting); - if (StorageDrawers.config.cache.addonSeparateVanilla && tabs != null) - setCreativeTab(tabs); - else - setCreativeTab(ModCreativeTabs.tabStorageDrawers); + if (StorageDrawers.config.cache.addonSeparateVanilla && tabs != null) setCreativeTab(tabs); + else setCreativeTab(ModCreativeTabs.tabStorageDrawers); } - public String[] getUnlocalizedNames () { + public String[] getUnlocalizedNames() { String[] names = new String[16]; for (int i = 0; i < 16; i++) { - if (resolver.isValidMetaValue(i)) - names[i] = resolver.getUnlocalizedName(i); + if (resolver.isValidMetaValue(i)) names[i] = resolver.getUnlocalizedName(i); } return names; } @Override - public IPackDataResolver getDataResolver () { + public IPackDataResolver getDataResolver() { return resolver; } @Override - public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) { - if (!StorageDrawers.config.cache.addonShowVanilla) - return; + public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) { + if (!StorageDrawers.config.cache.addonShowVanilla) return; for (int i = 0; i < 16; i++) { - if (resolver.isValidMetaValue(i)) - list.add(new ItemStack(item, 1, i)); + if (resolver.isValidMetaValue(i)) list.add(new ItemStack(item, 1, i)); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) { + public IIcon getIcon(int side, int meta) { meta = (meta < 0 || meta >= iconSide.length) ? 0 : meta; - if (!resolver.isValidMetaValue(meta)) - getSimilarBlock().getIcon(side, meta); + if (!resolver.isValidMetaValue(meta)) getSimilarBlock().getIcon(side, meta); return super.getIcon(side, meta); } @Override @SideOnly(Side.CLIENT) - protected IIcon getIcon (IBlockAccess blockAccess, int x, int y, int z, int side, int level) { + protected IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side, int level) { int meta = blockAccess.getBlockMetadata(x, y, z); meta = (meta < 0 || meta >= iconSide.length) ? 0 : meta; - if (!resolver.isValidMetaValue(meta)) - getSimilarBlock().getIcon(side, meta); + if (!resolver.isValidMetaValue(meta)) getSimilarBlock().getIcon(side, meta); return super.getIcon(blockAccess, x, y, z, side, level); } @Override @SideOnly(Side.CLIENT) - public IIcon getIconTrim (int meta) { + public IIcon getIconTrim(int meta) { meta = (meta < 0 || meta >= iconSide.length) ? 0 : meta; - if (!resolver.isValidMetaValue(meta)) - getSimilarBlock().getIconTrim(meta); + if (!resolver.isValidMetaValue(meta)) getSimilarBlock().getIconTrim(meta); return super.getIconTrim(meta); } - private BlockSortingDrawers getSimilarBlock () { - if (drawerCount == 1 && !halfDepth) - return RefinedRelocation.fullDrawers1; - if (drawerCount == 2 && !halfDepth) - return RefinedRelocation.fullDrawers2; - if (drawerCount == 4 && !halfDepth) - return RefinedRelocation.fullDrawers4; - if (drawerCount == 2 && halfDepth) - return RefinedRelocation.halfDrawers2; - if (drawerCount == 4 && halfDepth) - return RefinedRelocation.halfDrawers4; + private BlockSortingDrawers getSimilarBlock() { + if (drawerCount == 1 && !halfDepth) return RefinedRelocation.fullDrawers1; + if (drawerCount == 2 && !halfDepth) return RefinedRelocation.fullDrawers2; + if (drawerCount == 4 && !halfDepth) return RefinedRelocation.fullDrawers4; + if (drawerCount == 2 && halfDepth) return RefinedRelocation.halfDrawers2; + if (drawerCount == 4 && halfDepth) return RefinedRelocation.halfDrawers4; return RefinedRelocation.fullDrawers1; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { super.registerBlockIcons(register); iconSide = new IIcon[16]; @@ -118,8 +106,7 @@ public class BlockSortingDrawersPack extends BlockSortingDrawers implements IPac iconSort = new IIcon[16]; for (int i = 0; i < 16; i++) { - if (!resolver.isValidMetaValue(i)) - continue; + if (!resolver.isValidMetaValue(i)) continue; iconFront1[i] = register.registerIcon(resolver.getTexturePath(TextureType.Front1, i)); iconFront2[i] = register.registerIcon(resolver.getTexturePath(TextureType.Front2, i)); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockSortingTrimPack.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockSortingTrimPack.java index cad0b0e..b3e6198 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockSortingTrimPack.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockSortingTrimPack.java @@ -6,71 +6,63 @@ import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation.BlockSortingTrim; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import java.util.List; - -public class BlockSortingTrimPack extends BlockSortingTrim implements IPackBlock -{ +public class BlockSortingTrimPack extends BlockSortingTrim implements IPackBlock { IPackDataResolver resolver; - public BlockSortingTrimPack (IPackDataResolver resolver) { + public BlockSortingTrimPack(IPackDataResolver resolver) { super(resolver.getBlockName(BlockConfiguration.TrimSorting)); this.resolver = resolver; CreativeTabs tabs = resolver.getCreativeTabs(BlockType.TrimSorting); - if (StorageDrawers.config.cache.addonSeparateVanilla && tabs != null) - setCreativeTab(tabs); - else - setCreativeTab(ModCreativeTabs.tabStorageDrawers); + if (StorageDrawers.config.cache.addonSeparateVanilla && tabs != null) setCreativeTab(tabs); + else setCreativeTab(ModCreativeTabs.tabStorageDrawers); } - public String[] getUnlocalizedNames () { + public String[] getUnlocalizedNames() { String[] names = new String[16]; for (int i = 0; i < 16; i++) { - if (resolver.isValidMetaValue(i)) - names[i] = resolver.getUnlocalizedName(i); + if (resolver.isValidMetaValue(i)) names[i] = resolver.getUnlocalizedName(i); } return names; } @Override - public IPackDataResolver getDataResolver () { + public IPackDataResolver getDataResolver() { return resolver; } @Override - public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) { - if (!StorageDrawers.config.cache.addonShowVanilla) - return; + public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) { + if (!StorageDrawers.config.cache.addonShowVanilla) return; for (int i = 0; i < 16; i++) { - if (resolver.isValidMetaValue(i)) - list.add(new ItemStack(item, 1, i)); + if (resolver.isValidMetaValue(i)) list.add(new ItemStack(item, 1, i)); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) { + public IIcon getIcon(int side, int meta) { meta = meta % 16; return iconTrim[meta]; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { iconTrim = new IIcon[16]; for (int i = 0; i < 16; i++) { - if (!resolver.isValidMetaValue(i)) - continue; + if (!resolver.isValidMetaValue(i)) continue; iconTrim[i] = register.registerIcon(resolver.getTexturePath(TextureType.TrimBlock, i)); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockTrimPack.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockTrimPack.java index 950ddb8..8a2d974 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockTrimPack.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/pack/BlockTrimPack.java @@ -6,71 +6,63 @@ import com.jaquadro.minecraft.storagedrawers.block.BlockTrim; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import java.util.List; - -public class BlockTrimPack extends BlockTrim implements IPackBlock -{ +public class BlockTrimPack extends BlockTrim implements IPackBlock { private IPackDataResolver resolver; - public BlockTrimPack (IPackDataResolver resolver) { + public BlockTrimPack(IPackDataResolver resolver) { super(resolver.getBlockName(BlockConfiguration.Trim)); this.resolver = resolver; CreativeTabs tabs = resolver.getCreativeTabs(BlockType.Trim); - if (StorageDrawers.config.cache.addonSeparateVanilla && tabs != null) - setCreativeTab(tabs); - else - setCreativeTab(ModCreativeTabs.tabStorageDrawers); + if (StorageDrawers.config.cache.addonSeparateVanilla && tabs != null) setCreativeTab(tabs); + else setCreativeTab(ModCreativeTabs.tabStorageDrawers); } - public String[] getUnlocalizedNames () { + public String[] getUnlocalizedNames() { String[] names = new String[16]; for (int i = 0; i < 16; i++) { - if (resolver.isValidMetaValue(i)) - names[i] = resolver.getUnlocalizedName(i); + if (resolver.isValidMetaValue(i)) names[i] = resolver.getUnlocalizedName(i); } return names; } @Override - public IPackDataResolver getDataResolver () { + public IPackDataResolver getDataResolver() { return resolver; } @Override - public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) { - if (!StorageDrawers.config.cache.addonShowVanilla) - return; + public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) { + if (!StorageDrawers.config.cache.addonShowVanilla) return; for (int i = 0; i < 16; i++) { - if (resolver.isValidMetaValue(i)) - list.add(new ItemStack(item, 1, i)); + if (resolver.isValidMetaValue(i)) list.add(new ItemStack(item, 1, i)); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) { + public IIcon getIcon(int side, int meta) { meta = meta % 16; return iconTrim[meta]; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { iconTrim = new IIcon[16]; for (int i = 0; i < 16; i++) { - if (!resolver.isValidMetaValue(i)) - continue; + if (!resolver.isValidMetaValue(i)) continue; iconTrim[i] = register.registerIcon(resolver.getTexturePath(TextureType.TrimBlock, i)); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/BaseTileEntity.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/BaseTileEntity.java index 36554f9..6658442 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/BaseTileEntity.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/BaseTileEntity.java @@ -2,18 +2,16 @@ package com.jaquadro.minecraft.storagedrawers.block.tile; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import cpw.mods.fml.common.FMLLog; +import java.util.Iterator; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import org.apache.logging.log4j.Level; -import java.util.Iterator; - -public class BaseTileEntity extends TileEntity -{ +public class BaseTileEntity extends TileEntity { private NBTTagCompound failureSnapshot; @Override - public void readFromNBT (NBTTagCompound tag) { + public void readFromNBT(NBTTagCompound tag) { super.readFromNBT(tag); failureSnapshot = null; @@ -21,14 +19,13 @@ public class BaseTileEntity extends TileEntity try { readFromFixedNBT(tag); readFromPortableNBT(tag); - } - catch (Throwable t) { + } catch (Throwable t) { trapLoadFailure(t, tag); } } @Override - public void writeToNBT (NBTTagCompound tag) { + public void writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); if (failureSnapshot != null) { @@ -39,35 +36,33 @@ public class BaseTileEntity extends TileEntity try { writeToFixedNBT(tag); writeToPortableNBT(tag); - } - catch (Throwable t) { + } catch (Throwable t) { FMLLog.log(StorageDrawers.MOD_ID, Level.ERROR, t, "Tile Save Failure."); } } - public void readFromPortableNBT (NBTTagCompound tag) { } + public void readFromPortableNBT(NBTTagCompound tag) {} - public void writeToPortableNBT (NBTTagCompound tag) { } + public void writeToPortableNBT(NBTTagCompound tag) {} - protected void readFromFixedNBT (NBTTagCompound tag) { } + protected void readFromFixedNBT(NBTTagCompound tag) {} - protected void writeToFixedNBT (NBTTagCompound tag) { } + protected void writeToFixedNBT(NBTTagCompound tag) {} - protected void trapLoadFailure (Throwable t, NBTTagCompound tag) { - failureSnapshot = (NBTTagCompound)tag.copy(); + protected void trapLoadFailure(Throwable t, NBTTagCompound tag) { + failureSnapshot = (NBTTagCompound) tag.copy(); FMLLog.log(StorageDrawers.MOD_ID, Level.ERROR, t, "Tile Load Failure."); } - protected void restoreLoadFailure (NBTTagCompound tag) { + protected void restoreLoadFailure(NBTTagCompound tag) { Iterator iter = failureSnapshot.func_150296_c().iterator(); while (iter.hasNext()) { String key = iter.next(); - if (!tag.hasKey(key)) - tag.setTag(key, failureSnapshot.getTag(key).copy()); + if (!tag.hasKey(key)) tag.setTag(key, failureSnapshot.getTag(key).copy()); } } - protected boolean loadDidFail () { + protected boolean loadDidFail() { return failureSnapshot != null; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/BlockCoord.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/BlockCoord.java index 61c704f..fbeda1c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/BlockCoord.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/BlockCoord.java @@ -1,43 +1,41 @@ package com.jaquadro.minecraft.storagedrawers.block.tile; /** -* Created by Justin on 4/25/2015. -*/ -class BlockCoord -{ + * Created by Justin on 4/25/2015. + */ +class BlockCoord { private int x; private int y; private int z; - public BlockCoord (int x, int y, int z) { + public BlockCoord(int x, int y, int z) { this.x = x; this.y = y; this.z = z; } - public int x () { + public int x() { return x; } - public int y () { + public int y() { return y; } - public int z () { + public int z() { return z; } @Override - public boolean equals (Object obj) { - if (obj == null || obj.getClass() != getClass()) - return false; + public boolean equals(Object obj) { + if (obj == null || obj.getClass() != getClass()) return false; - BlockCoord that = (BlockCoord)obj; + BlockCoord that = (BlockCoord) obj; return x == that.x && y == that.y && z == that.z; } @Override - public int hashCode () { + public int hashCode() { int hash = 23; hash = hash * 31 + x; hash = hash * 31 + y; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java index 2554dd4..a11b497 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java @@ -9,13 +9,11 @@ import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.BlockSlave; import com.jaquadro.minecraft.storagedrawers.security.SecurityManager; import com.jaquadro.minecraft.storagedrawers.util.ItemMetaListRegistry; -import com.jaquadro.minecraft.storagedrawers.util.ItemMetaRegistry; -import com.jaquadro.minecraft.storagedrawers.util.UniqueMetaIdentifier; import com.mojang.authlib.GameProfile; +import java.util.*; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -23,12 +21,9 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants; -import net.minecraftforge.common.util.ForgeDirection; -import java.util.*; - -public class TileEntityController extends TileEntity implements IDrawerGroup, IPriorityGroup, ISmartGroup, ISidedInventory -{ +public class TileEntityController extends TileEntity + implements IDrawerGroup, IPriorityGroup, ISmartGroup, ISidedInventory { private static final int PRI_VOID = 0; private static final int PRI_LOCKED = 1; private static final int PRI_NORMAL = 2; @@ -39,15 +34,14 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP private static final int DEPTH_LIMIT = 12; private static final int[] emptySlots = new int[0]; - private static class StorageRecord - { + private static class StorageRecord { public IDrawerGroup storage; public boolean mark; public int invStorageSize; public int drawerStorageSize; public int distance = Integer.MAX_VALUE; - public void clear () { + public void clear() { storage = null; mark = false; invStorageSize = 0; @@ -56,29 +50,27 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP } } - private static class SlotRecord - { + private static class SlotRecord { public BlockCoord coord; public int slot; public int index; public int priority; - public SlotRecord (BlockCoord coord, int slot) { + public SlotRecord(BlockCoord coord, int slot) { this.coord = coord; this.slot = slot; } } - private Comparator slotRecordComparator = new Comparator() - { + private Comparator slotRecordComparator = new Comparator() { @Override - public int compare (SlotRecord o1, SlotRecord o2) { + public int compare(SlotRecord o1, SlotRecord o2) { return o1.priority - o2.priority; } }; - private int getSlotPriority (SlotRecord record, boolean invBased) { + private int getSlotPriority(SlotRecord record, boolean invBased) { IDrawerGroup group = getGroupForCoord(record.coord); if (group == null) { return PRI_DISABLED; @@ -91,21 +83,19 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP IDrawer drawer = group.getDrawer(drawerSlot); if (drawer.isEmpty()) { - if ((drawer instanceof ILockable && ((ILockable) drawer).isLocked(LockAttribute.LOCK_EMPTY)) || - (group instanceof ILockable && ((ILockable) group).isLocked(LockAttribute.LOCK_EMPTY))) { + if ((drawer instanceof ILockable && ((ILockable) drawer).isLocked(LockAttribute.LOCK_EMPTY)) + || (group instanceof ILockable && ((ILockable) group).isLocked(LockAttribute.LOCK_EMPTY))) { return PRI_LOCKED_EMPTY; - } - else - return PRI_EMPTY; + } else return PRI_EMPTY; } - if ((drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) || - (group instanceof IVoidable && ((IVoidable) group).isVoid())) { + if ((drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) + || (group instanceof IVoidable && ((IVoidable) group).isVoid())) { return PRI_VOID; } - if ((drawer instanceof ILockable && ((ILockable) drawer).isLocked(LockAttribute.LOCK_POPULATED)) || - (group instanceof ILockable && ((ILockable) group).isLocked(LockAttribute.LOCK_POPULATED))) { + if ((drawer instanceof ILockable && ((ILockable) drawer).isLocked(LockAttribute.LOCK_POPULATED)) + || (group instanceof ILockable && ((ILockable) group).isLocked(LockAttribute.LOCK_POPULATED))) { return PRI_LOCKED; } @@ -124,7 +114,7 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP private int[] inventorySlots = new int[0]; private int[] drawerSlots = new int[0]; - private int[] autoSides = new int[] { 0, 1, 2, 3, 4, 5 }; + private int[] autoSides = new int[] {0, 1, 2, 3, 4, 5}; private int direction; private int drawerSize = 0; @@ -137,26 +127,26 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP private String customName; - public TileEntityController () { + public TileEntityController() { invSlotList.add(new SlotRecord(null, 0)); - inventorySlots = new int[] { 0 }; + inventorySlots = new int[] {0}; range = StorageDrawers.config.getControllerRange(); maxDrawers = StorageDrawers.config.getControllerMaxDrawers(); } - public int getDirection () { + public int getDirection() { return direction; } - public void setDirection (int direction) { + public void setDirection(int direction) { this.direction = direction % 6; } - public int interactPutItemsIntoInventory (EntityPlayer player) { - if (inventorySlots.length == 0) - updateCache(); + public int interactPutItemsIntoInventory(EntityPlayer player) { + if (inventorySlots.length == 0) updateCache(); - boolean dumpInventory = worldObj.getTotalWorldTime() - lastClickTime < 10 && player.getPersistentID().equals(lastClickUUID); + boolean dumpInventory = worldObj.getTotalWorldTime() - lastClickTime < 10 + && player.getPersistentID().equals(lastClickUUID); int count = 0; if (!dumpInventory) { @@ -166,19 +156,16 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP if (currentStack.stackSize == 0) player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } - } - else { + } else { for (int i = 0, n = player.inventory.getSizeInventory(); i < n; i++) { ItemStack subStack = player.inventory.getStackInSlot(i); if (subStack != null) { count += insertItems(subStack, player.getGameProfile()); - if (subStack.stackSize == 0) - player.inventory.setInventorySlotContents(i, null); + if (subStack.stackSize == 0) player.inventory.setInventorySlotContents(i, null); } } - if (count > 0) - StorageDrawers.proxy.updatePlayerInventory(player); + if (count > 0) StorageDrawers.proxy.updatePlayerInventory(player); } lastClickTime = worldObj.getTotalWorldTime(); @@ -187,27 +174,23 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP return count; } - private int insertItems (ItemStack stack, GameProfile profile) { + private int insertItems(ItemStack stack, GameProfile profile) { int itemsLeft = stack.stackSize; for (int slot : enumerateDrawersForInsertion(stack, false)) { IDrawerGroup group = getGroupForDrawerSlot(slot); if (group instanceof IProtectable) { - if (!SecurityManager.hasAccess(profile, (IProtectable)group)) - continue; + if (!SecurityManager.hasAccess(profile, (IProtectable) group)) continue; } IDrawer drawer = getDrawer(slot); ItemStack itemProto = drawer.getStoredItemPrototype(); - if (itemProto == null) - break; + if (itemProto == null) break; itemsLeft = insertItemsIntoDrawer(drawer, itemsLeft); - if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) - itemsLeft = 0; - if (itemsLeft == 0) - break; + if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) itemsLeft = 0; + if (itemsLeft == 0) break; } int count = stack.stackSize - itemsLeft; @@ -216,19 +199,17 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP return count; } - private int insertItemsIntoDrawer (IDrawer drawer, int itemCount) { + private int insertItemsIntoDrawer(IDrawer drawer, int itemCount) { int capacity = drawer.getMaxCapacity(); int storedItems = drawer.getStoredItemCount(); int storableItems = capacity - storedItems; if (drawer instanceof IFractionalDrawer) { - IFractionalDrawer fracDrawer = (IFractionalDrawer)drawer; - if (!fracDrawer.isSmallestUnit() && fracDrawer.getStoredItemRemainder() > 0) - storableItems--; + IFractionalDrawer fracDrawer = (IFractionalDrawer) drawer; + if (!fracDrawer.isSmallestUnit() && fracDrawer.getStoredItemRemainder() > 0) storableItems--; } - if (storableItems == 0) - return itemCount; + if (storableItems == 0) return itemCount; int remainder = Math.max(itemCount - storableItems, 0); storedItems += Math.min(itemCount, storableItems); @@ -237,24 +218,21 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP return remainder; } - public void toggleProtection (GameProfile profile, ISecurityProvider provider) { + public void toggleProtection(GameProfile profile, ISecurityProvider provider) { IProtectable template = null; UUID state = null; for (StorageRecord record : storage.values()) { - if (record.storage == null) - continue; + if (record.storage == null) continue; if (record.storage instanceof IProtectable) { - IProtectable protectable = (IProtectable)record.storage; - if (!SecurityManager.hasOwnership(profile, protectable)) - continue; + IProtectable protectable = (IProtectable) record.storage; + if (!SecurityManager.hasOwnership(profile, protectable)) continue; if (template == null) { template = protectable; - if (template.getOwner() == null) - state = profile.getId(); + if (template.getOwner() == null) state = profile.getId(); else { state = null; provider = null; @@ -267,28 +245,24 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP } } - public void toggleShroud (GameProfile profile) { + public void toggleShroud(GameProfile profile) { IShroudable template = null; boolean state = false; for (StorageRecord record : storage.values()) { - if (record.storage == null) - continue; + if (record.storage == null) continue; if (record.storage instanceof IProtectable) { - if (!SecurityManager.hasAccess(profile, (IProtectable)record.storage)) - continue; + if (!SecurityManager.hasAccess(profile, (IProtectable) record.storage)) continue; } for (int i = 0, n = record.storage.getDrawerCount(); i < n; i++) { - if (!record.storage.isDrawerEnabled(i)) - continue; + if (!record.storage.isDrawerEnabled(i)) continue; IDrawer drawer = record.storage.getDrawer(i); - if (!(drawer instanceof IShroudable)) - continue; + if (!(drawer instanceof IShroudable)) continue; - IShroudable shroudableStorage = (IShroudable)drawer; + IShroudable shroudableStorage = (IShroudable) drawer; if (template == null) { template = shroudableStorage; state = !template.isShrouded(); @@ -299,67 +273,59 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP } } - public void toggleLock (EnumSet attributes, LockAttribute key, GameProfile profile) { + public void toggleLock(EnumSet attributes, LockAttribute key, GameProfile profile) { ILockable template = null; boolean state = false; for (StorageRecord record : storage.values()) { - if (record.storage == null) - continue; + if (record.storage == null) continue; if (record.storage instanceof IProtectable) { - if (!SecurityManager.hasAccess(profile, (IProtectable)record.storage)) - continue; + if (!SecurityManager.hasAccess(profile, (IProtectable) record.storage)) continue; } if (record.storage instanceof ILockable) { - ILockable lockableStorage = (ILockable)record.storage; + ILockable lockableStorage = (ILockable) record.storage; if (template == null) { template = lockableStorage; state = !template.isLocked(key); } - for (LockAttribute attr : attributes) - lockableStorage.setLocked(attr, state); - } - else { + for (LockAttribute attr : attributes) lockableStorage.setLocked(attr, state); + } else { for (int i = 0, n = record.storage.getDrawerCount(); i < n; i++) { - if (!record.storage.isDrawerEnabled(i)) - continue; + if (!record.storage.isDrawerEnabled(i)) continue; IDrawer drawer = record.storage.getDrawer(i); - if (!(drawer instanceof IShroudable)) - continue; + if (!(drawer instanceof IShroudable)) continue; - ILockable lockableStorage = (ILockable)drawer; + ILockable lockableStorage = (ILockable) drawer; if (template == null) { template = lockableStorage; state = !template.isLocked(key); } - for (LockAttribute attr : attributes) - lockableStorage.setLocked(attr, state); + for (LockAttribute attr : attributes) lockableStorage.setLocked(attr, state); } } } } - private void resetCache () { + private void resetCache() { storage.clear(); invSlotList.clear(); drawerSlotList.clear(); drawerSize = 0; } - public boolean isValidSlave (BlockCoord coord) { + public boolean isValidSlave(BlockCoord coord) { StorageRecord record = storage.get(coord); - if (record == null || !record.mark) - return false; + if (record == null || !record.mark) return false; return record.storage == null; } - public void updateCache () { + public void updateCache() { int preCount = inventorySlots.length; resetCache(); @@ -374,12 +340,11 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP rebuildPrimaryLookup(drawerPrimaryLookup, drawerSlotList, false); if (preCount != inventorySlots.length && (preCount == 0 || inventorySlots.length == 0)) { - if (!worldObj.isRemote) - markDirty(); + if (!worldObj.isRemote) markDirty(); } } - private void indexSlotRecords (List records, boolean invBased) { + private void indexSlotRecords(List records, boolean invBased) { for (int i = 0, n = records.size(); i < n; i++) { SlotRecord record = records.get(i); if (record != null) { @@ -389,58 +354,53 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP } } - private int[] sortSlotRecords (List records, boolean invBased) { + private int[] sortSlotRecords(List records, boolean invBased) { indexSlotRecords(records, invBased); List copied = new ArrayList(records); Collections.sort(copied, slotRecordComparator); int[] slotMap = new int[copied.size()]; - for (int i = 0; i < slotMap.length; i++) - slotMap[i] = copied.get(i).index; + for (int i = 0; i < slotMap.length; i++) slotMap[i] = copied.get(i).index; return slotMap; } - private void rebuildPrimaryLookup (ItemMetaListRegistry lookup, List records, boolean invBased) { + private void rebuildPrimaryLookup( + ItemMetaListRegistry lookup, List records, boolean invBased) { lookup.clear(); for (SlotRecord record : records) { IDrawerGroup group = getGroupForCoord(record.coord); - if (group == null) - continue; + if (group == null) continue; int drawerSlot = (invBased) ? group.getDrawerInventory().getDrawerSlot(record.slot) : record.slot; - if (!group.isDrawerEnabled(drawerSlot)) - continue; + if (!group.isDrawerEnabled(drawerSlot)) continue; IDrawer drawer = group.getDrawer(drawerSlot); - if (drawer.isEmpty()) - continue; + if (drawer.isEmpty()) continue; ItemStack item = drawer.getStoredItemPrototype(); lookup.register(item.getItem(), item.getItemDamage(), record); } } - private boolean containsNullEntries (List list) { + private boolean containsNullEntries(List list) { int nullCount = 0; for (int i = 0, n = list.size(); i < n; i++) { - if (list.get(i) == null) - nullCount++; + if (list.get(i) == null) nullCount++; } return nullCount > 0; } - private void flattenLists () { + private void flattenLists() { if (containsNullEntries(invSlotList)) { List newInvSlotList = new ArrayList(); for (int i = 0, n = invSlotList.size(); i < n; i++) { SlotRecord record = invSlotList.get(i); - if (record != null) - newInvSlotList.add(record); + if (record != null) newInvSlotList.add(record); } invSlotList = newInvSlotList; @@ -451,95 +411,78 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP for (int i = 0, n = drawerSlotList.size(); i < n; i++) { SlotRecord record = drawerSlotList.get(i); - if (record != null) - newDrawerSlotList.add(record); + if (record != null) newDrawerSlotList.add(record); } drawerSlotList = newDrawerSlotList; } } - private void clearRecordInfo (BlockCoord coord, StorageRecord record) { + private void clearRecordInfo(BlockCoord coord, StorageRecord record) { record.clear(); for (int i = 0; i < invSlotList.size(); i++) { SlotRecord slotRecord = invSlotList.get(i); - if (slotRecord != null && coord.equals(slotRecord.coord)) - invSlotList.set(i, null); + if (slotRecord != null && coord.equals(slotRecord.coord)) invSlotList.set(i, null); } for (int i = 0; i < drawerSlotList.size(); i++) { SlotRecord slotRecord = drawerSlotList.get(i); - if (slotRecord != null && coord.equals(slotRecord.coord)) - drawerSlotList.set(i, null); + if (slotRecord != null && coord.equals(slotRecord.coord)) drawerSlotList.set(i, null); } } - private void updateRecordInfo (BlockCoord coord, StorageRecord record, TileEntity te) { + private void updateRecordInfo(BlockCoord coord, StorageRecord record, TileEntity te) { if (te == null) { - if (record.storage != null) - clearRecordInfo(coord, record); + if (record.storage != null) clearRecordInfo(coord, record); return; } if (te instanceof TileEntityController) { - if (record.storage == null && record.invStorageSize > 0) - return; + if (record.storage == null && record.invStorageSize > 0) return; - if (record.storage != null) - clearRecordInfo(coord, record); + if (record.storage != null) clearRecordInfo(coord, record); record.storage = null; record.invStorageSize = 1; invSlotList.add(new SlotRecord(null, 0)); - } - else if (te instanceof TileEntitySlave) { + } else if (te instanceof TileEntitySlave) { if (record.storage == null && record.invStorageSize == 0) { - if (((TileEntitySlave) te).getController() == this) - return; + if (((TileEntitySlave) te).getController() == this) return; } - if (record.storage != null) - clearRecordInfo(coord, record); + if (record.storage != null) clearRecordInfo(coord, record); record.storage = null; record.invStorageSize = 0; ((TileEntitySlave) te).bindController(xCoord, yCoord, zCoord); - } - else if (te instanceof IDrawerGroup) { - IDrawerGroup group = (IDrawerGroup)te; - if (record.storage == group) - return; + } else if (te instanceof IDrawerGroup) { + IDrawerGroup group = (IDrawerGroup) te; + if (record.storage == group) return; - if (record.storage != null && record.storage != group) - clearRecordInfo(coord, record); + if (record.storage != null && record.storage != group) clearRecordInfo(coord, record); IDrawerInventory inventory = group.getDrawerInventory(); - if (inventory == null) - return; + if (inventory == null) return; record.storage = group; record.invStorageSize = inventory.getSizeInventory(); record.drawerStorageSize = group.getDrawerCount(); - for (int i = 0, n = record.invStorageSize; i < n; i++) - invSlotList.add(new SlotRecord(coord, i)); + for (int i = 0, n = record.invStorageSize; i < n; i++) invSlotList.add(new SlotRecord(coord, i)); - for (int i = 0, n = record.drawerStorageSize; i < n; i++) - drawerSlotList.add(new SlotRecord(coord, i)); + for (int i = 0, n = record.drawerStorageSize; i < n; i++) drawerSlotList.add(new SlotRecord(coord, i)); drawerSize += record.drawerStorageSize; - } - else { - if (record.storage != null) - clearRecordInfo(coord, record); + } else { + if (record.storage != null) clearRecordInfo(coord, record); } } - private void populateNodes (int x, int y, int z) { + private void populateNodes(int x, int y, int z) { BlockCoord root = new BlockCoord(x, y, z); searchQueue.clear(); @@ -553,12 +496,10 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP while (!searchQueue.isEmpty()) { BlockCoord coord = searchQueue.remove(); int depth = Math.max(Math.max(Math.abs(coord.x() - x), Math.abs(coord.y() - y)), Math.abs(coord.z() - z)); - if (depth > range) - continue; + if (depth > range) continue; Block block = worldObj.getBlock(coord.x(), coord.y(), coord.z()); - if (!(block instanceof INetworked)) - continue; + if (!(block instanceof INetworked)) continue; StorageRecord record = storage.get(coord); if (record == null) { @@ -592,38 +533,32 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP } } - private IDrawerGroup getGroupForInvSlot (int invSlot) { - if (invSlot >= invSlotList.size()) - return null; + private IDrawerGroup getGroupForInvSlot(int invSlot) { + if (invSlot >= invSlotList.size()) return null; SlotRecord record = invSlotList.get(invSlot); - if (record == null) - return null; + if (record == null) return null; return getGroupForCoord(record.coord); } - private IDrawerGroup getGroupForDrawerSlot (int drawerSlot) { - if (drawerSlot >= drawerSlotList.size()) - return null; + private IDrawerGroup getGroupForDrawerSlot(int drawerSlot) { + if (drawerSlot >= drawerSlotList.size()) return null; SlotRecord record = drawerSlotList.get(drawerSlot); - if (record == null) - return null; + if (record == null) return null; return getGroupForCoord(record.coord); } - private IDrawerGroup getGroupForCoord (BlockCoord coord) { - if (coord == null) - return null; + private IDrawerGroup getGroupForCoord(BlockCoord coord) { + if (coord == null) return null; StorageRecord record = storage.get(coord); - if (record == null) - return null; + if (record == null) return null; if (record.storage instanceof TileEntity) { - TileEntity tile = (TileEntity)record.storage; + TileEntity tile = (TileEntity) record.storage; if (tile.isInvalid() && tile != worldObj.getTileEntity(coord.x(), coord.y(), coord.z())) { storage.remove(coord); return null; @@ -633,61 +568,53 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP return record.storage; } - private int getLocalInvSlot (int invSlot) { - if (invSlot >= invSlotList.size()) - return 0; + private int getLocalInvSlot(int invSlot) { + if (invSlot >= invSlotList.size()) return 0; SlotRecord record = invSlotList.get(invSlot); - if (record == null) - return 0; + if (record == null) return 0; return record.slot; } - private int getLocalDrawerSlot (int drawerSlot) { - if (drawerSlot >= drawerSlotList.size()) - return 0; + private int getLocalDrawerSlot(int drawerSlot) { + if (drawerSlot >= drawerSlotList.size()) return 0; SlotRecord record = drawerSlotList.get(drawerSlot); - if (record == null) - return 0; + if (record == null) return 0; return record.slot; } - private IDrawerInventory getDrawerInventory (int invSlot) { + private IDrawerInventory getDrawerInventory(int invSlot) { IDrawerGroup group = getGroupForInvSlot(invSlot); - if (group == null) - return null; + if (group == null) return null; return group.getDrawerInventory(); } @Override - public void readFromNBT (NBTTagCompound tag) { + public void readFromNBT(NBTTagCompound tag) { super.readFromNBT(tag); setDirection(tag.getByte("Dir")); - if (tag.hasKey("CustomName", Constants.NBT.TAG_STRING)) - customName = tag.getString("CustomName"); + if (tag.hasKey("CustomName", Constants.NBT.TAG_STRING)) customName = tag.getString("CustomName"); - if (worldObj != null && !worldObj.isRemote) - updateCache(); + if (worldObj != null && !worldObj.isRemote) updateCache(); } @Override - public void writeToNBT (NBTTagCompound tag) { + public void writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); - tag.setByte("Dir", (byte)direction); + tag.setByte("Dir", (byte) direction); - if (hasCustomInventoryName()) - tag.setString("CustomName", customName); + if (hasCustomInventoryName()) tag.setString("CustomName", customName); } @Override - public Packet getDescriptionPacket () { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeToNBT(tag); @@ -695,105 +622,94 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity pkt) { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { readFromNBT(pkt.func_148857_g()); getWorldObj().func_147479_m(xCoord, yCoord, zCoord); // markBlockForRenderUpdate } @Override - public IDrawerInventory getDrawerInventory () { + public IDrawerInventory getDrawerInventory() { return null; } @Override - public int getDrawerCount () { + public int getDrawerCount() { return drawerSlotList.size(); } @Override - public IDrawer getDrawer (int slot) { + public IDrawer getDrawer(int slot) { IDrawerGroup group = getGroupForDrawerSlot(slot); - if (group == null) - return null; + if (group == null) return null; return group.getDrawer(getLocalDrawerSlot(slot)); } @Override - public boolean isDrawerEnabled (int slot) { + public boolean isDrawerEnabled(int slot) { IDrawerGroup group = getGroupForDrawerSlot(slot); - if (group == null) - return false; + if (group == null) return false; return group.isDrawerEnabled(getLocalDrawerSlot(slot)); } @Override - public int[] getAccessibleDrawerSlots () { + public int[] getAccessibleDrawerSlots() { return drawerSlots; } @Override - public void markDirty () { + public void markDirty() { for (StorageRecord record : storage.values()) { IDrawerGroup group = record.storage; - if (group != null && group.getDrawerInventory() != null) - group.markDirtyIfNeeded(); + if (group != null && group.getDrawerInventory() != null) group.markDirtyIfNeeded(); } super.markDirty(); } @Override - public boolean markDirtyIfNeeded () { + public boolean markDirtyIfNeeded() { boolean synced = false; for (StorageRecord record : storage.values()) { IDrawerGroup group = record.storage; - if (group != null && group.getDrawerInventory() != null) - synced |= group.markDirtyIfNeeded(); + if (group != null && group.getDrawerInventory() != null) synced |= group.markDirtyIfNeeded(); } - if (synced) - super.markDirty(); + if (synced) super.markDirty(); return synced; } @Override - public int[] getAccessibleSlotsFromSide (int side) { + public int[] getAccessibleSlotsFromSide(int side) { for (int aside : autoSides) { - if (side == aside) - return inventorySlots; + if (side == aside) return inventorySlots; } return emptySlots; } @Override - public boolean canInsertItem (int slot, ItemStack stack, int side) { + public boolean canInsertItem(int slot, ItemStack stack, int side) { IDrawerInventory inventory = getDrawerInventory(slot); - if (inventory == null) - return false; + if (inventory == null) return false; - if (slot >= invSlotList.size()) - return false; + if (slot >= invSlotList.size()) return false; SlotRecord record = invSlotList.get(slot); List primaryRecords = invPrimaryLookup.getEntries(stack.getItem(), stack.getItemDamage()); if (primaryRecords != null && !primaryRecords.contains(record)) { for (SlotRecord candidate : primaryRecords) { IDrawerGroup candidateGroup = getGroupForCoord(candidate.coord); - if (candidateGroup == null) - continue; + if (candidateGroup == null) continue; IDrawerInventory candidateInventory = candidateGroup.getDrawerInventory(); if (candidateInventory.canInsertItem(candidate.slot, stack)) { IDrawer drawer = candidateGroup.getDrawer(candidate.slot); - if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) - return false; - if (drawer.getRemainingCapacity() > 0) - return false; + if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) return false; + if (drawer.getRemainingCapacity() > 0) return false; } } } @@ -802,110 +718,100 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP } @Override - public boolean canExtractItem (int slot, ItemStack stack, int side) { + public boolean canExtractItem(int slot, ItemStack stack, int side) { IDrawerInventory inventory = getDrawerInventory(slot); - if (inventory == null) - return false; + if (inventory == null) return false; return inventory.canExtractItem(getLocalInvSlot(slot), stack); } @Override - public int getSizeInventory () { + public int getSizeInventory() { return inventorySlots.length; } @Override - public ItemStack getStackInSlot (int slot) { + public ItemStack getStackInSlot(int slot) { IDrawerInventory inventory = getDrawerInventory(slot); - if (inventory == null) - return null; + if (inventory == null) return null; return inventory.getStackInSlot(getLocalInvSlot(slot)); } @Override - public ItemStack decrStackSize (int slot, int count) { + public ItemStack decrStackSize(int slot, int count) { IDrawerInventory inventory = getDrawerInventory(slot); - if (inventory == null) - return null; + if (inventory == null) return null; return inventory.decrStackSize(getLocalInvSlot(slot), count); } @Override - public ItemStack getStackInSlotOnClosing (int slot) { + public ItemStack getStackInSlotOnClosing(int slot) { IDrawerInventory inventory = getDrawerInventory(slot); - if (inventory == null) - return null; + if (inventory == null) return null; return inventory.getStackInSlotOnClosing(getLocalInvSlot(slot)); } @Override - public void setInventorySlotContents (int slot, ItemStack stack) { + public void setInventorySlotContents(int slot, ItemStack stack) { IDrawerInventory inventory = getDrawerInventory(slot); - if (inventory == null) - return; + if (inventory == null) return; inventory.setInventorySlotContents(getLocalInvSlot(slot), stack); inventory.markDirty(); } - public void setInventoryName (String name) { + public void setInventoryName(String name) { customName = name; } @Override - public String getInventoryName () { + public String getInventoryName() { return hasCustomInventoryName() ? customName : "storageDrawers.container.controller"; } @Override - public boolean hasCustomInventoryName () { + public boolean hasCustomInventoryName() { return customName != null && customName.length() > 0; } @Override - public int getInventoryStackLimit () { + public int getInventoryStackLimit() { return 64; } @Override - public boolean isUseableByPlayer (EntityPlayer player) { + public boolean isUseableByPlayer(EntityPlayer player) { return false; } @Override - public void openInventory () { } + public void openInventory() {} @Override - public void closeInventory () { } + public void closeInventory() {} @Override - public boolean isItemValidForSlot (int slot, ItemStack stack) { + public boolean isItemValidForSlot(int slot, ItemStack stack) { IDrawerInventory inventory = getDrawerInventory(slot); - if (inventory == null) - return false; + if (inventory == null) return false; - if (slot >= invSlotList.size()) - return false; + if (slot >= invSlotList.size()) return false; SlotRecord record = invSlotList.get(slot); List primaryRecords = invPrimaryLookup.getEntries(stack.getItem(), stack.getItemDamage()); if (primaryRecords != null && !primaryRecords.contains(record)) { for (SlotRecord candidate : primaryRecords) { IDrawerGroup candidateGroup = getGroupForCoord(candidate.coord); - if (candidateGroup == null) - continue; + if (candidateGroup == null) continue; IDrawerInventory candidateInventory = candidateGroup.getDrawerInventory(); if (candidateInventory.isItemValidForSlot(candidate.slot, stack)) { IDrawer drawer = candidateGroup.getDrawer(candidate.slot); - if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) - return false; - if (drawer.getRemainingCapacity() > 0) - return false; + if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) return false; + if (drawer.getRemainingCapacity() > 0) return false; } } } @@ -913,48 +819,44 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP return inventory.isItemValidForSlot(getLocalInvSlot(slot), stack); } - private class DrawerStackIterator implements Iterable - { + private class DrawerStackIterator implements Iterable { private ItemStack stack; private boolean strict; private boolean insert; - public DrawerStackIterator (ItemStack stack, boolean strict, boolean insert) { + public DrawerStackIterator(ItemStack stack, boolean strict, boolean insert) { this.stack = stack; this.strict = strict; this.insert = insert; } @Override - public Iterator iterator () { - if (this.stack == null) - return new ArrayList(0).iterator(); + public Iterator iterator() { + if (this.stack == null) return new ArrayList(0).iterator(); - return new Iterator () - { - List primaryRecords = drawerPrimaryLookup.getEntries(stack.getItem(), stack.getItemDamage()); + return new Iterator() { + List primaryRecords = + drawerPrimaryLookup.getEntries(stack.getItem(), stack.getItemDamage()); Iterator iter1; int index2; Integer nextSlot = null; @Override - public boolean hasNext () { - if (nextSlot == null) - advance(); + public boolean hasNext() { + if (nextSlot == null) advance(); return nextSlot != null; } @Override - public Integer next () { - if (nextSlot == null) - advance(); + public Integer next() { + if (nextSlot == null) advance(); Integer slot = nextSlot; nextSlot = null; return slot; } - private void advance () { + private void advance() { if (iter1 == null && primaryRecords != null && primaryRecords.size() > 0) iter1 = primaryRecords.iterator(); @@ -962,19 +864,17 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP while (iter1.hasNext()) { SlotRecord candidate = iter1.next(); IDrawerGroup candidateGroup = getGroupForCoord(candidate.coord); - if (candidateGroup == null) - continue; + if (candidateGroup == null) continue; IDrawer drawer = candidateGroup.getDrawer(candidate.slot); if (insert) { boolean voiding = (drawer instanceof IVoidable) ? ((IVoidable) drawer).isVoid() : false; - if (!(drawer.canItemBeStored(stack) && (drawer.isEmpty() || drawer.getRemainingCapacity() > 0 || voiding))) - continue; - } - else { - if (!(drawer.canItemBeExtracted(stack) && drawer.getStoredItemCount() > 0)) + if (!(drawer.canItemBeStored(stack) + && (drawer.isEmpty() || drawer.getRemainingCapacity() > 0 || voiding))) continue; + } else { + if (!(drawer.canItemBeExtracted(stack) && drawer.getStoredItemCount() > 0)) continue; } int slot = drawerSlotList.indexOf(candidate); @@ -987,29 +887,24 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP for (; index2 < drawerSlots.length; index2++) { int slot = drawerSlots[index2]; - if (!isDrawerEnabled(slot)) - continue; + if (!isDrawerEnabled(slot)) continue; IDrawer drawer = getDrawer(slot); if (strict) { ItemStack proto = drawer.getStoredItemPrototype(); - if (proto != null && !proto.isItemEqual(stack)) - continue; + if (proto != null && !proto.isItemEqual(stack)) continue; } if (insert) { boolean voiding = (drawer instanceof IVoidable) ? ((IVoidable) drawer).isVoid() : false; - if (!(drawer.canItemBeStored(stack) && (drawer.isEmpty() || drawer.getRemainingCapacity() > 0 || voiding))) - continue; - } - else { - if (!(drawer.canItemBeExtracted(stack) && drawer.getStoredItemCount() > 0)) - continue; + if (!(drawer.canItemBeStored(stack) + && (drawer.isEmpty() || drawer.getRemainingCapacity() > 0 || voiding))) continue; + } else { + if (!(drawer.canItemBeExtracted(stack) && drawer.getStoredItemCount() > 0)) continue; } SlotRecord record = drawerSlotList.get(slot); - if (primaryRecords != null && primaryRecords.contains(record)) - continue; + if (primaryRecords != null && primaryRecords.contains(record)) continue; nextSlot = slot; index2++; @@ -1018,13 +913,14 @@ public class TileEntityController extends TileEntity implements IDrawerGroup, IP } }; } - }; + } + ; - public Iterable enumerateDrawersForInsertion (ItemStack stack, boolean strict) { + public Iterable enumerateDrawersForInsertion(ItemStack stack, boolean strict) { return new DrawerStackIterator(stack, strict, true); } - public Iterable enumerateDrawersForExtraction (ItemStack stack, boolean strict) { + public Iterable enumerateDrawersForExtraction(ItemStack stack, boolean strict) { return new DrawerStackIterator(stack, strict, false); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java index ad3b51b..e97f373 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java @@ -16,31 +16,32 @@ import com.jaquadro.minecraft.storagedrawers.storage.IUpgradeProvider; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.IMessage; +import java.util.EnumSet; +import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.Constants; -import net.minecraftforge.common.util.ForgeDirection; import org.apache.logging.log4j.Level; -import java.util.EnumSet; -import java.util.Iterator; -import java.util.UUID; - -public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawerGroupInteractive, ISidedInventory, IUpgradeProvider, ILockable, ISealable, IProtectable, IDowngradable -{ +public abstract class TileEntityDrawers extends BaseTileEntity + implements IDrawerGroupInteractive, + ISidedInventory, + IUpgradeProvider, + ILockable, + ISealable, + IProtectable, + IDowngradable { private IDrawer[] drawers; private IDrawerInventory inventory; - private int[] autoSides = new int[] { 0, 1, 2, 3, 4, 5 }; + private int[] autoSides = new int[] {0, 1, 2, 3, 4, 5}; private int direction; private int drawerCapacity = 1; @@ -65,33 +66,32 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe private ItemStack materialFront; private ItemStack materialTrim; - protected TileEntityDrawers (int drawerCount) { + protected TileEntityDrawers(int drawerCount) { initWithDrawerCount(drawerCount); } - protected abstract IDrawer createDrawer (int slot); + protected abstract IDrawer createDrawer(int slot); - protected ISideManager getSideManager () { + protected ISideManager getSideManager() { return new DefaultSideManager(); } - protected void initWithDrawerCount (int drawerCount) { + protected void initWithDrawerCount(int drawerCount) { drawers = new IDrawer[drawerCount]; - for (int i = 0; i < drawerCount; i++) - drawers[i] = createDrawer(i); + for (int i = 0; i < drawerCount; i++) drawers[i] = createDrawer(i); inventory = new StorageInventory(this, getSideManager(), this); } - public int getDirection () { + public int getDirection() { return direction; } - public void setDirection (int direction) { + public void setDirection(int direction) { this.direction = direction % 6; } - public int getMaxStorageLevel () { + public int getMaxStorageLevel() { // Could use iterables and lambdas instead int maxLevel = 1; for (ItemStack upgrade : upgrades) { @@ -102,17 +102,16 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe return maxLevel; } - public int getEffectiveStorageLevel () { + public int getEffectiveStorageLevel() { int level = 0; for (ItemStack upgrade : upgrades) { - if (upgrade != null && upgrade.getItem() == ModItems.upgrade) - level += upgrade.getItemDamage(); + if (upgrade != null && upgrade.getItem() == ModItems.upgrade) level += upgrade.getItemDamage(); } return Math.max(level, 1); } - public int getEffectiveStorageMultiplier () { + public int getEffectiveStorageMultiplier() { ConfigManager config = StorageDrawers.config; int multiplier = 0; for (ItemStack stack : upgrades) { @@ -120,42 +119,39 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe multiplier += config.getStorageUpgradeMultiplier(stack.getItemDamage()); } - if (multiplier == 0) - multiplier = config.getStorageUpgradeMultiplier(1); + if (multiplier == 0) multiplier = config.getStorageUpgradeMultiplier(1); return multiplier; } - public int getEffectiveStatusLevel () { + public int getEffectiveStatusLevel() { int maxLevel = 0; for (ItemStack upgrade : upgrades) { - if (upgrade != null && upgrade.getItem() == ModItems.upgradeStatus) - maxLevel = upgrade.getItemDamage(); + if (upgrade != null && upgrade.getItem() == ModItems.upgradeStatus) maxLevel = upgrade.getItemDamage(); } return maxLevel; } - public int getUpgradeSlotCount () { + public int getUpgradeSlotCount() { return 5; } - public ItemStack getUpgrade (int slot) { + public ItemStack getUpgrade(int slot) { slot = MathHelper.clamp_int(slot, 0, 4); return upgrades[slot]; } - public boolean addUpgrade (ItemStack upgrade) { + public boolean addUpgrade(ItemStack upgrade) { int slot = getNextUpgradeSlot(); - if (slot == -1) - return false; + if (slot == -1) return false; setUpgrade(slot, upgrade); checkDowngraded(); return true; } - public void setUpgrade (int slot, ItemStack upgrade) { + public void setUpgrade(int slot, ItemStack upgrade) { slot = MathHelper.clamp_int(slot, 0, 4); if (upgrade != null) { @@ -175,56 +171,49 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe } } - public int getNextUpgradeSlot () { + public int getNextUpgradeSlot() { for (int i = 0; i < upgrades.length; i++) { - if (upgrades[i] == null) - return i; + if (upgrades[i] == null) return i; } return -1; } - public int getDrawerCapacity () { + public int getDrawerCapacity() { return drawerCapacity; } - public void setDrawerCapacity (int stackCount) { + public void setDrawerCapacity(int stackCount) { drawerCapacity = stackCount; } @Override - public boolean isLocked (LockAttribute attr) { - if (!StorageDrawers.config.cache.enableLockUpgrades || lockAttributes == null) - return false; + public boolean isLocked(LockAttribute attr) { + if (!StorageDrawers.config.cache.enableLockUpgrades || lockAttributes == null) return false; return lockAttributes.contains(attr); } @Override - public boolean canLock (LockAttribute attr) { - if (!StorageDrawers.config.cache.enableLockUpgrades) - return false; + public boolean canLock(LockAttribute attr) { + if (!StorageDrawers.config.cache.enableLockUpgrades) return false; return true; } @Override - public void setLocked (LockAttribute attr, boolean isLocked) { - if (!StorageDrawers.config.cache.enableLockUpgrades) - return; + public void setLocked(LockAttribute attr, boolean isLocked) { + if (!StorageDrawers.config.cache.enableLockUpgrades) return; if (isLocked && (lockAttributes == null || !lockAttributes.contains(attr))) { - if (lockAttributes == null) - lockAttributes = EnumSet.of(attr); - else - lockAttributes.add(attr); + if (lockAttributes == null) lockAttributes = EnumSet.of(attr); + else lockAttributes.add(attr); if (worldObj != null && !worldObj.isRemote) { markDirty(); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } - } - else if (!isLocked && lockAttributes != null && lockAttributes.contains(attr)) { + } else if (!isLocked && lockAttributes != null && lockAttributes.contains(attr)) { lockAttributes.remove(attr); if (worldObj != null && !worldObj.isRemote) { @@ -234,14 +223,13 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe } } - public boolean isShrouded () { - if (!StorageDrawers.config.cache.enableShroudUpgrades) - return false; + public boolean isShrouded() { + if (!StorageDrawers.config.cache.enableShroudUpgrades) return false; return shrouded; } - public void setIsShrouded (boolean shrouded) { + public void setIsShrouded(boolean shrouded) { if (this.shrouded != shrouded) { this.shrouded = shrouded; @@ -253,17 +241,15 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe } @Override - public UUID getOwner () { - if (!StorageDrawers.config.cache.enablePersonalUpgrades) - return null; + public UUID getOwner() { + if (!StorageDrawers.config.cache.enablePersonalUpgrades) return null; return owner; } @Override - public boolean setOwner (UUID owner) { - if (!StorageDrawers.config.cache.enablePersonalUpgrades) - return false; + public boolean setOwner(UUID owner) { + if (!StorageDrawers.config.cache.enablePersonalUpgrades) return false; if ((this.owner != null && !this.owner.equals(owner)) || (owner != null && !owner.equals(this.owner))) { this.owner = owner; @@ -278,14 +264,13 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe } @Override - public ISecurityProvider getSecurityProvider () { + public ISecurityProvider getSecurityProvider() { return StorageDrawers.securityRegistry.getProvider(securityKey); } @Override - public boolean setSecurityProvider (ISecurityProvider provider) { - if (!StorageDrawers.config.cache.enablePersonalUpgrades) - return false; + public boolean setSecurityProvider(ISecurityProvider provider) { + if (!StorageDrawers.config.cache.enablePersonalUpgrades) return false; String newKey = (provider == null) ? null : provider.getProviderID(); if ((newKey != null && !newKey.equals(securityKey)) || (securityKey != null && !securityKey.equals(newKey))) { @@ -300,11 +285,11 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe return true; } - public boolean shouldHideUpgrades () { + public boolean shouldHideUpgrades() { return hideUpgrade; } - public void setShouldHideUpgrades (boolean hide) { + public void setShouldHideUpgrades(boolean hide) { hideUpgrade = hide; if (worldObj != null && !worldObj.isRemote) { @@ -313,16 +298,14 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe } } - public boolean isSealed () { - if (!StorageDrawers.config.cache.enableTape) - return false; + public boolean isSealed() { + if (!StorageDrawers.config.cache.enableTape) return false; return taped; } - public boolean setIsSealed (boolean state) { - if (!StorageDrawers.config.cache.enableTape) - return false; + public boolean setIsSealed(boolean state) { + if (!StorageDrawers.config.cache.enableTape) return false; if (this.taped != state) { this.taped = state; @@ -358,55 +341,47 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe downgraded = state; } - public boolean isVoid () { - if (!StorageDrawers.config.cache.enableVoidUpgrades) - return false; + public boolean isVoid() { + if (!StorageDrawers.config.cache.enableVoidUpgrades) return false; for (ItemStack stack : upgrades) { - if (stack != null && stack.getItem() == ModItems.upgradeVoid) - return true; + if (stack != null && stack.getItem() == ModItems.upgradeVoid) return true; } return false; } - public boolean isUnlimited () { - if (!StorageDrawers.config.cache.enableCreativeUpgrades) - return false; + public boolean isUnlimited() { + if (!StorageDrawers.config.cache.enableCreativeUpgrades) return false; for (ItemStack stack : upgrades) { - if (stack != null && stack.getItem() == ModItems.upgradeCreative) - return true; + if (stack != null && stack.getItem() == ModItems.upgradeCreative) return true; } return false; } - public boolean isVending () { - if (!StorageDrawers.config.cache.enableCreativeUpgrades) - return false; + public boolean isVending() { + if (!StorageDrawers.config.cache.enableCreativeUpgrades) return false; for (ItemStack stack : upgrades) { - if (stack != null && stack.getItem() == ModItems.upgradeCreative && stack.getItemDamage() == 1) - return true; + if (stack != null && stack.getItem() == ModItems.upgradeCreative && stack.getItemDamage() == 1) return true; } return false; } - public boolean isRedstone () { - if (!StorageDrawers.config.cache.enableRedstoneUpgrades) - return false; + public boolean isRedstone() { + if (!StorageDrawers.config.cache.enableRedstoneUpgrades) return false; for (ItemStack stack : upgrades) { - if (stack != null && stack.getItem() == ModItems.upgradeRedstone) - return true; + if (stack != null && stack.getItem() == ModItems.upgradeRedstone) return true; } return false; } - public int getRedstoneLevel () { + public int getRedstoneLevel() { int redstoneType = -1; for (ItemStack stack : upgrades) { if (stack != null && stack.getItem() == ModItems.upgradeRedstone) { @@ -427,117 +402,106 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe } } - protected int getCombinedRedstoneLevel () { + protected int getCombinedRedstoneLevel() { int active = 0; float fillRatio = 0; for (int i = 0; i < getDrawerCount(); i++) { - if (!isDrawerEnabled(i)) - continue; + if (!isDrawerEnabled(i)) continue; IDrawer drawer = getDrawer(i); if (drawer.getMaxCapacity() > 0) - fillRatio += ((float)drawer.getStoredItemCount() / drawer.getMaxCapacity()); + fillRatio += ((float) drawer.getStoredItemCount() / drawer.getMaxCapacity()); active++; } - if (active == 0) - return 0; + if (active == 0) return 0; - if (fillRatio == active) - return 15; + if (fillRatio == active) return 15; - return (int)Math.ceil((fillRatio / active) * 14); + return (int) Math.ceil((fillRatio / active) * 14); } - protected int getMinRedstoneLevel () { + protected int getMinRedstoneLevel() { float minRatio = 2; for (int i = 0; i < getDrawerCount(); i++) { - if (!isDrawerEnabled(i)) - continue; + if (!isDrawerEnabled(i)) continue; IDrawer drawer = getDrawer(i); if (drawer.getMaxCapacity() > 0) - minRatio = Math.min(minRatio, (float)drawer.getStoredItemCount() / drawer.getMaxCapacity()); - else - minRatio = 0; + minRatio = Math.min(minRatio, (float) drawer.getStoredItemCount() / drawer.getMaxCapacity()); + else minRatio = 0; } - if (minRatio > 1) - return 0; - if (minRatio == 1) - return 15; + if (minRatio > 1) return 0; + if (minRatio == 1) return 15; - return (int)Math.ceil(minRatio * 14); + return (int) Math.ceil(minRatio * 14); } - protected int getMaxRedstoneLevel () { + protected int getMaxRedstoneLevel() { float maxRatio = 0; for (int i = 0; i < getDrawerCount(); i++) { - if (!isDrawerEnabled(i)) - continue; + if (!isDrawerEnabled(i)) continue; IDrawer drawer = getDrawer(i); if (drawer.getMaxCapacity() > 0) - maxRatio = Math.max(maxRatio, (float)drawer.getStoredItemCount() / drawer.getMaxCapacity()); + maxRatio = Math.max(maxRatio, (float) drawer.getStoredItemCount() / drawer.getMaxCapacity()); } - if (maxRatio == 1) - return 15; + if (maxRatio == 1) return 15; - return (int)Math.ceil(maxRatio * 14); + return (int) Math.ceil(maxRatio * 14); } - public boolean isSorting () { + public boolean isSorting() { return false; } - public ItemStack getMaterialSide () { + public ItemStack getMaterialSide() { return materialSide; } - public ItemStack getMaterialFront () { + public ItemStack getMaterialFront() { return materialFront; } - public ItemStack getMaterialTrim () { + public ItemStack getMaterialTrim() { return materialTrim; } - public ItemStack getEffectiveMaterialSide () { + public ItemStack getEffectiveMaterialSide() { return materialSide; } - public ItemStack getEffectiveMaterialFront () { + public ItemStack getEffectiveMaterialFront() { return materialFront != null ? materialFront : materialSide; } - public ItemStack getEffectiveMaterialTrim () { + public ItemStack getEffectiveMaterialTrim() { return materialTrim != null ? materialTrim : materialSide; } - public void setMaterialSide (ItemStack material) { + public void setMaterialSide(ItemStack material) { materialSide = material; } - public void setMaterialFront (ItemStack material) { + public void setMaterialFront(ItemStack material) { materialFront = material; } - public void setMaterialTrim (ItemStack material) { + public void setMaterialTrim(ItemStack material) { materialTrim = material; } - public ItemStack takeItemsFromSlot (int slot, int count) { - if (slot < 0 || slot >= getDrawerCount()) - return null; + public ItemStack takeItemsFromSlot(int slot, int count) { + if (slot < 0 || slot >= getDrawerCount()) return null; ItemStack stack = getItemsFromSlot(slot, count); - if (stack == null) - return null; + if (stack == null) return null; IDrawer drawer = drawers[slot]; drawer.setStoredItemCount(drawer.getStoredItemCount() - stack.stackSize); @@ -552,9 +516,8 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe return stack; } - protected ItemStack getItemsFromSlot (int slot, int count) { - if (drawers[slot].isEmpty()) - return null; + protected ItemStack getItemsFromSlot(int slot, int count) { + if (drawers[slot].isEmpty()) return null; ItemStack stack = drawers[slot].getStoredItemCopy(); stack.stackSize = Math.min(stack.getMaxStackSize(), count); @@ -563,20 +526,16 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe return stack; } - public int putItemsIntoSlot (int slot, ItemStack stack, int count) { - if (slot < 0 || slot >= getDrawerCount()) - return 0; + public int putItemsIntoSlot(int slot, ItemStack stack, int count) { + if (slot < 0 || slot >= getDrawerCount()) return 0; IDrawer drawer = drawers[slot]; - if (drawer.isEmpty()) - drawer.setStoredItem(stack, 0); + if (drawer.isEmpty()) drawer.setStoredItem(stack, 0); - if (!drawer.canItemBeStored(stack)) - return 0; + if (!drawer.canItemBeStored(stack)) return 0; int countAdded = Math.min(count, stack.stackSize); - if (!isVoid()) - countAdded = Math.min(countAdded, drawer.getRemainingCapacity()); + if (!isVoid()) countAdded = Math.min(countAdded, drawer.getRemainingCapacity()); drawer.setStoredItemCount(drawer.getStoredItemCount() + countAdded); stack.stackSize -= countAdded; @@ -584,19 +543,17 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe return countAdded; } - public int interactPutCurrentItemIntoSlot (int slot, EntityPlayer player) { + public int interactPutCurrentItemIntoSlot(int slot, EntityPlayer player) { int count = 0; ItemStack playerStack = player.inventory.getCurrentItem(); - if (playerStack != null) - count = putItemsIntoSlot(slot, playerStack, playerStack.stackSize); + if (playerStack != null) count = putItemsIntoSlot(slot, playerStack, playerStack.stackSize); - if (count > 0) - markDirty(); + if (count > 0) markDirty(); return count; } - public int interactPutCurrentInventoryIntoSlot (int slot, EntityPlayer player) { + public int interactPutCurrentInventoryIntoSlot(int slot, EntityPlayer player) { int count = 0; if (!drawers[slot].isEmpty()) { @@ -604,27 +561,25 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe ItemStack subStack = player.inventory.getStackInSlot(i); if (subStack != null) { int subCount = putItemsIntoSlot(slot, subStack, subStack.stackSize); - if (subCount > 0 && subStack.stackSize == 0) - player.inventory.setInventorySlotContents(i, null); + if (subCount > 0 && subStack.stackSize == 0) player.inventory.setInventorySlotContents(i, null); count += subCount; } } } - if (count > 0) - StorageDrawers.proxy.updatePlayerInventory(player); + if (count > 0) StorageDrawers.proxy.updatePlayerInventory(player); markDirty(); return count; } - public int interactPutItemsIntoSlot (int slot, EntityPlayer player) { + public int interactPutItemsIntoSlot(int slot, EntityPlayer player) { int count = 0; - if (worldObj.getTotalWorldTime() - lastClickTime < 10 && player.getPersistentID().equals(lastClickUUID)) + if (worldObj.getTotalWorldTime() - lastClickTime < 10 + && player.getPersistentID().equals(lastClickUUID)) count = interactPutCurrentInventoryIntoSlot(slot, player); - else - count = interactPutCurrentItemIntoSlot(slot, player); + else count = interactPutCurrentItemIntoSlot(slot, player); lastClickTime = worldObj.getTotalWorldTime(); lastClickUUID = player.getPersistentID(); @@ -632,54 +587,44 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe return count; } - private void readLegacyUpgradeNBT (NBTTagCompound tag) { + private void readLegacyUpgradeNBT(NBTTagCompound tag) { if (tag.hasKey("Lev") && tag.getByte("Lev") > 1) addUpgrade(new ItemStack(ModItems.upgrade, 1, tag.getByte("Lev"))); - if (tag.hasKey("Stat")) - addUpgrade(new ItemStack(ModItems.upgradeStatus, 1, tag.getByte("Stat"))); - if (tag.hasKey("Void")) - addUpgrade(new ItemStack(ModItems.upgradeVoid)); - if (tag.hasKey("Down")) - addUpgrade(new ItemStack(ModItems.upgradeDowngrade)); + if (tag.hasKey("Stat")) addUpgrade(new ItemStack(ModItems.upgradeStatus, 1, tag.getByte("Stat"))); + if (tag.hasKey("Void")) addUpgrade(new ItemStack(ModItems.upgradeVoid)); + if (tag.hasKey("Down")) addUpgrade(new ItemStack(ModItems.upgradeDowngrade)); } @Override - protected void readFromFixedNBT (NBTTagCompound tag) { + protected void readFromFixedNBT(NBTTagCompound tag) { super.readFromFixedNBT(tag); setDirection(tag.getByte("Dir")); taped = false; - if (tag.hasKey("Tape")) - taped = tag.getBoolean("Tape"); + if (tag.hasKey("Tape")) taped = tag.getBoolean("Tape"); customName = null; - if (tag.hasKey("CustomName", Constants.NBT.TAG_STRING)) - customName = tag.getString("CustomName"); + if (tag.hasKey("CustomName", Constants.NBT.TAG_STRING)) customName = tag.getString("CustomName"); downgraded = tag.hasKey("Down") && tag.getBoolean("Down"); } @Override - protected void writeToFixedNBT (NBTTagCompound tag) { + protected void writeToFixedNBT(NBTTagCompound tag) { super.writeToFixedNBT(tag); tag.setByte("Dir", (byte) direction); - if (taped) - tag.setBoolean("Tape", taped); - - if (hasCustomInventoryName()) - tag.setString("CustomName", customName); - - if (checkDowngraded()) - tag.setBoolean("Down", downgraded); + if (taped) tag.setBoolean("Tape", taped); + if (hasCustomInventoryName()) tag.setString("CustomName", customName); + if (checkDowngraded()) tag.setBoolean("Down", downgraded); } @Override - public void readFromPortableNBT (NBTTagCompound tag) { + public void readFromPortableNBT(NBTTagCompound tag) { super.readFromPortableNBT(tag); upgrades = new ItemStack[upgrades.length]; @@ -688,8 +633,7 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe if (!tag.hasKey("Upgrades")) { readLegacyUpgradeNBT(tag); - } - else { + } else { NBTTagList upgradeList = tag.getTagList("Upgrades", Constants.NBT.TAG_COMPOUND); for (int i = 0; i < upgradeList.tagCount(); i++) { NBTTagCompound upgradeTag = upgradeList.getCompoundTagAt(i); @@ -700,24 +644,19 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe } lockAttributes = null; - if (tag.hasKey("Lock")) - lockAttributes = LockAttribute.getEnumSet(tag.getByte("Lock")); + if (tag.hasKey("Lock")) lockAttributes = LockAttribute.getEnumSet(tag.getByte("Lock")); shrouded = false; - if (tag.hasKey("Shr")) - shrouded = tag.getBoolean("Shr"); + if (tag.hasKey("Shr")) shrouded = tag.getBoolean("Shr"); owner = null; - if (tag.hasKey("Own")) - owner = UUID.fromString(tag.getString("Own")); + if (tag.hasKey("Own")) owner = UUID.fromString(tag.getString("Own")); securityKey = null; - if (tag.hasKey("Sec")) - securityKey = tag.getString("Sec"); + if (tag.hasKey("Sec")) securityKey = tag.getString("Sec"); hideUpgrade = false; - if (tag.hasKey("HideUp")) - hideUpgrade = tag.getBoolean("HideUp"); + if (tag.hasKey("HideUp")) hideUpgrade = tag.getBoolean("HideUp"); NBTTagList slots = tag.getTagList("Slots", Constants.NBT.TAG_COMPOUND); drawers = new IDrawer[slots.tagCount()]; @@ -731,20 +670,17 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe inventory = new StorageInventory(this, getSideManager(), this); materialSide = null; - if (tag.hasKey("MatS")) - materialSide = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatS")); + if (tag.hasKey("MatS")) materialSide = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatS")); materialFront = null; - if (tag.hasKey("MatF")) - materialFront = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatF")); + if (tag.hasKey("MatF")) materialFront = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatF")); materialTrim = null; - if (tag.hasKey("MatT")) - materialTrim = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatT")); + if (tag.hasKey("MatT")) materialTrim = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatT")); } @Override - public void writeToPortableNBT (NBTTagCompound tag) { + public void writeToPortableNBT(NBTTagCompound tag) { super.writeToPortableNBT(tag); tag.setInteger("Cap", drawerCapacity); @@ -753,29 +689,23 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe for (int i = 0; i < upgrades.length; i++) { if (upgrades[i] != null) { NBTTagCompound upgradeTag = upgrades[i].writeToNBT(new NBTTagCompound()); - upgradeTag.setByte("Slot", (byte)i); + upgradeTag.setByte("Slot", (byte) i); upgradeList.appendTag(upgradeTag); } } - if (upgradeList.tagCount() > 0) - tag.setTag("Upgrades", upgradeList); + if (upgradeList.tagCount() > 0) tag.setTag("Upgrades", upgradeList); - if (lockAttributes != null) - tag.setByte("Lock", (byte) LockAttribute.getBitfield(lockAttributes)); + if (lockAttributes != null) tag.setByte("Lock", (byte) LockAttribute.getBitfield(lockAttributes)); - if (shrouded) - tag.setBoolean("Shr", shrouded); + if (shrouded) tag.setBoolean("Shr", shrouded); - if (owner != null) - tag.setString("Own", owner.toString()); + if (owner != null) tag.setString("Own", owner.toString()); - if (securityKey != null) - tag.setString("Sec", securityKey); + if (securityKey != null) tag.setString("Sec", securityKey); - if (hideUpgrade) - tag.setBoolean("HideUp", hideUpgrade); + if (hideUpgrade) tag.setBoolean("HideUp", hideUpgrade); NBTTagList slots = new NBTTagList(); for (IDrawer drawer : drawers) { @@ -806,12 +736,12 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe } @Override - public boolean canUpdate () { + public boolean canUpdate() { return false; } @Override - public void markDirty () { + public void markDirty() { inventory.markDirty(); if (isRedstone() && worldObj != null) { worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); @@ -822,7 +752,7 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe } @Override - public boolean markDirtyIfNeeded () { + public boolean markDirtyIfNeeded() { if (inventory.syncInventoryIfNeeded()) { super.markDirty(); return true; @@ -831,10 +761,14 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe return false; } - public void clientUpdateCount (int slot, int count) { + public void clientUpdateCount(int slot, int count) { IDrawer drawer = getDrawer(slot); if (drawer == null) { - FMLLog.log(StorageDrawers.MOD_ID, Level.ERROR, "Drawer at (" + this.xCoord + "," + this.yCoord + "," + this.zCoord + ") has no slot " + slot + ". Drawers.length is " + drawers.length); + FMLLog.log( + StorageDrawers.MOD_ID, + Level.ERROR, + "Drawer at (" + this.xCoord + "," + this.yCoord + "," + this.zCoord + ") has no slot " + slot + + ". Drawers.length is " + drawers.length); return; } if (drawer.getStoredItemCount() != count) { @@ -852,16 +786,17 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe } } - private void syncClientCount (int slot) { + private void syncClientCount(int slot) { IMessage message = new CountUpdateMessage(xCoord, yCoord, zCoord, slot, drawers[slot].getStoredItemCount()); - NetworkRegistry.TargetPoint targetPoint = new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 500); + NetworkRegistry.TargetPoint targetPoint = + new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 500); StorageDrawers.network.sendToAllAround(message, targetPoint); } // TODO: Eventually eliminate these expensive network updates @Override - public Packet getDescriptionPacket () { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeToNBT(tag); @@ -869,139 +804,130 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity pkt) { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { readFromNBT(pkt.func_148857_g()); getWorldObj().func_147479_m(xCoord, yCoord, zCoord); // markBlockForRenderUpdate } @Override - public int getDrawerCount () { + public int getDrawerCount() { return drawers.length; } @Override - public IDrawer getDrawer (int slot) { - if (slot < 0 || slot >= drawers.length) - return null; + public IDrawer getDrawer(int slot) { + if (slot < 0 || slot >= drawers.length) return null; return drawers[slot]; } @Override - public IDrawerInventory getDrawerInventory () { + public IDrawerInventory getDrawerInventory() { return inventory; } @Override - public boolean isDrawerEnabled (int slot) { - if (isSealed()) - return false; + public boolean isDrawerEnabled(int slot) { + if (isSealed()) return false; - if (getBlockType() instanceof BlockDrawersCustom && materialSide == null) - return false; + if (getBlockType() instanceof BlockDrawersCustom && materialSide == null) return false; return getDrawer(slot) != null; } @Override - public int[] getAccessibleSlotsFromSide (int side) { + public int[] getAccessibleSlotsFromSide(int side) { return inventory.getAccessibleSlotsFromSide(side); } @Override - public boolean canInsertItem (int slot, ItemStack stack, int side) { - if (isSealed()) - return false; + public boolean canInsertItem(int slot, ItemStack stack, int side) { + if (isSealed()) return false; if (isLocked(LockAttribute.LOCK_EMPTY) && inventory instanceof StorageInventory) { IDrawer drawer = getDrawer(inventory.getDrawerSlot(slot)); - if (drawer != null && drawer.isEmpty()) - return false; + if (drawer != null && drawer.isEmpty()) return false; } return inventory.canInsertItem(slot, stack, side); } @Override - public boolean canExtractItem (int slot, ItemStack stack, int side) { - if (isSealed()) - return false; + public boolean canExtractItem(int slot, ItemStack stack, int side) { + if (isSealed()) return false; return inventory.canExtractItem(slot, stack, side); } @Override - public int getSizeInventory () { + public int getSizeInventory() { return getDrawerCount(); } @Override - public ItemStack getStackInSlot (int slot) { + public ItemStack getStackInSlot(int slot) { return inventory.getStackInSlot(slot); } @Override - public ItemStack decrStackSize (int slot, int count) { + public ItemStack decrStackSize(int slot, int count) { return inventory.decrStackSize(slot, count); } @Override - public ItemStack getStackInSlotOnClosing (int slot) { + public ItemStack getStackInSlotOnClosing(int slot) { return inventory.getStackInSlotOnClosing(slot); } @Override - public void setInventorySlotContents (int slot, ItemStack stack) { + public void setInventorySlotContents(int slot, ItemStack stack) { inventory.setInventorySlotContents(slot, stack); } - public void setInventoryName (String name) { + public void setInventoryName(String name) { customName = name; } @Override - public String getInventoryName () { + public String getInventoryName() { return hasCustomInventoryName() ? customName : "storageDrawers.container.drawers"; } @Override - public boolean hasCustomInventoryName () { + public boolean hasCustomInventoryName() { return customName != null && customName.length() > 0; } @Override - public int getInventoryStackLimit () { + public int getInventoryStackLimit() { return inventory.getInventoryStackLimit(); } @Override - public boolean isUseableByPlayer (EntityPlayer player) { - if (worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) - return false; + public boolean isUseableByPlayer(EntityPlayer player) { + if (worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) return false; return player.getDistanceSq(xCoord + .5, yCoord + .5, zCoord + .5) <= 64; - } @Override - public void openInventory () { + public void openInventory() { inventory.openInventory(); } @Override - public void closeInventory () { + public void closeInventory() { inventory.closeInventory(); } @Override - public boolean isItemValidForSlot (int slot, ItemStack stack) { + public boolean isItemValidForSlot(int slot, ItemStack stack) { return inventory.isItemValidForSlot(slot, stack); } - private class DefaultSideManager implements ISideManager - { + private class DefaultSideManager implements ISideManager { @Override - public int[] getSlotsForSide (int side) { + public int[] getSlotsForSide(int side) { return autoSides; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java index 889e370..db2ed7a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java @@ -7,7 +7,6 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; import com.jaquadro.minecraft.storagedrawers.config.CompTierRegistry; import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; -import com.jaquadro.minecraft.storagedrawers.integration.IntegrationModule; import com.jaquadro.minecraft.storagedrawers.network.CountUpdateMessage; import com.jaquadro.minecraft.storagedrawers.storage.*; import cpw.mods.fml.common.FMLLog; @@ -15,6 +14,10 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,13 +26,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import org.apache.logging.log4j.Level; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class TileEntityDrawersComp extends TileEntityDrawers -{ +public class TileEntityDrawersComp extends TileEntityDrawers { private static InventoryLookup lookup1 = new InventoryLookup(1, 1); private static InventoryLookup lookup2 = new InventoryLookup(2, 2); private static InventoryLookup lookup3 = new InventoryLookup(3, 3); @@ -42,20 +39,19 @@ public class TileEntityDrawersComp extends TileEntityDrawers private ItemStack[] protoStack; private int[] convRate; - public TileEntityDrawersComp () { + public TileEntityDrawersComp() { super(3); protoStack = new ItemStack[getDrawerCount()]; convRate = new int[getDrawerCount()]; } - protected ICentralInventory getCentralInventory () { - if (centralInventory == null) - centralInventory = new CompCentralInventory(); + protected ICentralInventory getCentralInventory() { + if (centralInventory == null) centralInventory = new CompCentralInventory(); return centralInventory; } - public int getStoredItemRemainder (int slot) { + public int getStoredItemRemainder(int slot) { int count = centralInventory.getStoredItemCount(slot); if (slot > 0 && convRate[slot] > 0) count -= centralInventory.getStoredItemCount(slot - 1) * (convRate[slot - 1] / convRate[slot]); @@ -64,43 +60,38 @@ public class TileEntityDrawersComp extends TileEntityDrawers } @Override - protected IDrawer createDrawer (int slot) { + protected IDrawer createDrawer(int slot) { return new CompDrawerData(getCentralInventory(), slot); } @Override - public boolean isDrawerEnabled (int slot) { - if (slot > 0 && convRate[slot] == 0) - return false; + public boolean isDrawerEnabled(int slot) { + if (slot > 0 && convRate[slot] == 0) return false; return super.isDrawerEnabled(slot); } @Override - public int putItemsIntoSlot (int slot, ItemStack stack, int count) { + public int putItemsIntoSlot(int slot, ItemStack stack, int count) { int added = 0; if (stack != null && convRate != null && convRate[0] == 0) { populateSlots(stack); for (int i = 0; i < getDrawerCount(); i++) { - if (BaseDrawerData.areItemsEqual(protoStack[i], stack)) - added = super.putItemsIntoSlot(i, stack, count); + if (BaseDrawerData.areItemsEqual(protoStack[i], stack)) added = super.putItemsIntoSlot(i, stack, count); } for (int i = 0; i < getDrawerCount(); i++) { IDrawer drawer = getDrawer(i); - if (drawer instanceof CompDrawerData) - ((CompDrawerData) drawer).refresh(); + if (drawer instanceof CompDrawerData) ((CompDrawerData) drawer).refresh(); } - - } return added + super.putItemsIntoSlot(slot, stack, count); } @Override - public void readFromPortableNBT (NBTTagCompound tag) { + public void readFromPortableNBT(NBTTagCompound tag) { pooledCount = 0; for (int i = 0; i < getDrawerCount(); i++) { @@ -112,41 +103,34 @@ public class TileEntityDrawersComp extends TileEntityDrawers pooledCount = tag.getInteger("Count"); - if (tag.hasKey("Conv0")) - convRate[0] = tag.getByte("Conv0"); - if (tag.hasKey("Conv1")) - convRate[1] = tag.getByte("Conv1"); - if (tag.hasKey("Conv2")) - convRate[2] = tag.getByte("Conv2"); + if (tag.hasKey("Conv0")) convRate[0] = tag.getByte("Conv0"); + if (tag.hasKey("Conv1")) convRate[1] = tag.getByte("Conv1"); + if (tag.hasKey("Conv2")) convRate[2] = tag.getByte("Conv2"); for (int i = 0; i < getDrawerCount(); i++) { IDrawer drawer = getDrawer(i); - if (drawer instanceof CompDrawerData) - ((CompDrawerData) drawer).refresh(); + if (drawer instanceof CompDrawerData) ((CompDrawerData) drawer).refresh(); } if (worldObj != null && !worldObj.isRemote) { - //TileEntityDrawersComp.this.markDirty(); + // TileEntityDrawersComp.this.markDirty(); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } } @Override - public void writeToPortableNBT (NBTTagCompound tag) { + public void writeToPortableNBT(NBTTagCompound tag) { super.writeToPortableNBT(tag); tag.setInteger("Count", pooledCount); - if (convRate[0] > 0) - tag.setByte("Conv0", (byte)convRate[0]); - if (convRate[1] > 0) - tag.setByte("Conv1", (byte)convRate[1]); - if (convRate[2] > 0) - tag.setByte("Conv2", (byte)convRate[2]); + if (convRate[0] > 0) tag.setByte("Conv0", (byte) convRate[0]); + if (convRate[1] > 0) tag.setByte("Conv1", (byte) convRate[1]); + if (convRate[2] > 0) tag.setByte("Conv2", (byte) convRate[2]); } @Override - public void clientUpdateCount (int slot, int count) { + public void clientUpdateCount(int slot, int count) { if (count != pooledCount) { pooledCount = count; getWorldObj().func_147479_m(xCoord, yCoord, zCoord); // markBlockForRenderUpdate @@ -154,23 +138,29 @@ public class TileEntityDrawersComp extends TileEntityDrawers } @Override - public String getInventoryName () { + public String getInventoryName() { return hasCustomInventoryName() ? super.getInventoryName() : "storageDrawers.container.compDrawers"; } - private void populateSlots (ItemStack stack) { + private void populateSlots(ItemStack stack) { int index = 0; ItemStack uTier1 = findHigherTier(stack); if (uTier1 != null) { if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) - FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "Picked candidate " + uTier1.toString() + " with conv=" + lookupSizeResult); + FMLLog.log( + StorageDrawers.MOD_ID, + Level.INFO, + "Picked candidate " + uTier1.toString() + " with conv=" + lookupSizeResult); int uCount1 = lookupSizeResult; ItemStack uTier2 = findHigherTier(uTier1); if (uTier2 != null) { if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) - FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "Picked candidate " + uTier2.toString() + " with conv=" + lookupSizeResult); + FMLLog.log( + StorageDrawers.MOD_ID, + Level.INFO, + "Picked candidate " + uTier2.toString() + " with conv=" + lookupSizeResult); populateSlot(index++, uTier2, lookupSizeResult * uCount1); } @@ -180,51 +170,56 @@ public class TileEntityDrawersComp extends TileEntityDrawers populateSlot(index++, stack, 1); - if (index == 3) - return; + if (index == 3) return; ItemStack lTier1 = findLowerTier(stack); if (lTier1 != null) { if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) - FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "Picked candidate " + lTier1.toString() + " with conv=" + lookupSizeResult); + FMLLog.log( + StorageDrawers.MOD_ID, + Level.INFO, + "Picked candidate " + lTier1.toString() + " with conv=" + lookupSizeResult); populateSlot(index++, lTier1, 1); - for (int i = 0; i < index - 1; i++) - convRate[i] *= lookupSizeResult; + for (int i = 0; i < index - 1; i++) convRate[i] *= lookupSizeResult; } - if (index == 3 || lTier1 == null) - return; + if (index == 3 || lTier1 == null) return; ItemStack lTier2 = findLowerTier(lTier1); if (lTier2 != null) { if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) - FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "Picked candidate " + lTier2.toString() + " with conv=" + lookupSizeResult); + FMLLog.log( + StorageDrawers.MOD_ID, + Level.INFO, + "Picked candidate " + lTier2.toString() + " with conv=" + lookupSizeResult); populateSlot(index++, lTier2, 1); - for (int i = 0; i < index - 1; i++) - convRate[i] *= lookupSizeResult; + for (int i = 0; i < index - 1; i++) convRate[i] *= lookupSizeResult; } } - private void populateSlot (int slot, ItemStack stack, int conversion) { + private void populateSlot(int slot, ItemStack stack, int conversion) { convRate[slot] = conversion; protoStack[slot] = stack.copy(); - //centralInventory.setStoredItem(slot, stack, 0); - //getDrawer(slot).setStoredItem(stack, 0); + // centralInventory.setStoredItem(slot, stack, 0); + // getDrawer(slot).setStoredItem(stack, 0); if (worldObj != null && worldObj.isRemote) getWorldObj().func_147479_m(xCoord, yCoord, zCoord); // markBlockForRenderUpdate } - private ItemStack findHigherTier (ItemStack stack) { + private ItemStack findHigherTier(ItemStack stack) { if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "Finding ascending candidates for " + stack.toString()); CompTierRegistry.Record record = StorageDrawers.compRegistry.findHigherTier(stack); if (record != null) { if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) - FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "Found " + record.upper.toString() + " in registry with conv=" + record.convRate); + FMLLog.log( + StorageDrawers.MOD_ID, + Level.INFO, + "Found " + record.upper.toString() + " in registry with conv=" + record.convRate); lookupSizeResult = record.convRate; return record.upper; @@ -251,15 +246,17 @@ public class TileEntityDrawersComp extends TileEntityDrawers for (int j = 0, n2 = backCandidates.size(); j < n2; j++) { ItemStack comp = backCandidates.get(j); - if (comp.stackSize != size) - continue; + if (comp.stackSize != size) continue; - if (!DrawerData.areItemsEqual(comp, stack, false)) - continue; + if (!DrawerData.areItemsEqual(comp, stack, false)) continue; candidates.add(match); if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) - FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "Found ascending candidate for " + stack.toString() + ": " + match.toString() + " size=" + lookupSizeResult + ", inverse=" + comp.toString()); + FMLLog.log( + StorageDrawers.MOD_ID, + Level.INFO, + "Found ascending candidate for " + stack.toString() + ": " + match.toString() + " size=" + + lookupSizeResult + ", inverse=" + comp.toString()); break; } @@ -269,11 +266,9 @@ public class TileEntityDrawersComp extends TileEntityDrawers } ItemStack modMatch = findMatchingModCandidate(stack, candidates); - if (modMatch != null) - return modMatch; + if (modMatch != null) return modMatch; - if (candidates.size() > 0) - return candidates.get(0); + if (candidates.size() > 0) return candidates.get(0); if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "No candidates found"); @@ -281,7 +276,7 @@ public class TileEntityDrawersComp extends TileEntityDrawers return null; } - private List findAllMatchingRecipes (InventoryCrafting crafting) { + private List findAllMatchingRecipes(InventoryCrafting crafting) { List candidates = new ArrayList(); CraftingManager cm = CraftingManager.getInstance(); @@ -291,22 +286,24 @@ public class TileEntityDrawersComp extends TileEntityDrawers IRecipe recipe = (IRecipe) recipeList.get(i); if (recipe.matches(crafting, worldObj)) { ItemStack result = recipe.getCraftingResult(crafting); - if (result != null && result.getItem() != null) - candidates.add(result); + if (result != null && result.getItem() != null) candidates.add(result); } } return candidates; } - private ItemStack findLowerTier (ItemStack stack) { + private ItemStack findLowerTier(ItemStack stack) { if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "Finding descending candidates for " + stack.toString()); CompTierRegistry.Record record = StorageDrawers.compRegistry.findLowerTier(stack); if (record != null) { if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) - FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "Found " + record.lower.toString() + " in registry with conv=" + record.convRate); + FMLLog.log( + StorageDrawers.MOD_ID, + Level.INFO, + "Found " + record.lower.toString() + " in registry with conv=" + record.convRate); lookupSizeResult = record.convRate; return record.lower; @@ -323,8 +320,7 @@ public class TileEntityDrawersComp extends TileEntityDrawers ItemStack match = null; ItemStack output = recipe.getRecipeOutput(); - if (!DrawerData.areItemsEqual(stack, output, true)) - continue; + if (!DrawerData.areItemsEqual(stack, output, true)) continue; IRecipeHandler handler = StorageDrawers.recipeHandlerRegistry.getRecipeHandler(recipe.getClass()); while (handler != null) { @@ -353,9 +349,17 @@ public class TileEntityDrawersComp extends TileEntityDrawers candidatesRate.put(match, lookupSizeResult); if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) - FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "Found descending candidate for " + stack.toString() + ": " + match.toString() + " size=" + lookupSizeResult + ", inverse=" + comp.toString()); + FMLLog.log( + StorageDrawers.MOD_ID, + Level.INFO, + "Found descending candidate for " + stack.toString() + ": " + match.toString() + + " size=" + lookupSizeResult + ", inverse=" + comp.toString()); } else if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) - FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "Back-check failed for " + match.toString() + " size=" + lookupSizeResult + ", inverse=" + comp.toString()); + FMLLog.log( + StorageDrawers.MOD_ID, + Level.INFO, + "Back-check failed for " + match.toString() + " size=" + lookupSizeResult + ", inverse=" + + comp.toString()); } } } @@ -379,7 +383,7 @@ public class TileEntityDrawersComp extends TileEntityDrawers return null; } - private ItemStack findMatchingModCandidate (ItemStack reference, List candidates) { + private ItemStack findMatchingModCandidate(ItemStack reference, List candidates) { String referenceName = GameData.getItemRegistry().getNameForObject(reference.getItem()); if (referenceName != null) { GameRegistry.UniqueIdentifier referneceID = new GameRegistry.UniqueIdentifier(referenceName); @@ -387,8 +391,7 @@ public class TileEntityDrawersComp extends TileEntityDrawers String matchName = GameData.getItemRegistry().getNameForObject(candidate.getItem()); if (matchName != null) { GameRegistry.UniqueIdentifier matchID = new GameRegistry.UniqueIdentifier(matchName); - if (referneceID.modId.equals(matchID.modId)) - return candidate; + if (referneceID.modId.equals(matchID.modId)) return candidate; } } } @@ -396,93 +399,73 @@ public class TileEntityDrawersComp extends TileEntityDrawers return null; } - private ItemStack tryMatch (ItemStack stack, List list) { - if (list.size() != 9 && list.size() != 4) - return null; + private ItemStack tryMatch(ItemStack stack, List list) { + if (list.size() != 9 && list.size() != 4) return null; Object item = list.get(0); if (item instanceof ItemStack) { - ItemStack item1 = (ItemStack)item; + ItemStack item1 = (ItemStack) item; for (int i = 1, n = list.size(); i < n; i++) { Object item2 = list.get(i); - if (item2.getClass() != ItemStack.class) - return null; - if (!item1.isItemEqual((ItemStack)item2)) - return null; + if (item2.getClass() != ItemStack.class) return null; + if (!item1.isItemEqual((ItemStack) item2)) return null; } return item1; - } - else if (item instanceof ArrayList) { + } else if (item instanceof ArrayList) { for (int i = 1, n = list.size(); i < n; i++) { - if (item != list.get(i)) - return null; + if (item != list.get(i)) return null; } - ArrayList itemList = (ArrayList)item; + ArrayList itemList = (ArrayList) item; if (itemList.size() > 0) { Object item1 = itemList.get(0); - if (item1 instanceof ItemStack) - return (ItemStack)item1; + if (item1 instanceof ItemStack) return (ItemStack) item1; } } return null; } - private ItemStack tryMatch (ItemStack stack, Object[] list) { - if (list.length != 9 && list.length != 4) - return null; + private ItemStack tryMatch(ItemStack stack, Object[] list) { + if (list.length != 9 && list.length != 4) return null; Object item = list[0]; - if (item == null) - return null; + if (item == null) return null; if (item instanceof ItemStack) { - ItemStack item1 = (ItemStack)item; + ItemStack item1 = (ItemStack) item; for (int i = 1, n = list.length; i < n; i++) { Object item2 = list[i]; - if (item2 == null || item2.getClass() != ItemStack.class) - return null; - if (!item1.isItemEqual((ItemStack)item2)) - return null; + if (item2 == null || item2.getClass() != ItemStack.class) return null; + if (!item1.isItemEqual((ItemStack) item2)) return null; } return item1; - } - else if (item instanceof ArrayList) { + } else if (item instanceof ArrayList) { for (int i = 1, n = list.length; i < n; i++) { - if (item != list[i]) - return null; + if (item != list[i]) return null; } - ArrayList itemList = (ArrayList)item; + ArrayList itemList = (ArrayList) item; if (itemList.size() > 0) { Object item1 = findMatchingModCandidate(stack, itemList); - if (item1 == null) - item1 = itemList.get(0); + if (item1 == null) item1 = itemList.get(0); - if (item1 instanceof ItemStack) - return (ItemStack)item1; + if (item1 instanceof ItemStack) return (ItemStack) item1; } - } - else { + } else { IIngredientHandler handler = StorageDrawers.recipeHandlerRegistry.getIngredientHandler(item.getClass()); - if (handler == null) - return null; + if (handler == null) return null; ItemStack item1 = handler.getItemStack(item); - if (item1 == null) - return null; + if (item1 == null) return null; for (int i = 1, n = list.length; i < n; i++) { Object item2 = list[i]; - if (item2 == null || item.getClass() != item2.getClass()) - return null; + if (item2 == null || item.getClass() != item2.getClass()) return null; item2 = handler.getItemStack(item2); - if (item2 == null || item2.getClass() != ItemStack.class) - return null; - if (!item1.isItemEqual((ItemStack)item2)) - return null; + if (item2 == null || item2.getClass() != ItemStack.class) return null; + if (!item1.isItemEqual((ItemStack) item2)) return null; } return item1; @@ -491,22 +474,20 @@ public class TileEntityDrawersComp extends TileEntityDrawers return null; } - private void setupLookup (InventoryLookup inv, ItemStack stack) { - for (int i = 0, n = inv.getSizeInventory(); i < n; i++) - inv.setInventorySlotContents(i, stack); + private void setupLookup(InventoryLookup inv, ItemStack stack) { + for (int i = 0, n = inv.getSizeInventory(); i < n; i++) inv.setInventorySlotContents(i, stack); lookupSizeResult = inv.getSizeInventory(); } - private class CompCentralInventory implements ICentralInventory - { + private class CompCentralInventory implements ICentralInventory { @Override - public ItemStack getStoredItemPrototype (int slot) { + public ItemStack getStoredItemPrototype(int slot) { return protoStack[slot]; } @Override - public IDrawer setStoredItem (int slot, ItemStack itemPrototype, int amount) { + public IDrawer setStoredItem(int slot, ItemStack itemPrototype, int amount) { if (itemPrototype != null && convRate != null && convRate[0] == 0) { IDrawer target = null; populateSlots(itemPrototype); @@ -518,57 +499,48 @@ public class TileEntityDrawersComp extends TileEntityDrawers } for (int i = 0; i < getDrawerCount(); i++) { - if (i == slot) - continue; + if (i == slot) continue; IDrawer drawer = getDrawer(i); - if (drawer instanceof CompDrawerData) - ((CompDrawerData) drawer).refresh(); + if (drawer instanceof CompDrawerData) ((CompDrawerData) drawer).refresh(); } if (worldObj != null && !worldObj.isRemote) { - //TileEntityDrawersComp.this.markDirty(); + // TileEntityDrawersComp.this.markDirty(); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } return target; - } - else if (itemPrototype == null) { - //setStoredItemCount(slot, 0); + } else if (itemPrototype == null) { + // setStoredItemCount(slot, 0); pooledCount = 0; clear(); - if (worldObj != null && !worldObj.isRemote) - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + if (worldObj != null && !worldObj.isRemote) worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } return getDrawer(slot); } @Override - public int getStoredItemCount (int slot) { - if (convRate == null || convRate[slot] == 0) - return 0; + public int getStoredItemCount(int slot) { + if (convRate == null || convRate[slot] == 0) return 0; - if (TileEntityDrawersComp.this.isVending()) - return Integer.MAX_VALUE; + if (TileEntityDrawersComp.this.isVending()) return Integer.MAX_VALUE; return pooledCount / convRate[slot]; } @Override - public void setStoredItemCount (int slot, int amount) { - if (convRate == null || convRate[slot] == 0) - return; + public void setStoredItemCount(int slot, int amount) { + if (convRate == null || convRate[slot] == 0) return; - if (TileEntityDrawersComp.this.isVending()) - return; + if (TileEntityDrawersComp.this.isVending()) return; int oldCount = pooledCount; pooledCount = (pooledCount % convRate[slot]) + convRate[slot] * amount; int poolMax = getMaxCapacity(0) * convRate[0]; - if (pooledCount > poolMax) - pooledCount = poolMax; + if (pooledCount > poolMax) pooledCount = poolMax; if (pooledCount != oldCount) { if (pooledCount != 0 || TileEntityDrawersComp.this.isLocked(LockAttribute.LOCK_POPULATED)) @@ -576,7 +548,7 @@ public class TileEntityDrawersComp extends TileEntityDrawers else { clear(); if (worldObj != null && !worldObj.isRemote) { - //TileEntityDrawersComp.this.markDirty(); + // TileEntityDrawersComp.this.markDirty(); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } } @@ -584,134 +556,123 @@ public class TileEntityDrawersComp extends TileEntityDrawers } @Override - public int getMaxCapacity (int slot) { - if (protoStack[slot] == null || convRate == null || convRate[slot] == 0) - return 0; + public int getMaxCapacity(int slot) { + if (protoStack[slot] == null || convRate == null || convRate[slot] == 0) return 0; if (TileEntityDrawersComp.this.isUnlimited() || TileEntityDrawersComp.this.isVending()) { - if (convRate == null || protoStack[slot] == null || convRate[slot] == 0) - return Integer.MAX_VALUE; + if (convRate == null || protoStack[slot] == null || convRate[slot] == 0) return Integer.MAX_VALUE; return Integer.MAX_VALUE / convRate[slot]; } - return protoStack[0].getItem().getItemStackLimit(protoStack[0]) * getStackCapacity(0) * getConversionRate(slot); + return protoStack[0].getItem().getItemStackLimit(protoStack[0]) + * getStackCapacity(0) + * getConversionRate(slot); } @Override - public int getMaxCapacity (int slot, ItemStack itemPrototype) { - if (itemPrototype == null || itemPrototype.getItem() == null) - return 0; + public int getMaxCapacity(int slot, ItemStack itemPrototype) { + if (itemPrototype == null || itemPrototype.getItem() == null) return 0; if (TileEntityDrawersComp.this.isUnlimited() || TileEntityDrawersComp.this.isVending()) { - if (convRate == null || protoStack[slot] == null || convRate[slot] == 0) - return Integer.MAX_VALUE; + if (convRate == null || protoStack[slot] == null || convRate[slot] == 0) return Integer.MAX_VALUE; return Integer.MAX_VALUE / convRate[slot]; } if (convRate == null || protoStack[0] == null || convRate[0] == 0) return itemPrototype.getItem().getItemStackLimit(itemPrototype) * getBaseStackCapacity(); - if (BaseDrawerData.areItemsEqual(protoStack[slot], itemPrototype)) - return getMaxCapacity(slot); + if (BaseDrawerData.areItemsEqual(protoStack[slot], itemPrototype)) return getMaxCapacity(slot); return 0; } @Override - public int getRemainingCapacity (int slot) { - if (TileEntityDrawersComp.this.isVending()) - return Integer.MAX_VALUE; + public int getRemainingCapacity(int slot) { + if (TileEntityDrawersComp.this.isVending()) return Integer.MAX_VALUE; return getMaxCapacity(slot) - getStoredItemCount(slot); } @Override - public int getStoredItemStackSize (int slot) { - if (protoStack[slot] == null || convRate == null || convRate[slot] == 0) - return 0; + public int getStoredItemStackSize(int slot) { + if (protoStack[slot] == null || convRate == null || convRate[slot] == 0) return 0; return protoStack[slot].getItem().getItemStackLimit(protoStack[slot]); } @Override - public int getItemCapacityForInventoryStack (int slot) { - if (isVoid()) - return Integer.MAX_VALUE; - else - return getMaxCapacity(slot); + public int getItemCapacityForInventoryStack(int slot) { + if (isVoid()) return Integer.MAX_VALUE; + else return getMaxCapacity(slot); } @Override - public int getConversionRate (int slot) { - if (protoStack[slot] == null || convRate == null || convRate[slot] == 0) - return 0; + public int getConversionRate(int slot) { + if (protoStack[slot] == null || convRate == null || convRate[slot] == 0) return 0; return convRate[0] / convRate[slot]; } @Override - public int getStoredItemRemainder (int slot) { + public int getStoredItemRemainder(int slot) { return TileEntityDrawersComp.this.getStoredItemRemainder(slot); } @Override - public boolean isSmallestUnit (int slot) { - if (protoStack[slot] == null || convRate == null || convRate[slot] == 0) - return false; + public boolean isSmallestUnit(int slot) { + if (protoStack[slot] == null || convRate == null || convRate[slot] == 0) return false; return convRate[slot] == 1; } @Override - public boolean isVoidSlot (int slot) { + public boolean isVoidSlot(int slot) { return isVoid(); } @Override - public boolean isShroudedSlot (int slot) { + public boolean isShroudedSlot(int slot) { return isShrouded(); } @Override - public boolean setIsSlotShrouded (int slot, boolean state) { + public boolean setIsSlotShrouded(int slot, boolean state) { setIsShrouded(state); return true; } @Override - public boolean isLocked (int slot, LockAttribute attr) { + public boolean isLocked(int slot, LockAttribute attr) { return TileEntityDrawersComp.this.isLocked(attr); } @Override - public void writeToNBT (int slot, NBTTagCompound tag) { + public void writeToNBT(int slot, NBTTagCompound tag) { ItemStack protoStack = getStoredItemPrototype(slot); if (protoStack != null && protoStack.getItem() != null) { tag.setShort("Item", (short) Item.getIdFromItem(protoStack.getItem())); tag.setShort("Meta", (short) protoStack.getItemDamage()); tag.setInteger("Count", 0); // TODO: Remove when ready to break 1.1.7 compat - if (protoStack.getTagCompound() != null) - tag.setTag("Tags", protoStack.getTagCompound()); + if (protoStack.getTagCompound() != null) tag.setTag("Tags", protoStack.getTagCompound()); } } @Override - public void readFromNBT (int slot, NBTTagCompound tag) { + public void readFromNBT(int slot, NBTTagCompound tag) { if (tag.hasKey("Item")) { Item item = Item.getItemById(tag.getShort("Item")); if (item != null) { ItemStack stack = new ItemStack(item); stack.setItemDamage(tag.getShort("Meta")); - if (tag.hasKey("Tags")) - stack.setTagCompound(tag.getCompoundTag("Tags")); + if (tag.hasKey("Tags")) stack.setTagCompound(tag.getCompoundTag("Tags")); protoStack[slot] = stack; } } } - private void clear () { + private void clear() { for (int i = 0; i < getDrawerCount(); i++) { protoStack[i] = null; convRate[i] = 0; @@ -721,17 +682,15 @@ public class TileEntityDrawersComp extends TileEntityDrawers TileEntityDrawersComp.this.markDirty(); } - public void refresh () { + public void refresh() { for (int i = 0; i < getDrawerCount(); i++) { IDrawer drawer = getDrawer(i); - if (drawer instanceof CompDrawerData) - ((CompDrawerData) drawer).refresh(); + if (drawer instanceof CompDrawerData) ((CompDrawerData) drawer).refresh(); } } - private int getStackCapacity (int slot) { - if (convRate == null || convRate[slot] == 0) - return 0; + private int getStackCapacity(int slot) { + if (convRate == null || convRate[slot] == 0) return 0; int slotStacks = getBaseStackCapacity(); @@ -739,62 +698,59 @@ public class TileEntityDrawersComp extends TileEntityDrawers return stackLimit / convRate[slot]; } - private int getBaseStackCapacity () { + private int getBaseStackCapacity() { ConfigManager config = StorageDrawers.config; - return TileEntityDrawersComp.this.getEffectiveStorageMultiplier() * TileEntityDrawersComp.this.getDrawerCapacity(); + return TileEntityDrawersComp.this.getEffectiveStorageMultiplier() + * TileEntityDrawersComp.this.getDrawerCapacity(); } - public void markAmountDirty () { - if (getWorldObj().isRemote) - return; + public void markAmountDirty() { + if (getWorldObj().isRemote) return; IMessage message = new CountUpdateMessage(xCoord, yCoord, zCoord, 0, pooledCount); - NetworkRegistry.TargetPoint targetPoint = new NetworkRegistry.TargetPoint(getWorldObj().provider.dimensionId, xCoord, yCoord, zCoord, 500); + NetworkRegistry.TargetPoint targetPoint = + new NetworkRegistry.TargetPoint(getWorldObj().provider.dimensionId, xCoord, yCoord, zCoord, 500); StorageDrawers.network.sendToAllAround(message, targetPoint); } - public void markDirty (int slot) { - if (getWorldObj().isRemote) - return; + public void markDirty(int slot) { + if (getWorldObj().isRemote) return; getWorldObj().markBlockForUpdate(xCoord, yCoord, zCoord); } } - private static class InventoryLookup extends InventoryCrafting - { + private static class InventoryLookup extends InventoryCrafting { private ItemStack[] stackList; - public InventoryLookup (int width, int height) { + public InventoryLookup(int width, int height) { super(null, width, height); stackList = new ItemStack[width * height]; } @Override - public int getSizeInventory () - { + public int getSizeInventory() { return this.stackList.length; } @Override - public ItemStack getStackInSlot (int slot) - { + public ItemStack getStackInSlot(int slot) { return slot >= this.getSizeInventory() ? null : this.stackList[slot]; } @Override - public ItemStack getStackInSlotOnClosing (int slot) { + public ItemStack getStackInSlotOnClosing(int slot) { return null; } @Override - public ItemStack decrStackSize (int slot, int count) { + public ItemStack decrStackSize(int slot, int count) { return null; } @Override - public void setInventorySlotContents (int slot, ItemStack stack) { + public void setInventorySlotContents(int slot, ItemStack stack) { stackList[slot] = stack; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersStandard.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersStandard.java index 19ac0c9..65b1442 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersStandard.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersStandard.java @@ -1,14 +1,11 @@ package com.jaquadro.minecraft.storagedrawers.block.tile; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.inventory.IDrawerInventory; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import com.jaquadro.minecraft.storagedrawers.storage.*; import com.jaquadro.minecraft.storagedrawers.storage.IStorageProvider; -import net.minecraft.tileentity.TileEntity; public class TileEntityDrawersStandard extends TileEntityDrawers { @@ -23,8 +20,7 @@ public class TileEntityDrawersStandard extends TileEntityDrawers { } protected IStorageProvider getStorageProvider() { - if (storageProvider == null) - storageProvider = new StandardStorageProvider(); + if (storageProvider == null) storageProvider = new StandardStorageProvider(); return storageProvider; } @@ -33,7 +29,6 @@ public class TileEntityDrawersStandard extends TileEntityDrawers { return new DrawerData(getStorageProvider(), slot); } - private class StandardStorageProvider extends DefaultStorageProvider { public StandardStorageProvider() { super(TileEntityDrawersStandard.this, TileEntityDrawersStandard.this); @@ -60,7 +55,6 @@ public class TileEntityDrawersStandard extends TileEntityDrawers { return TileEntityDrawersStandard.this.isShrouded(); } - @Override public boolean isDowngraded(int slot) { return TileEntityDrawersStandard.this.isDowngraded(); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityFramingTable.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityFramingTable.java index d785e9b..aa1f264 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityFramingTable.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityFramingTable.java @@ -15,129 +15,112 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.Constants; -public class TileEntityFramingTable extends TileEntity implements IInventory -{ +public class TileEntityFramingTable extends TileEntity implements IInventory { private ItemStack[] tableItemStacks = new ItemStack[5]; private String customName; @Override - public int getSizeInventory () { + public int getSizeInventory() { return tableItemStacks.length; } @Override - public ItemStack getStackInSlot (int slot) { + public ItemStack getStackInSlot(int slot) { return tableItemStacks[slot]; } @Override - public ItemStack decrStackSize (int slot, int count) { + public ItemStack decrStackSize(int slot, int count) { if (tableItemStacks[slot] != null) { if (tableItemStacks[slot].stackSize <= count) { ItemStack stack = tableItemStacks[slot]; tableItemStacks[slot] = null; markDirty(); return stack; - } - else { + } else { ItemStack stack = tableItemStacks[slot].splitStack(count); - if (tableItemStacks[slot].stackSize == 0) - tableItemStacks[slot] = null; + if (tableItemStacks[slot].stackSize == 0) tableItemStacks[slot] = null; markDirty(); return stack; } - } - else - return null; + } else return null; } @Override - public ItemStack getStackInSlotOnClosing (int slot) { + public ItemStack getStackInSlotOnClosing(int slot) { return null; } @Override - public void setInventorySlotContents (int slot, ItemStack stack) { + public void setInventorySlotContents(int slot, ItemStack stack) { tableItemStacks[slot] = stack; - if (stack != null && stack.stackSize > getInventoryStackLimit()) - stack.stackSize = getInventoryStackLimit(); + if (stack != null && stack.stackSize > getInventoryStackLimit()) stack.stackSize = getInventoryStackLimit(); markDirty(); } @Override - public String getInventoryName () { + public String getInventoryName() { return hasCustomInventoryName() ? customName : "storageDrawers.container.framingTable"; } @Override - public boolean hasCustomInventoryName () { + public boolean hasCustomInventoryName() { return customName != null && customName.length() > 0; } - public void setCustomName (String name) { + public void setCustomName(String name) { customName = name; } @Override - public int getInventoryStackLimit () { + public int getInventoryStackLimit() { return 64; } @Override - public boolean isUseableByPlayer (EntityPlayer player) { - if (worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) - return false; + public boolean isUseableByPlayer(EntityPlayer player) { + if (worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) return false; return player.getDistanceSq(xCoord + .5, yCoord + .5, zCoord + .5) <= 64; } @Override - public void openInventory () { - - } + public void openInventory() {} @Override - public void closeInventory () { - - } + public void closeInventory() {} @Override - public boolean isItemValidForSlot (int slot, ItemStack stack) { - if (slot == 0) - return isItemValidDrawer(stack); - if (slot == 4) - return false; - if (slot >= 1 && slot < 4) - return isItemValidMaterial(stack); + public boolean isItemValidForSlot(int slot, ItemStack stack) { + if (slot == 0) return isItemValidDrawer(stack); + if (slot == 4) return false; + if (slot >= 1 && slot < 4) return isItemValidMaterial(stack); return false; } - public static boolean isItemValidDrawer (ItemStack stack) { - if (stack == null) - return false; + public static boolean isItemValidDrawer(ItemStack stack) { + if (stack == null) return false; Block block = Block.getBlockFromItem(stack.getItem()); return block instanceof BlockDrawersCustom || block instanceof BlockTrimCustom; } - public static boolean isItemValidMaterial (ItemStack stack) { - if (stack == null) - return false; + public static boolean isItemValidMaterial(ItemStack stack) { + if (stack == null) return false; Block block = Block.getBlockFromItem(stack.getItem()); - if (block == null) - return false; + if (block == null) return false; return block.isOpaqueCube(); } @Override - public void readFromNBT (NBTTagCompound tag) { + public void readFromNBT(NBTTagCompound tag) { super.readFromNBT(tag); NBTTagList itemList = tag.getTagList("Items", 10); @@ -151,19 +134,18 @@ public class TileEntityFramingTable extends TileEntity implements IInventory tableItemStacks[slot] = ItemStack.loadItemStackFromNBT(item); } - if (tag.hasKey("CustomName", Constants.NBT.TAG_STRING)) - customName = tag.getString("CustomName"); + if (tag.hasKey("CustomName", Constants.NBT.TAG_STRING)) customName = tag.getString("CustomName"); } @Override - public void writeToNBT (NBTTagCompound tag) { + public void writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); NBTTagList itemList = new NBTTagList(); for (int i = 0; i < tableItemStacks.length; i++) { if (tableItemStacks[i] != null) { NBTTagCompound item = new NBTTagCompound(); - item.setByte("Slot", (byte)i); + item.setByte("Slot", (byte) i); tableItemStacks[i].writeToNBT(item); itemList.appendTag(item); } @@ -171,12 +153,11 @@ public class TileEntityFramingTable extends TileEntity implements IInventory tag.setTag("Items", itemList); - if (hasCustomInventoryName()) - tag.setString("CustomName", customName); + if (hasCustomInventoryName()) tag.setString("CustomName", customName); } @Override - public Packet getDescriptionPacket () { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeToNBT(tag); @@ -184,31 +165,26 @@ public class TileEntityFramingTable extends TileEntity implements IInventory } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity pkt) { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { readFromNBT(pkt.func_148857_g()); - //getWorldObj().func_147479_m(xCoord, yCoord, zCoord); // markBlockForRenderUpdate + // getWorldObj().func_147479_m(xCoord, yCoord, zCoord); // markBlockForRenderUpdate } private static final AxisAlignedBB ZERO_EXTENT_AABB = AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0); @Override - public AxisAlignedBB getRenderBoundingBox () { + public AxisAlignedBB getRenderBoundingBox() { int meta = getBlockMetadata(); - if ((meta & 0x8) != 0) - return ZERO_EXTENT_AABB; + if ((meta & 0x8) != 0) return ZERO_EXTENT_AABB; int side = meta & 0x7; int xOff = 0; int zOff = 0; - if (side == 2) - xOff = 1; - if (side == 3) - xOff = -1; - if (side == 4) - zOff = -1; - if (side == 5) - zOff = 1; + if (side == 2) xOff = 1; + if (side == 3) xOff = -1; + if (side == 4) zOff = -1; + if (side == 5) zOff = 1; int xMin = Math.min(xCoord, xCoord + xOff); int xMax = Math.max(xCoord, xCoord + xOff) + 1; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntitySlave.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntitySlave.java index afda931..03f180d 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntitySlave.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntitySlave.java @@ -5,6 +5,7 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import com.jaquadro.minecraft.storagedrawers.api.storage.IPriorityGroup; import com.jaquadro.minecraft.storagedrawers.api.storage.ISmartGroup; +import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -15,17 +16,14 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants; -import java.util.ArrayList; - -public class TileEntitySlave extends TileEntity implements IDrawerGroup, IPriorityGroup, ISmartGroup, ISidedInventory -{ +public class TileEntitySlave extends TileEntity implements IDrawerGroup, IPriorityGroup, ISmartGroup, ISidedInventory { private BlockCoord controllerCoord; private BlockCoord selfCoord; - private int[] inventorySlots = new int[] { 0 }; - private int[] drawerSlots = new int[] { 0 }; + private int[] inventorySlots = new int[] {0}; + private int[] drawerSlots = new int[] {0}; - public void ensureInitialized () { + public void ensureInitialized() { if (selfCoord == null) { selfCoord = new BlockCoord(xCoord, yCoord, zCoord); markDirty(); @@ -33,7 +31,7 @@ public class TileEntitySlave extends TileEntity implements IDrawerGroup, IPriori } @Override - public void readFromNBT (NBTTagCompound tag) { + public void readFromNBT(NBTTagCompound tag) { super.readFromNBT(tag); selfCoord = new BlockCoord(xCoord, yCoord, zCoord); @@ -45,7 +43,7 @@ public class TileEntitySlave extends TileEntity implements IDrawerGroup, IPriori } @Override - public void writeToNBT (NBTTagCompound tag) { + public void writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); if (controllerCoord != null) { @@ -58,7 +56,7 @@ public class TileEntitySlave extends TileEntity implements IDrawerGroup, IPriori } @Override - public Packet getDescriptionPacket () { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeToNBT(tag); @@ -66,12 +64,12 @@ public class TileEntitySlave extends TileEntity implements IDrawerGroup, IPriori } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity pkt) { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { readFromNBT(pkt.func_148857_g()); getWorldObj().func_147479_m(xCoord, yCoord, zCoord); // markBlockForRenderUpdate } - public void bindController (int x, int y, int z) { + public void bindController(int x, int y, int z) { if (controllerCoord != null && controllerCoord.x() == x && controllerCoord.y() == y && controllerCoord.z() == z) return; @@ -79,9 +77,8 @@ public class TileEntitySlave extends TileEntity implements IDrawerGroup, IPriori markDirty(); } - public TileEntityController getController () { - if (controllerCoord == null) - return null; + public TileEntityController getController() { + if (controllerCoord == null) return null; ensureInitialized(); @@ -92,205 +89,181 @@ public class TileEntitySlave extends TileEntity implements IDrawerGroup, IPriori return null; } - return (TileEntityController)te; + return (TileEntityController) te; } @Override - public int[] getAccessibleDrawerSlots () { + public int[] getAccessibleDrawerSlots() { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return drawerSlots; + if (controller == null || !controller.isValidSlave(selfCoord)) return drawerSlots; return controller.getAccessibleDrawerSlots(); } @Override - public int[] getAccessibleSlotsFromSide (int side) { + public int[] getAccessibleSlotsFromSide(int side) { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return inventorySlots; + if (controller == null || !controller.isValidSlave(selfCoord)) return inventorySlots; return controller.getAccessibleSlotsFromSide(0); } @Override - public boolean canInsertItem (int slot, ItemStack stack, int side) { + public boolean canInsertItem(int slot, ItemStack stack, int side) { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return false; + if (controller == null || !controller.isValidSlave(selfCoord)) return false; return controller.canInsertItem(slot, stack, 0); } @Override - public boolean canExtractItem (int slot, ItemStack stack, int side) { + public boolean canExtractItem(int slot, ItemStack stack, int side) { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return false; + if (controller == null || !controller.isValidSlave(selfCoord)) return false; return controller.canExtractItem(slot, stack, side); } @Override - public int getSizeInventory () { + public int getSizeInventory() { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return 1; + if (controller == null || !controller.isValidSlave(selfCoord)) return 1; return controller.getSizeInventory(); } @Override - public ItemStack getStackInSlot (int slot) { + public ItemStack getStackInSlot(int slot) { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return null; + if (controller == null || !controller.isValidSlave(selfCoord)) return null; return controller.getStackInSlot(slot); } @Override - public ItemStack decrStackSize (int slot, int count) { + public ItemStack decrStackSize(int slot, int count) { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return null; + if (controller == null || !controller.isValidSlave(selfCoord)) return null; return controller.decrStackSize(slot, count); } @Override - public ItemStack getStackInSlotOnClosing (int slot) { + public ItemStack getStackInSlotOnClosing(int slot) { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return null; + if (controller == null || !controller.isValidSlave(selfCoord)) return null; return controller.getStackInSlotOnClosing(slot); } @Override - public void setInventorySlotContents (int slot, ItemStack stack) { + public void setInventorySlotContents(int slot, ItemStack stack) { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return; + if (controller == null || !controller.isValidSlave(selfCoord)) return; controller.setInventorySlotContents(slot, stack); } @Override - public String getInventoryName () { + public String getInventoryName() { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return "storageDrawers.container.unboundSlave"; + if (controller == null || !controller.isValidSlave(selfCoord)) return "storageDrawers.container.unboundSlave"; return controller.getInventoryName(); } @Override - public boolean hasCustomInventoryName () { + public boolean hasCustomInventoryName() { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return false; + if (controller == null || !controller.isValidSlave(selfCoord)) return false; return controller.hasCustomInventoryName(); } @Override - public int getInventoryStackLimit () { + public int getInventoryStackLimit() { return 64; } @Override - public boolean isUseableByPlayer (EntityPlayer player) { + public boolean isUseableByPlayer(EntityPlayer player) { return false; } @Override - public void openInventory () { - - } + public void openInventory() {} @Override - public void closeInventory () { - - } + public void closeInventory() {} @Override - public boolean isItemValidForSlot (int slot, ItemStack stack) { + public boolean isItemValidForSlot(int slot, ItemStack stack) { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return false; + if (controller == null || !controller.isValidSlave(selfCoord)) return false; return controller.isItemValidForSlot(slot, stack); } @Override - public int getDrawerCount () { + public int getDrawerCount() { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return 0; + if (controller == null || !controller.isValidSlave(selfCoord)) return 0; return controller.getDrawerCount(); } @Override - public IDrawer getDrawer (int slot) { + public IDrawer getDrawer(int slot) { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return null; + if (controller == null || !controller.isValidSlave(selfCoord)) return null; return controller.getDrawer(slot); } @Override - public boolean isDrawerEnabled (int slot) { + public boolean isDrawerEnabled(int slot) { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return false; + if (controller == null || !controller.isValidSlave(selfCoord)) return false; return controller.isDrawerEnabled(slot); } @Override - public IDrawerInventory getDrawerInventory () { + public IDrawerInventory getDrawerInventory() { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return null; + if (controller == null || !controller.isValidSlave(selfCoord)) return null; return controller.getDrawerInventory(); } @Override - public Iterable enumerateDrawersForInsertion (ItemStack stack, boolean strict) { + public Iterable enumerateDrawersForInsertion(ItemStack stack, boolean strict) { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return new ArrayList(); + if (controller == null || !controller.isValidSlave(selfCoord)) return new ArrayList(); return controller.enumerateDrawersForInsertion(stack, strict); } @Override - public Iterable enumerateDrawersForExtraction (ItemStack stack, boolean strict) { + public Iterable enumerateDrawersForExtraction(ItemStack stack, boolean strict) { TileEntityController controller = getController(); - if (controller == null || !controller.isValidSlave(selfCoord)) - return new ArrayList(); + if (controller == null || !controller.isValidSlave(selfCoord)) return new ArrayList(); return controller.enumerateDrawersForExtraction(stack, strict); } @Override - public void markDirty () { + public void markDirty() { TileEntityController controller = getController(); - if (controller != null && controller.isValidSlave(selfCoord)) - controller.markDirty(); + if (controller != null && controller.isValidSlave(selfCoord)) controller.markDirty(); super.markDirty(); } @Override - public boolean markDirtyIfNeeded () { + public boolean markDirtyIfNeeded() { TileEntityController controller = getController(); - if (controller != null && controller.isValidSlave(selfCoord)) - return controller.markDirtyIfNeeded(); + if (controller != null && controller.isValidSlave(selfCoord)) return controller.markDirtyIfNeeded(); return false; } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityTrim.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityTrim.java index d0cdab4..baa9bcc 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityTrim.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityTrim.java @@ -7,50 +7,47 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -public class TileEntityTrim extends TileEntity -{ +public class TileEntityTrim extends TileEntity { private ItemStack materialSide; private ItemStack materialTrim; - public ItemStack getMaterialSide () { + public ItemStack getMaterialSide() { return materialSide; } - public ItemStack getMaterialTrim () { + public ItemStack getMaterialTrim() { return materialTrim; } - public ItemStack getEffectiveMaterialSide () { + public ItemStack getEffectiveMaterialSide() { return materialSide; } - public ItemStack getEffectiveMaterialTrim () { + public ItemStack getEffectiveMaterialTrim() { return materialTrim != null ? materialTrim : materialSide; } - public void setMaterialSide (ItemStack material) { + public void setMaterialSide(ItemStack material) { materialSide = material; } - public void setMaterialTrim (ItemStack material) { + public void setMaterialTrim(ItemStack material) { materialTrim = material; } @Override - public void readFromNBT (NBTTagCompound tag) { + public void readFromNBT(NBTTagCompound tag) { super.readFromNBT(tag); materialSide = null; - if (tag.hasKey("MatS")) - materialSide = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatS")); + if (tag.hasKey("MatS")) materialSide = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatS")); materialTrim = null; - if (tag.hasKey("MatT")) - materialTrim = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatT")); + if (tag.hasKey("MatT")) materialTrim = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatT")); } @Override - public void writeToNBT (NBTTagCompound tag) { + public void writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); if (materialSide != null) { @@ -67,7 +64,7 @@ public class TileEntityTrim extends TileEntity } @Override - public Packet getDescriptionPacket () { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeToNBT(tag); @@ -75,7 +72,7 @@ public class TileEntityTrim extends TileEntity } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity pkt) { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { readFromNBT(pkt.func_148857_g()); getWorldObj().func_147479_m(xCoord, yCoord, zCoord); // markBlockForRenderUpdate } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java index 7af43e4..565174e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/gui/GuiDrawers.java @@ -5,6 +5,7 @@ import com.jaquadro.minecraft.storagedrawers.client.renderer.StorageRenderItem; import com.jaquadro.minecraft.storagedrawers.integration.IntegrationRegistry; import com.jaquadro.minecraft.storagedrawers.integration.NotEnoughItems; import com.jaquadro.minecraft.storagedrawers.inventory.*; +import java.util.List; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.resources.I18n; @@ -14,14 +15,15 @@ import net.minecraft.inventory.Slot; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import java.util.List; - -public class GuiDrawers extends GuiContainer -{ - private static final ResourceLocation guiTextures1 = new ResourceLocation("storagedrawers", "textures/gui/drawers_1.png"); - private static final ResourceLocation guiTextures2 = new ResourceLocation("storagedrawers", "textures/gui/drawers_2.png"); - private static final ResourceLocation guiTextures4 = new ResourceLocation("storagedrawers", "textures/gui/drawers_4.png"); - private static final ResourceLocation guiTexturesComp = new ResourceLocation("storagedrawers", "textures/gui/drawers_comp.png"); +public class GuiDrawers extends GuiContainer { + private static final ResourceLocation guiTextures1 = + new ResourceLocation("storagedrawers", "textures/gui/drawers_1.png"); + private static final ResourceLocation guiTextures2 = + new ResourceLocation("storagedrawers", "textures/gui/drawers_2.png"); + private static final ResourceLocation guiTextures4 = + new ResourceLocation("storagedrawers", "textures/gui/drawers_4.png"); + private static final ResourceLocation guiTexturesComp = + new ResourceLocation("storagedrawers", "textures/gui/drawers_comp.png"); private static final int smDisabledX = 176; private static final int smDisabledY = 0; @@ -32,7 +34,7 @@ public class GuiDrawers extends GuiContainer private TileEntityDrawers tileDrawers; - public GuiDrawers (InventoryPlayer inventory, TileEntityDrawers tileEntity) { + public GuiDrawers(InventoryPlayer inventory, TileEntityDrawers tileEntity) { super(getContainer(inventory, tileEntity)); tileDrawers = tileEntity; @@ -42,7 +44,7 @@ public class GuiDrawers extends GuiContainer itemRender = storageItemRender; } - private static Container getContainer (InventoryPlayer inventory, TileEntityDrawers tile) { + private static Container getContainer(InventoryPlayer inventory, TileEntityDrawers tile) { switch (tile.getDrawerCount()) { case 1: return new ContainerDrawers1(inventory, tile); @@ -58,7 +60,7 @@ public class GuiDrawers extends GuiContainer } @Override - public void drawScreen (int p_73863_1_, int p_73863_2_, float p_73863_3_) { + public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_) { RenderItem ri = setItemRender(storageItemRender); if (inventorySlots instanceof ContainerDrawers) { @@ -76,25 +78,22 @@ public class GuiDrawers extends GuiContainer } @Override - protected void drawGuiContainerForegroundLayer (int p_146979_1_, int p_146979_2_) { - String name = tileDrawers.hasCustomInventoryName() ? tileDrawers.getInventoryName() : I18n.format(tileDrawers.getInventoryName(), empty); + protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { + String name = tileDrawers.hasCustomInventoryName() + ? tileDrawers.getInventoryName() + : I18n.format(tileDrawers.getInventoryName(), empty); fontRendererObj.drawString(name, 8, 6, 4210752); fontRendererObj.drawString(I18n.format("storageDrawers.container.upgrades", empty), 8, 75, 4210752); - fontRendererObj.drawString(I18n.format("container.inventory",empty), 8, ySize - 96 + 2, 4210752); + fontRendererObj.drawString(I18n.format("container.inventory", empty), 8, ySize - 96 + 2, 4210752); } - @Override - protected void drawGuiContainerBackgroundLayer (float p_146976_1_, int p_146976_2_, int p_146976_3_) { + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { GL11.glColor4f(1, 1, 1, 1); - if (tileDrawers.getDrawerCount() == 1) - mc.getTextureManager().bindTexture(guiTextures1); - else if (tileDrawers.getDrawerCount() == 2) - mc.getTextureManager().bindTexture(guiTextures2); - else if (tileDrawers.getDrawerCount() == 4) - mc.getTextureManager().bindTexture(guiTextures4); - else - mc.getTextureManager().bindTexture(guiTexturesComp); + if (tileDrawers.getDrawerCount() == 1) mc.getTextureManager().bindTexture(guiTextures1); + else if (tileDrawers.getDrawerCount() == 2) mc.getTextureManager().bindTexture(guiTextures2); + else if (tileDrawers.getDrawerCount() == 4) mc.getTextureManager().bindTexture(guiTextures4); + else mc.getTextureManager().bindTexture(guiTexturesComp); int guiX = (width - xSize) / 2; int guiY = (height - ySize) / 2; @@ -105,20 +104,27 @@ public class GuiDrawers extends GuiContainer List storageSlots = container.getStorageSlots(); for (int i = 0, n = storageSlots.size(); i < n; i++) { Slot slot = storageSlots.get(i); - drawTexturedModalRect(guiX + slot.xDisplayPosition, guiY + slot.yDisplayPosition, smDisabledX, smDisabledY, 16, 16); + drawTexturedModalRect( + guiX + slot.xDisplayPosition, guiY + slot.yDisplayPosition, smDisabledX, smDisabledY, 16, 16); } List upgradeSlots = container.getUpgradeSlots(); for (int i = 0, n = upgradeSlots.size(); i < n; i++) { Slot slot = upgradeSlots.get(i); - if (slot instanceof SlotUpgrade && !((SlotUpgrade)slot).canTakeStack()) - drawTexturedModalRect(guiX + slot.xDisplayPosition, guiY + slot.yDisplayPosition, smDisabledX, smDisabledY, 16, 16); + if (slot instanceof SlotUpgrade && !((SlotUpgrade) slot).canTakeStack()) + drawTexturedModalRect( + guiX + slot.xDisplayPosition, + guiY + slot.yDisplayPosition, + smDisabledX, + smDisabledY, + 16, + 16); } } } @Override - protected boolean func_146978_c (int x, int y, int width, int height, int originX, int originY) { + protected boolean func_146978_c(int x, int y, int width, int height, int originX, int originY) { if (inventorySlots instanceof ContainerDrawers) { ContainerDrawers container = (ContainerDrawers) inventorySlots; List storageSlots = container.getStorageSlots(); @@ -131,15 +137,17 @@ public class GuiDrawers extends GuiContainer List upgradeSlots = container.getUpgradeSlots(); for (int i = 0, n = upgradeSlots.size(); i < n; i++) { Slot slot = upgradeSlots.get(i); - if (slot instanceof SlotUpgrade && !((SlotUpgrade)slot).canTakeStack() && slot.xDisplayPosition == x && slot.yDisplayPosition == y) - return false; + if (slot instanceof SlotUpgrade + && !((SlotUpgrade) slot).canTakeStack() + && slot.xDisplayPosition == x + && slot.yDisplayPosition == y) return false; } } return super.func_146978_c(x, y, width, height, originX, originY); } - private RenderItem setItemRender (RenderItem renderItem) { + private RenderItem setItemRender(RenderItem renderItem) { if (IntegrationRegistry.instance().isModLoaded("NotEnoughItems")) return NotEnoughItems.setItemRender(renderItem); else { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/gui/GuiFraming.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/gui/GuiFraming.java index 2a09606..be63a90 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/gui/GuiFraming.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/gui/GuiFraming.java @@ -12,12 +12,12 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class GuiFraming extends GuiContainer -{ - private static final ResourceLocation guiTextires = new ResourceLocation(StorageDrawers.MOD_ID.toLowerCase(), "textures/gui/framing.png"); +public class GuiFraming extends GuiContainer { + private static final ResourceLocation guiTextires = + new ResourceLocation(StorageDrawers.MOD_ID.toLowerCase(), "textures/gui/framing.png"); private TileEntityFramingTable tileFramingTable; - public GuiFraming (InventoryPlayer inventory, TileEntityFramingTable tileEntity) { + public GuiFraming(InventoryPlayer inventory, TileEntityFramingTable tileEntity) { super(new ContainerFramingTable(inventory, tileEntity)); tileFramingTable = tileEntity; @@ -26,14 +26,16 @@ public class GuiFraming extends GuiContainer } @Override - protected void drawGuiContainerForegroundLayer (int mouseX, int mouseY) { - String name = tileFramingTable.hasCustomInventoryName() ? tileFramingTable.getInventoryName() : I18n.format(tileFramingTable.getInventoryName()); + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + String name = tileFramingTable.hasCustomInventoryName() + ? tileFramingTable.getInventoryName() + : I18n.format(tileFramingTable.getInventoryName()); fontRendererObj.drawString(name, 8, 6, 4210752); fontRendererObj.drawString(I18n.format("container.inventory"), 8, ySize - 96 + 2, 4210752); } @Override - protected void drawGuiContainerBackgroundLayer (float dt, int mouseX, int mouseY) { + protected void drawGuiContainerBackgroundLayer(float dt, int mouseX, int mouseY) { GL11.glColor4f(1, 1, 1, 1); mc.getTextureManager().bindTexture(guiTextires); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/ControllerRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/ControllerRenderer.java index a3fa092..392714c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/ControllerRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/ControllerRenderer.java @@ -3,8 +3,6 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.block.BlockController; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityController; -import com.jaquadro.minecraft.storagedrawers.core.ClientProxy; -import com.jaquadro.minecraft.storagedrawers.core.CommonProxy; import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; import com.jaquadro.minecraft.storagedrawers.util.RenderHelperState; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; @@ -14,33 +12,31 @@ import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -public class ControllerRenderer implements ISimpleBlockRenderingHandler -{ +public class ControllerRenderer implements ISimpleBlockRenderingHandler { private static final double unit = .0625f; private ModularBoxRenderer boxRenderer = new ModularBoxRenderer(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelId, RenderBlocks renderer) { - if (!(block instanceof BlockController)) - return; + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + if (!(block instanceof BlockController)) return; renderInventoryBlock((BlockController) block, metadata, modelId, renderer); } - private void renderInventoryBlock (BlockController block, int metadata, int modelId, RenderBlocks renderer) { + private void renderInventoryBlock(BlockController block, int metadata, int modelId, RenderBlocks renderer) { int side = 4; boxRenderer.setUnit(unit); boxRenderer.setColor(ModularBoxRenderer.COLOR_WHITE); - for (int i = 0; i < 6; i++) - boxRenderer.setIcon(block.getIcon(i, metadata), i); + for (int i = 0; i < 6; i++) boxRenderer.setIcon(block.getIcon(i, metadata), i); GL11.glRotatef(90, 0, 1, 0); GL11.glTranslatef(-.5f, -.5f, -.5f); - RenderHelper.instance.state.setUVRotation(RenderHelper.YPOS, RenderHelperState.ROTATION_BY_FACE_FACE[RenderHelper.ZNEG][side]); + RenderHelper.instance.state.setUVRotation( + RenderHelper.YPOS, RenderHelperState.ROTATION_BY_FACE_FACE[RenderHelper.ZNEG][side]); - renderExterior(block, 0, 0, 0,side, renderer); + renderExterior(block, 0, 0, 0, side, renderer); boxRenderer.setUnit(0); boxRenderer.setInteriorIcon(block.getIcon(side, metadata), ForgeDirection.OPPOSITES[side]); @@ -53,26 +49,26 @@ public class ControllerRenderer implements ISimpleBlockRenderingHandler } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - if (!(block instanceof BlockController)) - return false; + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + if (!(block instanceof BlockController)) return false; return renderWorldBlock(world, x, y, z, (BlockController) block, modelId, renderer); } - private boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, BlockController block, int modelId, RenderBlocks renderer) { + private boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, BlockController block, int modelId, RenderBlocks renderer) { TileEntityController tile = block.getTileEntity(world, x, y, z); - if (tile == null) - return false; + if (tile == null) return false; int side = tile.getDirection(); - RenderHelper.instance.state.setUVRotation(RenderHelper.YPOS, RenderHelperState.ROTATION_BY_FACE_FACE[RenderHelper.ZNEG][side]); + RenderHelper.instance.state.setUVRotation( + RenderHelper.YPOS, RenderHelperState.ROTATION_BY_FACE_FACE[RenderHelper.ZNEG][side]); boxRenderer.setUnit(unit); boxRenderer.setColor(ModularBoxRenderer.COLOR_WHITE); - for (int i = 0; i < 6; i++) - boxRenderer.setExteriorIcon(block.getIcon(world, x, y, z, i), i); + for (int i = 0; i < 6; i++) boxRenderer.setExteriorIcon(block.getIcon(world, x, y, z, i), i); boxRenderer.setCutIcon(block.getIconTrim(0)); boxRenderer.setInteriorIcon(block.getIconTrim(0)); @@ -89,66 +85,108 @@ public class ControllerRenderer implements ISimpleBlockRenderingHandler return true; } - private void renderExterior (BlockController block, int x, int y, int z, int side, RenderBlocks renderer) { + private void renderExterior(BlockController block, int x, int y, int z, int side, RenderBlocks renderer) { double depth = 1; double xMin = 0, xMax = 0, zMin = 0, zMax = 0; switch (side) { case 2: - xMin = 0; xMax = 1; - zMin = 1 - depth; zMax = 1; + xMin = 0; + xMax = 1; + zMin = 1 - depth; + zMax = 1; break; case 3: - xMin = 0; xMax = 1; - zMin = 0; zMax = depth; + xMin = 0; + xMax = 1; + zMin = 0; + zMax = depth; break; case 4: - xMin = 1 - depth; xMax = 1; - zMin = 0; zMax = 1; + xMin = 1 - depth; + xMax = 1; + zMin = 0; + zMax = 1; break; case 5: - xMin = 0; xMax = depth; - zMin = 0; zMax = 1; + xMin = 0; + xMax = depth; + zMin = 0; + zMax = 1; break; } - boxRenderer.renderExterior(renderer.blockAccess, block, x, y, z, xMin, 0, zMin, xMax, 1, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderExterior( + renderer.blockAccess, + block, + x, + y, + z, + xMin, + 0, + zMin, + xMax, + 1, + zMax, + 0, + ModularBoxRenderer.sideCut[side]); } - private void renderInterior (BlockController block, int x, int y, int z, int side, RenderBlocks renderer) { + private void renderInterior(BlockController block, int x, int y, int z, int side, RenderBlocks renderer) { double unit = .0625; double depth = 1; double xMin = 0, xMax = 0, zMin = 0, zMax = 0; switch (side) { case 2: - xMin = unit; xMax = 1 - unit; - zMin = 1 - depth; zMax = 1 - depth + unit; + xMin = unit; + xMax = 1 - unit; + zMin = 1 - depth; + zMax = 1 - depth + unit; break; case 3: - xMin = unit; xMax = 1 - unit; - zMin = depth - unit; zMax = depth; + xMin = unit; + xMax = 1 - unit; + zMin = depth - unit; + zMax = depth; break; case 4: - xMin = 1 - depth; xMax = 1 - depth + unit; - zMin = unit; zMax = 1 - unit; + xMin = 1 - depth; + xMax = 1 - depth + unit; + zMin = unit; + zMax = 1 - unit; break; case 5: - xMin = depth - unit; xMax = depth; - zMin = unit; zMax = 1 - unit; + xMin = depth - unit; + xMax = depth; + zMin = unit; + zMax = 1 - unit; break; } - boxRenderer.renderInterior(renderer.blockAccess, block, x, y, z, xMin, unit, zMin, xMax, 1 - unit, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderInterior( + renderer.blockAccess, + block, + x, + y, + z, + xMin, + unit, + zMin, + xMax, + 1 - unit, + zMax, + 0, + ModularBoxRenderer.sideCut[side]); } @Override - public boolean shouldRender3DInInventory (int modelId) { + public boolean shouldRender3DInInventory(int modelId) { return true; } @Override - public int getRenderId () { + public int getRenderId() { return StorageDrawers.proxy.controllerRenderID; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersCustomRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersCustomRenderer.java index 732887e..e01bef1 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersCustomRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersCustomRenderer.java @@ -6,44 +6,42 @@ import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.client.renderer.common.CommonDrawerRenderer; import com.jaquadro.minecraft.storagedrawers.core.ClientProxy; -import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -public class DrawersCustomRenderer extends DrawersRenderer -{ +public class DrawersCustomRenderer extends DrawersRenderer { private CommonDrawerRenderer commonRender = new CommonDrawerRenderer(); @Override - protected void renderBaseBlock (IBlockAccess world, TileEntityDrawers tile, int x, int y, int z, BlockDrawers block, RenderBlocks renderer) { - BlockDrawersCustom custom = (BlockDrawersCustom)block; + protected void renderBaseBlock( + IBlockAccess world, + TileEntityDrawers tile, + int x, + int y, + int z, + BlockDrawers block, + RenderBlocks renderer) { + BlockDrawersCustom custom = (BlockDrawersCustom) block; ItemStack materialSide = tile.getMaterialSide(); - if (materialSide == null) - materialSide = new ItemStack(block); + if (materialSide == null) materialSide = new ItemStack(block); ItemStack materialFront = tile.getMaterialFront(); - if (materialFront == null) - materialFront = materialSide; + if (materialFront == null) materialFront = materialSide; ItemStack materialTrim = tile.getMaterialTrim(); - if (materialTrim == null) - materialTrim = materialSide; + if (materialTrim == null) materialTrim = materialSide; IIcon trimIcon = Block.getBlockFromItem(materialTrim.getItem()).getIcon(4, materialTrim.getItemDamage()); IIcon panelIcon = Block.getBlockFromItem(materialSide.getItem()).getIcon(4, materialSide.getItemDamage()); IIcon frontIcon = Block.getBlockFromItem(materialFront.getItem()).getIcon(4, materialFront.getItemDamage()); - if (trimIcon == null) - trimIcon = custom.getDefaultTrimIcon(); - if (panelIcon == null) - panelIcon = custom.getDefaultFaceIcon(); - if (frontIcon == null) - frontIcon = custom.getDefaultFaceIcon(); + if (trimIcon == null) trimIcon = custom.getDefaultTrimIcon(); + if (panelIcon == null) panelIcon = custom.getDefaultFaceIcon(); + if (frontIcon == null) frontIcon = custom.getDefaultFaceIcon(); if (ClientProxy.renderPass == 0) commonRender.renderBasePass(world, x, y, z, custom, tile.getDirection(), panelIcon, trimIcon, frontIcon); @@ -52,7 +50,7 @@ public class DrawersCustomRenderer extends DrawersRenderer } @Override - public int getRenderId () { + public int getRenderId() { return StorageDrawers.proxy.drawersCustomRenderID; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java index 4bab713..2d93ae4 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java @@ -3,7 +3,6 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom; import com.jaquadro.minecraft.storagedrawers.client.renderer.common.CommonDrawerRenderer; -import com.jaquadro.minecraft.storagedrawers.core.ClientProxy; import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; import com.jaquadro.minecraft.storagedrawers.util.RenderHelperState; import net.minecraft.block.Block; @@ -15,52 +14,45 @@ import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -public class DrawersItemRenderer implements IItemRenderer -{ - //private RenderHelper renderHelper = new RenderHelper(); +public class DrawersItemRenderer implements IItemRenderer { + // private RenderHelper renderHelper = new RenderHelper(); private CommonDrawerRenderer commonRender = new CommonDrawerRenderer(); private ModularBoxRenderer boxRenderer = new ModularBoxRenderer(); - //private PanelBoxRenderer panelRenderer = new PanelBoxRenderer(); - //private float[] colorScratch = new float[3]; + // private PanelBoxRenderer panelRenderer = new PanelBoxRenderer(); + // private float[] colorScratch = new float[3]; @Override - public boolean handleRenderType (ItemStack item, ItemRenderType type) { + public boolean handleRenderType(ItemStack item, ItemRenderType type) { return true; } @Override - public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { return true; } @Override - public void renderItem (ItemRenderType type, ItemStack item, Object... data) { + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { RenderBlocks renderer = getRenderer(data); - if (renderer == null) - return; + if (renderer == null) return; Block block = Block.getBlockFromItem(item.getItem()); - if (!(block instanceof BlockDrawers)) - return; + if (!(block instanceof BlockDrawers)) return; renderDrawer((BlockDrawers) block, item, renderer, type); } - private void renderDrawer (BlockDrawers block, ItemStack item, RenderBlocks renderer, ItemRenderType renderType) { + private void renderDrawer(BlockDrawers block, ItemStack item, RenderBlocks renderer, ItemRenderType renderType) { int side = 4; - if (renderType == ItemRenderType.INVENTORY) - GL11.glRotatef(90, 0, 1, 0); - if (renderType == ItemRenderType.ENTITY) - GL11.glRotatef(180, 0, 1, 0); + if (renderType == ItemRenderType.INVENTORY) GL11.glRotatef(90, 0, 1, 0); + if (renderType == ItemRenderType.ENTITY) GL11.glRotatef(180, 0, 1, 0); if (renderType == ItemRenderType.INVENTORY || renderType == ItemRenderType.ENTITY) GL11.glTranslatef(block.halfDepth ? -.75f : -.5f, -.5f, -.5f); - if (block instanceof BlockDrawersCustom) - renderCustomBlock(block, item, renderer); - else - renderBaseBlock(block, item, renderer); + if (block instanceof BlockDrawersCustom) renderCustomBlock(block, item, renderer); + else renderBaseBlock(block, item, renderer); if (item.hasTagCompound() && item.getTagCompound().hasKey("tile")) { double depth = block.halfDepth ? .5 : 1; @@ -72,17 +64,17 @@ public class DrawersItemRenderer implements IItemRenderer GL11.glTranslatef(block.halfDepth ? .75f : .5f, .5f, .5f); } - private void renderBaseBlock (BlockDrawers block, ItemStack item, RenderBlocks renderer) { + private void renderBaseBlock(BlockDrawers block, ItemStack item, RenderBlocks renderer) { int side = 4; - RenderHelper.instance.state.setUVRotation(RenderHelper.YPOS, RenderHelperState.ROTATION_BY_FACE_FACE[RenderHelper.ZPOS][side]); + RenderHelper.instance.state.setUVRotation( + RenderHelper.YPOS, RenderHelperState.ROTATION_BY_FACE_FACE[RenderHelper.ZPOS][side]); boxRenderer.setUnit(block.getTrimWidth()); boxRenderer.setColor(ModularBoxRenderer.COLOR_WHITE); - for (int i = 0; i < 6; i++) - boxRenderer.setIcon(block.getIcon(i, item.getItemDamage()), i); + for (int i = 0; i < 6; i++) boxRenderer.setIcon(block.getIcon(i, item.getItemDamage()), i); - renderExterior(block, 0, 0, 0,side, renderer); + renderExterior(block, 0, 0, 0, side, renderer); RenderHelper.instance.state.clearUVRotation(RenderHelper.YPOS); @@ -92,101 +84,133 @@ public class DrawersItemRenderer implements IItemRenderer renderInterior(block, 0, 0, 0, side, renderer); } - private void renderCustomBlock (BlockDrawers block, ItemStack item, RenderBlocks renderer) { - BlockDrawersCustom custom = (BlockDrawersCustom)block; + private void renderCustomBlock(BlockDrawers block, ItemStack item, RenderBlocks renderer) { + BlockDrawersCustom custom = (BlockDrawersCustom) block; ItemStack materialSide = null; ItemStack materialTrim = null; ItemStack materialFront = null; if (item.hasTagCompound()) { NBTTagCompound tag = item.getTagCompound(); - if (tag.hasKey("MatS")) - materialSide = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatS")); - if (tag.hasKey("MatT")) - materialTrim = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatT")); - if (tag.hasKey("MatF")) - materialFront = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatF")); + if (tag.hasKey("MatS")) materialSide = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatS")); + if (tag.hasKey("MatT")) materialTrim = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatT")); + if (tag.hasKey("MatF")) materialFront = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatF")); } - if (materialSide == null) - materialSide = new ItemStack(block); - if (materialTrim == null) - materialTrim = materialSide; - if (materialFront == null) - materialFront = materialSide; + if (materialSide == null) materialSide = new ItemStack(block); + if (materialTrim == null) materialTrim = materialSide; + if (materialFront == null) materialFront = materialSide; IIcon trimIcon = Block.getBlockFromItem(materialTrim.getItem()).getIcon(4, materialTrim.getItemDamage()); IIcon panelIcon = Block.getBlockFromItem(materialSide.getItem()).getIcon(4, materialSide.getItemDamage()); IIcon frontIcon = Block.getBlockFromItem(materialFront.getItem()).getIcon(4, materialFront.getItemDamage()); - if (trimIcon == null) - trimIcon = custom.getDefaultTrimIcon(); - if (panelIcon == null) - panelIcon = custom.getDefaultFaceIcon(); - if (frontIcon == null) - frontIcon = custom.getDefaultFaceIcon(); + if (trimIcon == null) trimIcon = custom.getDefaultTrimIcon(); + if (panelIcon == null) panelIcon = custom.getDefaultFaceIcon(); + if (frontIcon == null) frontIcon = custom.getDefaultFaceIcon(); commonRender.renderBasePass(null, 0, 0, 0, custom, RenderHelper.XNEG, panelIcon, trimIcon, frontIcon); commonRender.renderOverlayPass(null, 0, 0, 0, custom, RenderHelper.XNEG, trimIcon, frontIcon); } - private void renderExterior (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) { + private void renderExterior(BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) { double depth = block.halfDepth ? .5 : 1; double xMin = 0, xMax = 0, zMin = 0, zMax = 0; switch (side) { case 2: - xMin = 0; xMax = 1; - zMin = 1 - depth; zMax = 1; + xMin = 0; + xMax = 1; + zMin = 1 - depth; + zMax = 1; break; case 3: - xMin = 0; xMax = 1; - zMin = 0; zMax = depth; + xMin = 0; + xMax = 1; + zMin = 0; + zMax = depth; break; case 4: - xMin = 1 - depth; xMax = 1; - zMin = 0; zMax = 1; + xMin = 1 - depth; + xMax = 1; + zMin = 0; + zMax = 1; break; case 5: - xMin = 0; xMax = depth; - zMin = 0; zMax = 1; + xMin = 0; + xMax = depth; + zMin = 0; + zMax = 1; break; } - boxRenderer.renderExterior(renderer.blockAccess, block, x, y, z, xMin, 0, zMin, xMax, 1, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderExterior( + renderer.blockAccess, + block, + x, + y, + z, + xMin, + 0, + zMin, + xMax, + 1, + zMax, + 0, + ModularBoxRenderer.sideCut[side]); } - private void renderInterior (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) { + private void renderInterior(BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) { double unit = block.getTrimDepth(); double depth = block.halfDepth ? .5 : 1; double xMin = 0, xMax = 0, zMin = 0, zMax = 0; switch (side) { case 2: - xMin = unit; xMax = 1 - unit; - zMin = 1 - depth; zMax = 1 - depth + unit; + xMin = unit; + xMax = 1 - unit; + zMin = 1 - depth; + zMax = 1 - depth + unit; break; case 3: - xMin = unit; xMax = 1 - unit; - zMin = depth - unit; zMax = depth; + xMin = unit; + xMax = 1 - unit; + zMin = depth - unit; + zMax = depth; break; case 4: - xMin = 1 - depth; xMax = 1 - depth + unit; - zMin = unit; zMax = 1 - unit; + xMin = 1 - depth; + xMax = 1 - depth + unit; + zMin = unit; + zMax = 1 - unit; break; case 5: - xMin = depth - unit; xMax = depth; - zMin = unit; zMax = 1 - unit; + xMin = depth - unit; + xMax = depth; + zMin = unit; + zMax = 1 - unit; break; } - boxRenderer.renderInterior(renderer.blockAccess, block, x, y, z, xMin, unit, zMin, xMax, 1 - unit, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderInterior( + renderer.blockAccess, + block, + x, + y, + z, + xMin, + unit, + zMin, + xMax, + 1 - unit, + zMax, + 0, + ModularBoxRenderer.sideCut[side]); } - private RenderBlocks getRenderer (Object[] data) { + private RenderBlocks getRenderer(Object[] data) { for (Object obj : data) { - if (obj instanceof RenderBlocks) - return (RenderBlocks)obj; + if (obj instanceof RenderBlocks) return (RenderBlocks) obj; } return null; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java index c3f6f37..b510687 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java @@ -3,7 +3,6 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; -import com.jaquadro.minecraft.storagedrawers.block.BlockCompDrawers; import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; @@ -11,65 +10,75 @@ import com.jaquadro.minecraft.storagedrawers.util.RenderHelperState; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import org.lwjgl.opengl.GL11; -public class DrawersRenderer implements ISimpleBlockRenderingHandler -{ +public class DrawersRenderer implements ISimpleBlockRenderingHandler { private static final double unit = .0625f; private ModularBoxRenderer boxRenderer = new ModularBoxRenderer(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelId, RenderBlocks renderer) { + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { return; } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - if (!(block instanceof BlockDrawers)) - return false; + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + if (!(block instanceof BlockDrawers)) return false; return renderWorldBlock(world, x, y, z, (BlockDrawers) block, modelId, renderer); } - private boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, BlockDrawers block, int modelId, RenderBlocks renderer) { + private boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, BlockDrawers block, int modelId, RenderBlocks renderer) { TileEntityDrawers tile = block.getTileEntity(world, x, y, z); - if (tile == null) - return false; + if (tile == null) return false; renderBaseBlock(world, tile, x, y, z, block, renderer); - if (renderer.overrideBlockTexture != null && renderer.overrideBlockTexture.getIconName().startsWith("destroy_stage")) - return true; + if (renderer.overrideBlockTexture != null + && renderer.overrideBlockTexture.getIconName().startsWith("destroy_stage")) return true; int side = tile.getDirection(); if (StorageDrawers.config.cache.enableIndicatorUpgrades) renderIndicator(block, x, y, z, side, renderer, tile.getEffectiveStatusLevel()); if (StorageDrawers.config.cache.enableLockUpgrades) - renderLock(block, x, y, z, side, renderer, tile.isLocked(LockAttribute.LOCK_POPULATED), tile.getOwner() != null); - if (StorageDrawers.config.cache.enableVoidUpgrades) - renderVoid(block, x, y, z, side, renderer, tile.isVoid()); - if (StorageDrawers.config.cache.enableTape) - renderTape(block, x, y, z, side, renderer, tile.isSealed()); + renderLock( + block, + x, + y, + z, + side, + renderer, + tile.isLocked(LockAttribute.LOCK_POPULATED), + tile.getOwner() != null); + if (StorageDrawers.config.cache.enableVoidUpgrades) renderVoid(block, x, y, z, side, renderer, tile.isVoid()); + if (StorageDrawers.config.cache.enableTape) renderTape(block, x, y, z, side, renderer, tile.isSealed()); renderShroud(block, x, y, z, side, renderer, tile.isShrouded()); return true; } - protected void renderBaseBlock (IBlockAccess world, TileEntityDrawers tile, int x, int y, int z, BlockDrawers block, RenderBlocks renderer) { + protected void renderBaseBlock( + IBlockAccess world, + TileEntityDrawers tile, + int x, + int y, + int z, + BlockDrawers block, + RenderBlocks renderer) { int side = tile.getDirection(); int meta = world.getBlockMetadata(x, y, z); - RenderHelper.instance.state.setUVRotation(RenderHelper.YPOS, RenderHelperState.ROTATION_BY_FACE_FACE[RenderHelper.ZNEG][side]); + RenderHelper.instance.state.setUVRotation( + RenderHelper.YPOS, RenderHelperState.ROTATION_BY_FACE_FACE[RenderHelper.ZNEG][side]); boxRenderer.setUnit(block.getTrimWidth()); boxRenderer.setColor(ModularBoxRenderer.COLOR_WHITE); - for (int i = 0; i < 6; i++) - boxRenderer.setExteriorIcon(block.getIcon(world, x, y, z, i), i); + for (int i = 0; i < 6; i++) boxRenderer.setExteriorIcon(block.getIcon(world, x, y, z, i), i); boxRenderer.setCutIcon(block.getIconTrim(meta)); boxRenderer.setInteriorIcon(block.getIconTrim(meta)); @@ -95,35 +104,35 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler renderInterior(block, x, y, z, side, renderer); } - private void renderLock (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer, boolean locked, boolean owned) { - if (!locked && !owned) - return; + private void renderLock( + BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer, boolean locked, boolean owned) { + if (!locked && !owned) return; double depth = block.halfDepth ? .5 : 1; IIcon iconLock = block.getLockIcon(locked, owned); RenderHelper.instance.setRenderBounds(0.46875, 0.9375, 0, 0.53125, 1, depth + .005); RenderHelper.instance.state.setRotateTransform(RenderHelper.ZPOS, side); - RenderHelper.instance.renderPartialFace(RenderHelper.ZPOS, renderer.blockAccess, block, x, y, z, iconLock, 0, 0, 1, 1); + RenderHelper.instance.renderPartialFace( + RenderHelper.ZPOS, renderer.blockAccess, block, x, y, z, iconLock, 0, 0, 1, 1); RenderHelper.instance.state.clearRotateTransform(); } - private void renderVoid (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer, boolean voided) { - if (!voided) - return; + private void renderVoid(BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer, boolean voided) { + if (!voided) return; double depth = block.halfDepth ? .5 : 1; IIcon iconVoid = block.getVoidIcon(); RenderHelper.instance.setRenderBounds(1 - .0625, 0.9375, 0, 1, 1, depth + .005); RenderHelper.instance.state.setRotateTransform(RenderHelper.ZPOS, side); - RenderHelper.instance.renderPartialFace(RenderHelper.ZPOS, renderer.blockAccess, block, x, y, z, iconVoid, 0, 0, 1, 1); + RenderHelper.instance.renderPartialFace( + RenderHelper.ZPOS, renderer.blockAccess, block, x, y, z, iconVoid, 0, 0, 1, 1); RenderHelper.instance.state.clearRotateTransform(); } - private void renderTape (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer, boolean taped) { - if (!taped) - return; + private void renderTape(BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer, boolean taped) { + if (!taped) return; double depth = block.halfDepth ? .5 : 1; IIcon iconTape = block.getTapeIcon(); @@ -135,31 +144,47 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler } private static final int[] cut = new int[] { - ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_YNEG | ModularBoxRenderer.CUT_XPOS | ModularBoxRenderer.CUT_XNEG | ModularBoxRenderer.CUT_ZPOS, - ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_YNEG | ModularBoxRenderer.CUT_XPOS | ModularBoxRenderer.CUT_XNEG | ModularBoxRenderer.CUT_ZNEG, - ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_YNEG | ModularBoxRenderer.CUT_XPOS | ModularBoxRenderer.CUT_ZNEG | ModularBoxRenderer.CUT_ZPOS, - ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_YNEG | ModularBoxRenderer.CUT_XNEG | ModularBoxRenderer.CUT_ZNEG | ModularBoxRenderer.CUT_ZPOS, + ModularBoxRenderer.CUT_YPOS + | ModularBoxRenderer.CUT_YNEG + | ModularBoxRenderer.CUT_XPOS + | ModularBoxRenderer.CUT_XNEG + | ModularBoxRenderer.CUT_ZPOS, + ModularBoxRenderer.CUT_YPOS + | ModularBoxRenderer.CUT_YNEG + | ModularBoxRenderer.CUT_XPOS + | ModularBoxRenderer.CUT_XNEG + | ModularBoxRenderer.CUT_ZNEG, + ModularBoxRenderer.CUT_YPOS + | ModularBoxRenderer.CUT_YNEG + | ModularBoxRenderer.CUT_XPOS + | ModularBoxRenderer.CUT_ZNEG + | ModularBoxRenderer.CUT_ZPOS, + ModularBoxRenderer.CUT_YPOS + | ModularBoxRenderer.CUT_YNEG + | ModularBoxRenderer.CUT_XNEG + | ModularBoxRenderer.CUT_ZNEG + | ModularBoxRenderer.CUT_ZPOS, }; private static final float[][] drawerXYWH1 = new float[][] { - { 0, 0, 16, 16 }, + {0, 0, 16, 16}, }; private static final float[][] drawerXYWH2 = new float[][] { - { 0, 8, 16, 8 }, { 0, 0, 16, 8 }, + {0, 8, 16, 8}, {0, 0, 16, 8}, }; private static final float[][] drawerXYWH4 = new float[][] { - { 0, 8, 8, 8 }, { 0, 0, 8, 8 }, { 8, 8, 8, 8 }, { 8, 0, 8, 8 }, + {0, 8, 8, 8}, {0, 0, 8, 8}, {8, 8, 8, 8}, {8, 0, 8, 8}, }; private static final float[][] drawerXYWH3 = new float[][] { - { 0, 8, 16, 8 }, { 0, 0, 8, 8 }, { 8, 0, 8, 8 }, + {0, 8, 16, 8}, {0, 0, 8, 8}, {8, 0, 8, 8}, }; - private void renderShroud (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer, boolean shrouded) { - if (!shrouded || side < 2 || side > 5) - return; + private void renderShroud( + BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer, boolean shrouded) { + if (!shrouded || side < 2 || side > 5) return; TileEntityDrawers tile = block.getTileEntity(renderer.blockAccess, x, y, z); @@ -176,16 +201,13 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler w = 4; h = 4; xywhSet = drawerXYWH1; - } - else if (block.drawerCount == 2) { + } else if (block.drawerCount == 2) { count = 2; xywhSet = drawerXYWH2; - } - else if (block.drawerCount == 3) { + } else if (block.drawerCount == 3) { count = 3; xywhSet = drawerXYWH3; - } - else if (block.drawerCount == 4) { + } else if (block.drawerCount == 4) { count = 4; xywhSet = drawerXYWH4; } @@ -194,23 +216,22 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler for (int i = 0; i < count; i++) { IDrawer drawer = tile.getDrawer(i); - if (drawer == null || drawer.isEmpty()) - continue; + if (drawer == null || drawer.isEmpty()) continue; float[] xywh = xywhSet[i]; float subX = xywh[0] + (xywh[2] - w) / 2; float subY = xywh[1] + (xywh[3] - h) / 2; - RenderHelper.instance.setRenderBounds(subX * unit, subY * unit, 0, (subX + w) * unit, (subY + h) * unit, (depth - depthAdj + .05) * unit); + RenderHelper.instance.setRenderBounds( + subX * unit, subY * unit, 0, (subX + w) * unit, (subY + h) * unit, (depth - depthAdj + .05) * unit); RenderHelper.instance.state.setRotateTransform(RenderHelper.ZPOS, side); RenderHelper.instance.renderFace(RenderHelper.ZPOS, renderer.blockAccess, block, x, y, z, icon); RenderHelper.instance.state.clearRotateTransform(); } } - private void renderIndicator (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer, int level) { - if (level <= 0 || side < 2 || side > 5) - return; + private void renderIndicator(BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer, int level) { + if (level <= 0 || side < 2 || side > 5) return; TileEntityDrawers tile = block.getTileEntity(renderer.blockAccess, x, y, z); @@ -222,12 +243,10 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler if (block.drawerCount == 1) { count = 1; xywhSet = drawerXYWH1; - } - else if (block.drawerCount == 2) { + } else if (block.drawerCount == 2) { count = 2; xywhSet = drawerXYWH2; - } - else if (block.drawerCount == 4) { + } else if (block.drawerCount == 4) { count = 4; xywhSet = drawerXYWH4; } @@ -239,28 +258,40 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler for (int i = 0; i < count; i++) { IDrawer drawer = tile.getDrawer(i); - if (drawer == null) - continue; + if (drawer == null) continue; float[] xywh = xywhSet[i]; - RenderHelper.instance.setRenderBounds(xywh[0] * unit, xywh[1] * unit, 0, (xywh[0] + xywh[2]) * unit, (xywh[1] + xywh[3]) * unit, (depth - depthAdj + .05) * unit); + RenderHelper.instance.setRenderBounds( + xywh[0] * unit, + xywh[1] * unit, + 0, + (xywh[0] + xywh[2]) * unit, + (xywh[1] + xywh[3]) * unit, + (depth - depthAdj + .05) * unit); RenderHelper.instance.state.setRotateTransform(RenderHelper.ZPOS, side); RenderHelper.instance.renderFace(RenderHelper.ZPOS, renderer.blockAccess, block, x, y, z, iconOff); RenderHelper.instance.state.clearRotateTransform(); if (level == 1 && drawer.getMaxCapacity() > 0 && drawer.getRemainingCapacity() == 0) { RenderHelper.instance.state.setColorMult(1, 1, .9f, 1); - RenderHelper.instance.setRenderBounds(xywh[0] * unit, xywh[1] * unit, 0, (xywh[0] + xywh[2]) * unit, (xywh[1] + xywh[3]) * unit, (depth - depthAdj + .06) * unit); + RenderHelper.instance.setRenderBounds( + xywh[0] * unit, + xywh[1] * unit, + 0, + (xywh[0] + xywh[2]) * unit, + (xywh[1] + xywh[3]) * unit, + (depth - depthAdj + .06) * unit); RenderHelper.instance.state.setRotateTransform(RenderHelper.ZPOS, side); RenderHelper.instance.renderFace(RenderHelper.ZPOS, renderer.blockAccess, block, x, y, z, iconOn); RenderHelper.instance.state.clearRotateTransform(); RenderHelper.instance.state.resetColorMult(); - } - else if (level >= 2) { + } else if (level >= 2) { double indXStart = xywh[0] + block.getIndStart() / unit; double indXEnd = xywh[0] + block.getIndEnd() / unit; - double indXCur = (block.getIndSteps() == 0) ? indXEnd : getIndEnd(block, tile, i, indXStart, (block.getIndEnd() - block.getIndStart()) / unit); + double indXCur = (block.getIndSteps() == 0) + ? indXEnd + : getIndEnd(block, tile, i, indXStart, (block.getIndEnd() - block.getIndStart()) / unit); double indYStart = xywh[1]; double indYEnd = xywh[1] + xywh[3]; @@ -268,7 +299,13 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler if (indXCur > indXStart) { RenderHelper.instance.state.setColorMult(1, 1, .9f, 1); - RenderHelper.instance.setRenderBounds(indXStart * unit, indYStart * unit, 0, indXCur * unit, indYCur * unit, (depth - depthAdj + .06) * unit); + RenderHelper.instance.setRenderBounds( + indXStart * unit, + indYStart * unit, + 0, + indXCur * unit, + indYCur * unit, + (depth - depthAdj + .06) * unit); RenderHelper.instance.state.setRotateTransform(RenderHelper.ZPOS, side); RenderHelper.instance.renderFace(RenderHelper.ZPOS, renderer.blockAccess, block, x, y, z, iconOn); RenderHelper.instance.state.clearRotateTransform(); @@ -278,82 +315,122 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler } } - private double getIndEnd (BlockDrawers block, TileEntityDrawers tile, int slot, double x, double w) { + private double getIndEnd(BlockDrawers block, TileEntityDrawers tile, int slot, double x, double w) { IDrawer drawer = tile.getDrawer(slot); - if (drawer == null) - return x; + if (drawer == null) return x; int cap = drawer.getMaxCapacity(); int count = drawer.getStoredItemCount(); - if (cap == 0 || count == 0) - return x; + if (cap == 0 || count == 0) return x; int step = block.getIndSteps() > 0 ? block.getIndSteps() : 1000; - float fillAmt = (float)((double)step * count / cap) / step; + float fillAmt = (float) ((double) step * count / cap) / step; return x + (w * fillAmt); } - private void renderExterior (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) { + private void renderExterior(BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) { double depth = block.halfDepth ? .5 : 1; double xMin = 0, xMax = 0, zMin = 0, zMax = 0; switch (side) { case 2: - xMin = 0; xMax = 1; - zMin = 1 - depth; zMax = 1; + xMin = 0; + xMax = 1; + zMin = 1 - depth; + zMax = 1; break; case 3: - xMin = 0; xMax = 1; - zMin = 0; zMax = depth; + xMin = 0; + xMax = 1; + zMin = 0; + zMax = depth; break; case 4: - xMin = 1 - depth; xMax = 1; - zMin = 0; zMax = 1; + xMin = 1 - depth; + xMax = 1; + zMin = 0; + zMax = 1; break; case 5: - xMin = 0; xMax = depth; - zMin = 0; zMax = 1; + xMin = 0; + xMax = depth; + zMin = 0; + zMax = 1; break; } - boxRenderer.renderExterior(renderer.blockAccess, block, x, y, z, xMin, 0, zMin, xMax, 1, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderExterior( + renderer.blockAccess, + block, + x, + y, + z, + xMin, + 0, + zMin, + xMax, + 1, + zMax, + 0, + ModularBoxRenderer.sideCut[side]); } - private void renderInterior (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) { + private void renderInterior(BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) { double unit = block.getTrimDepth(); double depth = block.halfDepth ? .5 : 1; double xMin = 0, xMax = 0, zMin = 0, zMax = 0; switch (side) { case 2: - xMin = unit; xMax = 1 - unit; - zMin = 1 - depth; zMax = 1 - depth + unit; + xMin = unit; + xMax = 1 - unit; + zMin = 1 - depth; + zMax = 1 - depth + unit; break; case 3: - xMin = unit; xMax = 1 - unit; - zMin = depth - unit; zMax = depth; + xMin = unit; + xMax = 1 - unit; + zMin = depth - unit; + zMax = depth; break; case 4: - xMin = 1 - depth; xMax = 1 - depth + unit; - zMin = unit; zMax = 1 - unit; + xMin = 1 - depth; + xMax = 1 - depth + unit; + zMin = unit; + zMax = 1 - unit; break; case 5: - xMin = depth - unit; xMax = depth; - zMin = unit; zMax = 1 - unit; + xMin = depth - unit; + xMax = depth; + zMin = unit; + zMax = 1 - unit; break; } - boxRenderer.renderInterior(renderer.blockAccess, block, x, y, z, xMin, unit, zMin, xMax, 1 - unit, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderInterior( + renderer.blockAccess, + block, + x, + y, + z, + xMin, + unit, + zMin, + xMax, + 1 - unit, + zMax, + 0, + ModularBoxRenderer.sideCut[side]); } @Override - public boolean shouldRender3DInInventory (int modelId) { + public boolean shouldRender3DInInventory(int modelId) { return true; } @Override - public int getRenderId () { + public int getRenderId() { return StorageDrawers.proxy.drawersRenderID; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/FramingTableRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/FramingTableRenderer.java index 0f16ebf..a0e46cc 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/FramingTableRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/FramingTableRenderer.java @@ -11,24 +11,20 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -public class FramingTableRenderer implements ISimpleBlockRenderingHandler -{ +public class FramingTableRenderer implements ISimpleBlockRenderingHandler { private CommonFramingRenderer framingRenderer = new CommonFramingRenderer(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelId, RenderBlocks renderer) { - if (!(block instanceof BlockFramingTable)) - return; + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + if (!(block instanceof BlockFramingTable)) return; - BlockFramingTable framingTable = (BlockFramingTable)block; + BlockFramingTable framingTable = (BlockFramingTable) block; boolean blendEnabled = GL11.glIsEnabled(GL11.GL_BLEND); - if (blendEnabled) - GL11.glDisable(GL11.GL_BLEND); + if (blendEnabled) GL11.glDisable(GL11.GL_BLEND); boolean depthMask = GL11.glGetBoolean(GL11.GL_DEPTH_WRITEMASK); - if (!depthMask) - GL11.glDepthMask(true); + if (!depthMask) GL11.glDepthMask(true); GL11.glPushMatrix(); GL11.glRotatef(90, 0, 1, 0); @@ -42,41 +38,33 @@ public class FramingTableRenderer implements ISimpleBlockRenderingHandler RenderHelper.instance.state.clearUVRotation(RenderHelper.YPOS); - if (!blendEnabled) - GL11.glDisable(GL11.GL_BLEND); - if (!depthMask) - GL11.glDepthMask(false); + if (!blendEnabled) GL11.glDisable(GL11.GL_BLEND); + if (!depthMask) GL11.glDepthMask(false); GL11.glPopMatrix(); } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - if (!(block instanceof BlockFramingTable)) - return false; + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + if (!(block instanceof BlockFramingTable)) return false; - BlockFramingTable framingTable = (BlockFramingTable)block; + BlockFramingTable framingTable = (BlockFramingTable) block; int meta = world.getBlockMetadata(x, y, z); int side = meta & 0x7; boolean right = (meta & 0x08) == 0; - if (side == 2 || side == 3) - right = !right; + if (side == 2 || side == 3) right = !right; RenderHelper.instance.state.setRotateTransform(side, RenderHelper.ZNEG); RenderHelper.instance.state.setUVRotation(RenderHelper.YPOS, RenderHelper.instance.state.rotateTransform); if (ClientProxy.renderPass == 0) { - if (right) - framingRenderer.renderRight(world, x, y, z, framingTable); - else - framingRenderer.renderLeft(world, x, y, z, framingTable); - } - else if (ClientProxy.renderPass == 1) { - if (right) - framingRenderer.renderOverlayRight(world, x, y, z, framingTable); - else - framingRenderer.renderOverlayLeft(world, x, y, z, framingTable); + if (right) framingRenderer.renderRight(world, x, y, z, framingTable); + else framingRenderer.renderLeft(world, x, y, z, framingTable); + } else if (ClientProxy.renderPass == 1) { + if (right) framingRenderer.renderOverlayRight(world, x, y, z, framingTable); + else framingRenderer.renderOverlayLeft(world, x, y, z, framingTable); } RenderHelper.instance.state.clearRotateTransform(); @@ -86,12 +74,12 @@ public class FramingTableRenderer implements ISimpleBlockRenderingHandler } @Override - public boolean shouldRender3DInInventory (int modelId) { + public boolean shouldRender3DInInventory(int modelId) { return true; } @Override - public int getRenderId () { + public int getRenderId() { return StorageDrawers.proxy.framingTableRenderID; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/GLUtil.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/GLUtil.java index 194ea74..ebf209c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/GLUtil.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/GLUtil.java @@ -1,48 +1,42 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; -import org.lwjgl.opengl.GL11; - import java.util.ArrayList; import java.util.List; +import org.lwjgl.opengl.GL11; -public final class GLUtil -{ - private GLUtil () { } +public final class GLUtil { + private GLUtil() {} - public static List makeGLState () { + public static List makeGLState() { return new ArrayList(8); } - public static List makeGLState (int[] saveList) { + public static List makeGLState(int[] saveList) { List state = new ArrayList(saveList.length); - for (int i = 0, n = saveList.length; i < n; i++) - state.add(new int[] { 0, 0 }); + for (int i = 0, n = saveList.length; i < n; i++) state.add(new int[] {0, 0}); return state; } - public static List saveGLState (int[] saveList) { + public static List saveGLState(int[] saveList) { List state = makeGLState(saveList); saveGLStateCore(state, saveList); return state; } - public static void saveGLState (List state, int[] saveList) { - if (state == null || saveList == null) - return; + public static void saveGLState(List state, int[] saveList) { + if (state == null || saveList == null) return; - for (int i = state.size(), n = saveList.length; i < n; i++) - state.add(new int[2]); + for (int i = state.size(), n = saveList.length; i < n; i++) state.add(new int[2]); - for (int i = 0, n = state.size(); i < n; i++) - state.get(i)[0] = 0; + for (int i = 0, n = state.size(); i < n; i++) state.get(i)[0] = 0; saveGLStateCore(state, saveList); } - private static void saveGLStateCore (List state, int[] saveList) { + private static void saveGLStateCore(List state, int[] saveList) { for (int i = 0, n = saveList.length; i < n; i++) { int[] entry = state.get(i); entry[0] = saveList[i]; @@ -50,19 +44,15 @@ public final class GLUtil } } - public static void restoreGLState (List state) { - if (state == null) - return; + public static void restoreGLState(List state) { + if (state == null) return; for (int i = 0, n = state.size(); i < n; i++) { int[] entry = state.get(i); - if (entry[0] == 0) - break; + if (entry[0] == 0) break; - if (entry[1] == 0) - GL11.glDisable(entry[0]); - else - GL11.glEnable(entry[0]); + if (entry[1] == 0) GL11.glDisable(entry[0]); + else GL11.glEnable(entry[0]); } } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/ModularBoxRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/ModularBoxRenderer.java index f55c4cf..b721e5a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/ModularBoxRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/ModularBoxRenderer.java @@ -5,8 +5,7 @@ import net.minecraft.block.Block; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -public class ModularBoxRenderer -{ +public class ModularBoxRenderer { public static final int CONNECT_YNEG = 1 << 0; public static final int CONNECT_YPOS = 1 << 1; public static final int CONNECT_ZNEG = 1 << 2; @@ -64,12 +63,14 @@ public class ModularBoxRenderer private static final int TEST_YPOS_ZPOS_XNEG = CUT_YPOS | CUT_ZPOS | CUT_XNEG; private static final int TEST_YPOS_ZPOS_XPOS = CUT_YPOS | CUT_ZPOS | CUT_XPOS; - private static final int PLANE_YNEG = CONNECT_YNEG | CONNECT_YNEG_ZNEG | CONNECT_YNEG_ZPOS | CONNECT_YNEG_XNEG | CONNECT_YNEG_XPOS; - private static final int PLANE_YPOS = CONNECT_YPOS | CONNECT_YPOS_ZNEG | CONNECT_YPOS_ZPOS | CONNECT_YPOS_XNEG | CONNECT_YPOS_XPOS; + private static final int PLANE_YNEG = + CONNECT_YNEG | CONNECT_YNEG_ZNEG | CONNECT_YNEG_ZPOS | CONNECT_YNEG_XNEG | CONNECT_YNEG_XPOS; + private static final int PLANE_YPOS = + CONNECT_YPOS | CONNECT_YPOS_ZNEG | CONNECT_YPOS_ZPOS | CONNECT_YPOS_XNEG | CONNECT_YPOS_XPOS; - public static final float[] COLOR_WHITE = new float[] { 1, 1, 1 }; + public static final float[] COLOR_WHITE = new float[] {1, 1, 1}; - public static final int[] sideCut = new int[] { CUT_YNEG, CUT_YPOS, CUT_ZNEG, CUT_ZPOS, CUT_XNEG, CUT_XPOS }; + public static final int[] sideCut = new int[] {CUT_YNEG, CUT_YPOS, CUT_ZNEG, CUT_ZPOS, CUT_XNEG, CUT_XPOS}; private double unit = 0.0625; @@ -83,122 +84,114 @@ public class ModularBoxRenderer public boolean flipOpposite; - private void copyFrom (float[] target, float[] source) { + private void copyFrom(float[] target, float[] source) { target[0] = source[0]; target[1] = source[1]; target[2] = source[2]; } - private void copyFrom (float[] target, float r, float g, float b) { + private void copyFrom(float[] target, float r, float g, float b) { target[0] = r; target[1] = g; target[2] = b; } - public void setColor (float[] color) { + public void setColor(float[] color) { setExteriorColor(color); setInteriorColor(color); setCutColor(color); } - public void setScaledColor (float[] color, float scale) { + public void setScaledColor(float[] color, float scale) { setScaledExteriorColor(color, scale); setScaledInteriorColor(color, scale); setScaledCutColor(color, scale); } - public void setExteriorColor (float[] color) { - for (int i = 0; i < 6; i++) - copyFrom(exteriorColor[i], color); + public void setExteriorColor(float[] color) { + for (int i = 0; i < 6; i++) copyFrom(exteriorColor[i], color); } - public void setExteriorColor (float[] color, int side) { + public void setExteriorColor(float[] color, int side) { copyFrom(exteriorColor[side], color); } - public void setScaledExteriorColor (float[] color, float scale) { - for (int i = 0; i < 6; i++) - copyFrom(exteriorColor[i], color[0] * scale, color[1] * scale, color[2] * scale); + public void setScaledExteriorColor(float[] color, float scale) { + for (int i = 0; i < 6; i++) copyFrom(exteriorColor[i], color[0] * scale, color[1] * scale, color[2] * scale); } - public void setScaledExteriorColor (float[] color, float scale, int side) { + public void setScaledExteriorColor(float[] color, float scale, int side) { copyFrom(exteriorColor[side], color[0] * scale, color[1] * scale, color[2] * scale); } - public void setInteriorColor (float[] color) { - for (int i = 0; i < 6; i++) - copyFrom(interiorColor[i], color); + public void setInteriorColor(float[] color) { + for (int i = 0; i < 6; i++) copyFrom(interiorColor[i], color); } - public void setInteriorColor (float[] color, int side) { + public void setInteriorColor(float[] color, int side) { side = (side % 2 == 0) ? side + 1 : side - 1; copyFrom(interiorColor[side], color); } - public void setScaledInteriorColor (float[] color, float scale) { - for (int i = 0; i < 6; i++) - copyFrom(interiorColor[i], color[0] * scale, color[1] * scale, color[2] * scale); + public void setScaledInteriorColor(float[] color, float scale) { + for (int i = 0; i < 6; i++) copyFrom(interiorColor[i], color[0] * scale, color[1] * scale, color[2] * scale); } - public void setCutColor (float[] color) { - for (int i = 0; i < 6; i++) - copyFrom(cutColor[i], color); + public void setCutColor(float[] color) { + for (int i = 0; i < 6; i++) copyFrom(cutColor[i], color); } - public void setCutColor (float[] color, int side) { + public void setCutColor(float[] color, int side) { copyFrom(cutColor[side], color); } - public void setScaledCutColor (float[] color, float scale) { - for (int i = 0; i < 6; i++) - copyFrom(cutColor[i], color[0] * scale, color[1] * scale, color[2] * scale); + public void setScaledCutColor(float[] color, float scale) { + for (int i = 0; i < 6; i++) copyFrom(cutColor[i], color[0] * scale, color[1] * scale, color[2] * scale); } - public void setIcon (IIcon icon) { + public void setIcon(IIcon icon) { setExteriorIcon(icon); setInteriorIcon(icon); setCutIcon(icon); } - public void setIcon (IIcon icon, int side) { + public void setIcon(IIcon icon, int side) { setExteriorIcon(icon, side); setInteriorIcon(icon, side); setCutIcon(icon, side); } - public void setExteriorIcon (IIcon icon) { - for (int i = 0; i < 6; i++) - exteriorIcon[i] = icon; + public void setExteriorIcon(IIcon icon) { + for (int i = 0; i < 6; i++) exteriorIcon[i] = icon; } - public void setExteriorIcon (IIcon icon, int side) { + public void setExteriorIcon(IIcon icon, int side) { exteriorIcon[side] = icon; } - public void setInteriorIcon (IIcon icon) { - for (int i = 0; i < 6; i++) - interiorIcon[i] = icon; + public void setInteriorIcon(IIcon icon) { + for (int i = 0; i < 6; i++) interiorIcon[i] = icon; } - public void setInteriorIcon (IIcon icon, int side) { + public void setInteriorIcon(IIcon icon, int side) { side = (side % 2 == 0) ? side + 1 : side - 1; interiorIcon[side] = icon; } - public void setCutIcon (IIcon icon) { - for (int i = 0; i < 6; i++) - cutIcon[i] = icon; + public void setCutIcon(IIcon icon) { + for (int i = 0; i < 6; i++) cutIcon[i] = icon; } - public void setCutIcon (IIcon icon, int side) { + public void setCutIcon(IIcon icon, int side) { cutIcon[side] = icon; } - public void setUnit (double unit) { + public void setUnit(double unit) { this.unit = unit; } - public void renderOctant (IBlockAccess blockAccess, Block block, double x, double y, double z, int connectedFlags, int cutFlags) { + public void renderOctant( + IBlockAccess blockAccess, Block block, double x, double y, double z, int connectedFlags, int cutFlags) { double xBase = Math.floor(x); double yBase = Math.floor(y); double zBase = Math.floor(z); @@ -209,53 +202,79 @@ public class ModularBoxRenderer double yPos = yNeg + .5; double zPos = zNeg + .5; - renderExterior(blockAccess, block, xBase, yBase, zBase, xNeg, yNeg, zNeg, xPos, yPos, zPos, connectedFlags, cutFlags); - renderInterior(blockAccess, block, xBase, yBase, zBase, xNeg, yNeg, zNeg, xPos, yPos, zPos, connectedFlags, cutFlags); + renderExterior( + blockAccess, block, xBase, yBase, zBase, xNeg, yNeg, zNeg, xPos, yPos, zPos, connectedFlags, cutFlags); + renderInterior( + blockAccess, block, xBase, yBase, zBase, xNeg, yNeg, zNeg, xPos, yPos, zPos, connectedFlags, cutFlags); } - public void renderBox (IBlockAccess blockAccess, Block block, double x, double y, double z, double xNeg, double yNeg, double zNeg, double xPos, double yPos, double zPos, int connectedFlags, int cutFlags) { + public void renderBox( + IBlockAccess blockAccess, + Block block, + double x, + double y, + double z, + double xNeg, + double yNeg, + double zNeg, + double xPos, + double yPos, + double zPos, + int connectedFlags, + int cutFlags) { renderExterior(blockAccess, block, x, y, z, xNeg, yNeg, zNeg, xPos, yPos, zPos, connectedFlags, cutFlags); renderInterior(blockAccess, block, x, y, z, xNeg, yNeg, zNeg, xPos, yPos, zPos, connectedFlags, cutFlags); } - public void renderSolidBox (IBlockAccess blockAccess, Block block, double x, double y, double z, double xNeg, double yNeg, double zNeg, double xPos, double yPos, double zPos) { + public void renderSolidBox( + IBlockAccess blockAccess, + Block block, + double x, + double y, + double z, + double xNeg, + double yNeg, + double zNeg, + double xPos, + double yPos, + double zPos) { renderExterior(blockAccess, block, x, y, z, xNeg, yNeg, zNeg, xPos, yPos, zPos, 0, 0); } - public void renderExterior (IBlockAccess blockAccess, Block block, double x, double y, double z, double xNeg, double yNeg, double zNeg, double xPos, double yPos, double zPos, int connectedFlags, int cutFlags) { + public void renderExterior( + IBlockAccess blockAccess, + Block block, + double x, + double y, + double z, + double xNeg, + double yNeg, + double zNeg, + double xPos, + double yPos, + double zPos, + int connectedFlags, + int cutFlags) { RenderHelper renderHelper = RenderHelper.instance; - if ((cutFlags & CUT_YNEG) != 0) - connectedFlags |= CONNECT_YNEG; - if ((cutFlags & CUT_YPOS) != 0) - connectedFlags |= CONNECT_YPOS; - if ((cutFlags & CUT_ZNEG) != 0) - connectedFlags |= CONNECT_ZNEG; - if ((cutFlags & CUT_ZPOS) != 0) - connectedFlags |= CONNECT_ZPOS; - if ((cutFlags & CUT_XNEG) != 0) - connectedFlags |= CONNECT_XNEG; - if ((cutFlags & CUT_XPOS) != 0) - connectedFlags |= CONNECT_XPOS; + if ((cutFlags & CUT_YNEG) != 0) connectedFlags |= CONNECT_YNEG; + if ((cutFlags & CUT_YPOS) != 0) connectedFlags |= CONNECT_YPOS; + if ((cutFlags & CUT_ZNEG) != 0) connectedFlags |= CONNECT_ZNEG; + if ((cutFlags & CUT_ZPOS) != 0) connectedFlags |= CONNECT_ZPOS; + if ((cutFlags & CUT_XNEG) != 0) connectedFlags |= CONNECT_XNEG; + if ((cutFlags & CUT_XPOS) != 0) connectedFlags |= CONNECT_XPOS; renderHelper.setRenderBounds(xNeg, yNeg, zNeg, xPos, yPos, zPos); // Render solid faces - if ((connectedFlags & CONNECT_YNEG) == 0) - renderExteriorFace(FACE_YNEG, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_YPOS) == 0) - renderExteriorFace(FACE_YPOS, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_ZNEG) == 0) - renderExteriorFace(FACE_ZNEG, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_ZPOS) == 0) - renderExteriorFace(FACE_ZPOS, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_XNEG) == 0) - renderExteriorFace(FACE_XNEG, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_XPOS) == 0) - renderExteriorFace(FACE_XPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_YNEG) == 0) renderExteriorFace(FACE_YNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_YPOS) == 0) renderExteriorFace(FACE_YPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_ZNEG) == 0) renderExteriorFace(FACE_ZNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_ZPOS) == 0) renderExteriorFace(FACE_ZPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_XNEG) == 0) renderExteriorFace(FACE_XNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_XPOS) == 0) renderExteriorFace(FACE_XPOS, blockAccess, block, x, y, z); - if (unit == 0) - return; + if (unit == 0) return; // Render edge faces if ((cutFlags & TEST_YNEG_ZNEG) != 0) { @@ -346,93 +365,124 @@ public class ModularBoxRenderer // Render corner faces if ((cutFlags & TEST_YNEG_ZNEG_XNEG) != 0) { renderHelper.setRenderBounds(xNeg, yNeg, zNeg, xNeg + unit, yNeg + unit, zNeg + unit); - if ((cutFlags & CUT_YNEG) != 0 && (connectedFlags | CONNECT_ZNEG | CONNECT_XNEG | CONNECT_ZNEG_XNEG) != connectedFlags) + if ((cutFlags & CUT_YNEG) != 0 + && (connectedFlags | CONNECT_ZNEG | CONNECT_XNEG | CONNECT_ZNEG_XNEG) != connectedFlags) renderCutFace(FACE_YNEG, blockAccess, block, x, y, z); - if ((cutFlags & CUT_ZNEG) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_XNEG | CONNECT_YNEG_XNEG) != connectedFlags) + if ((cutFlags & CUT_ZNEG) != 0 + && (connectedFlags | CONNECT_YNEG | CONNECT_XNEG | CONNECT_YNEG_XNEG) != connectedFlags) renderCutFace(FACE_ZNEG, blockAccess, block, x, y, z); - if ((cutFlags & CUT_XNEG) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_ZNEG | CONNECT_YNEG_ZNEG) != connectedFlags) + if ((cutFlags & CUT_XNEG) != 0 + && (connectedFlags | CONNECT_YNEG | CONNECT_ZNEG | CONNECT_YNEG_ZNEG) != connectedFlags) renderCutFace(FACE_XNEG, blockAccess, block, x, y, z); } if ((cutFlags & TEST_YNEG_ZNEG_XPOS) != 0) { renderHelper.setRenderBounds(xPos - unit, yNeg, zNeg, xPos, yNeg + unit, zNeg + unit); - if ((cutFlags & CUT_YNEG) != 0 && (connectedFlags | CONNECT_ZNEG | CONNECT_XPOS | CONNECT_ZNEG_XPOS) != connectedFlags) + if ((cutFlags & CUT_YNEG) != 0 + && (connectedFlags | CONNECT_ZNEG | CONNECT_XPOS | CONNECT_ZNEG_XPOS) != connectedFlags) renderCutFace(FACE_YNEG, blockAccess, block, x, y, z); - if ((cutFlags & CUT_ZNEG) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_XPOS | CONNECT_YNEG_XPOS) != connectedFlags) + if ((cutFlags & CUT_ZNEG) != 0 + && (connectedFlags | CONNECT_YNEG | CONNECT_XPOS | CONNECT_YNEG_XPOS) != connectedFlags) renderCutFace(FACE_ZNEG, blockAccess, block, x, y, z); - if ((cutFlags & CUT_XPOS) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_ZNEG | CONNECT_YNEG_ZNEG) != connectedFlags) + if ((cutFlags & CUT_XPOS) != 0 + && (connectedFlags | CONNECT_YNEG | CONNECT_ZNEG | CONNECT_YNEG_ZNEG) != connectedFlags) renderCutFace(FACE_XPOS, blockAccess, block, x, y, z); } if ((cutFlags & TEST_YNEG_ZPOS_XNEG) != 0) { renderHelper.setRenderBounds(xNeg, yNeg, zPos - unit, xNeg + unit, yNeg + unit, zPos); - if ((cutFlags & CUT_YNEG) != 0 && (connectedFlags | CONNECT_ZPOS | CONNECT_XNEG | CONNECT_ZPOS_XNEG) != connectedFlags) + if ((cutFlags & CUT_YNEG) != 0 + && (connectedFlags | CONNECT_ZPOS | CONNECT_XNEG | CONNECT_ZPOS_XNEG) != connectedFlags) renderCutFace(FACE_YNEG, blockAccess, block, x, y, z); - if ((cutFlags & CUT_ZPOS) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_XNEG | CONNECT_YNEG_XNEG) != connectedFlags) + if ((cutFlags & CUT_ZPOS) != 0 + && (connectedFlags | CONNECT_YNEG | CONNECT_XNEG | CONNECT_YNEG_XNEG) != connectedFlags) renderCutFace(FACE_ZPOS, blockAccess, block, x, y, z); - if ((cutFlags & CUT_XNEG) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_ZPOS | CONNECT_YNEG_ZPOS) != connectedFlags) + if ((cutFlags & CUT_XNEG) != 0 + && (connectedFlags | CONNECT_YNEG | CONNECT_ZPOS | CONNECT_YNEG_ZPOS) != connectedFlags) renderCutFace(FACE_XNEG, blockAccess, block, x, y, z); } if ((cutFlags & TEST_YNEG_ZPOS_XPOS) != 0) { renderHelper.setRenderBounds(xPos - unit, yNeg, zPos - unit, xPos, yNeg + unit, zPos); - if ((cutFlags & CUT_YNEG) != 0 && (connectedFlags | CONNECT_ZPOS | CONNECT_XPOS | CONNECT_ZPOS_XPOS) != connectedFlags) + if ((cutFlags & CUT_YNEG) != 0 + && (connectedFlags | CONNECT_ZPOS | CONNECT_XPOS | CONNECT_ZPOS_XPOS) != connectedFlags) renderCutFace(FACE_YNEG, blockAccess, block, x, y, z); - if ((cutFlags & CUT_ZPOS) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_XPOS | CONNECT_YNEG_XPOS) != connectedFlags) + if ((cutFlags & CUT_ZPOS) != 0 + && (connectedFlags | CONNECT_YNEG | CONNECT_XPOS | CONNECT_YNEG_XPOS) != connectedFlags) renderCutFace(FACE_ZPOS, blockAccess, block, x, y, z); - if ((cutFlags & CUT_XPOS) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_ZPOS | CONNECT_YNEG_ZPOS) != connectedFlags) + if ((cutFlags & CUT_XPOS) != 0 + && (connectedFlags | CONNECT_YNEG | CONNECT_ZPOS | CONNECT_YNEG_ZPOS) != connectedFlags) renderCutFace(FACE_XPOS, blockAccess, block, x, y, z); } if ((cutFlags & TEST_YPOS_ZNEG_XNEG) != 0) { renderHelper.setRenderBounds(xNeg, yPos - unit, zNeg, xNeg + unit, yPos, zNeg + unit); - if ((cutFlags & CUT_YPOS) != 0 && (connectedFlags | CONNECT_ZNEG | CONNECT_XNEG | CONNECT_ZNEG_XNEG) != connectedFlags) + if ((cutFlags & CUT_YPOS) != 0 + && (connectedFlags | CONNECT_ZNEG | CONNECT_XNEG | CONNECT_ZNEG_XNEG) != connectedFlags) renderCutFace(FACE_YPOS, blockAccess, block, x, y, z); - if ((cutFlags & CUT_ZNEG) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_XNEG | CONNECT_YPOS_XNEG) != connectedFlags) + if ((cutFlags & CUT_ZNEG) != 0 + && (connectedFlags | CONNECT_YPOS | CONNECT_XNEG | CONNECT_YPOS_XNEG) != connectedFlags) renderCutFace(FACE_ZNEG, blockAccess, block, x, y, z); - if ((cutFlags & CUT_XNEG) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_ZNEG | CONNECT_YPOS_ZNEG) != connectedFlags) + if ((cutFlags & CUT_XNEG) != 0 + && (connectedFlags | CONNECT_YPOS | CONNECT_ZNEG | CONNECT_YPOS_ZNEG) != connectedFlags) renderCutFace(FACE_XNEG, blockAccess, block, x, y, z); } if ((cutFlags & TEST_YPOS_ZNEG_XPOS) != 0) { renderHelper.setRenderBounds(xPos - unit, yPos - unit, zNeg, xPos, yPos, zNeg + unit); - if ((cutFlags & CUT_YPOS) != 0 && (connectedFlags | CONNECT_ZNEG | CONNECT_XPOS | CONNECT_ZNEG_XPOS) != connectedFlags) + if ((cutFlags & CUT_YPOS) != 0 + && (connectedFlags | CONNECT_ZNEG | CONNECT_XPOS | CONNECT_ZNEG_XPOS) != connectedFlags) renderCutFace(FACE_YPOS, blockAccess, block, x, y, z); - if ((cutFlags & CUT_ZNEG) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_XPOS | CONNECT_YPOS_XPOS) != connectedFlags) + if ((cutFlags & CUT_ZNEG) != 0 + && (connectedFlags | CONNECT_YPOS | CONNECT_XPOS | CONNECT_YPOS_XPOS) != connectedFlags) renderCutFace(FACE_ZNEG, blockAccess, block, x, y, z); - if ((cutFlags & CUT_XPOS) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_ZNEG | CONNECT_YPOS_ZNEG) != connectedFlags) + if ((cutFlags & CUT_XPOS) != 0 + && (connectedFlags | CONNECT_YPOS | CONNECT_ZNEG | CONNECT_YPOS_ZNEG) != connectedFlags) renderCutFace(FACE_XPOS, blockAccess, block, x, y, z); } if ((cutFlags & TEST_YPOS_ZPOS_XNEG) != 0) { renderHelper.setRenderBounds(xNeg, yPos - unit, zPos - unit, xNeg + unit, yPos, zPos); - if ((cutFlags & CUT_YPOS) != 0 && (connectedFlags | CONNECT_ZPOS | CONNECT_XNEG | CONNECT_ZPOS_XNEG) != connectedFlags) + if ((cutFlags & CUT_YPOS) != 0 + && (connectedFlags | CONNECT_ZPOS | CONNECT_XNEG | CONNECT_ZPOS_XNEG) != connectedFlags) renderCutFace(FACE_YPOS, blockAccess, block, x, y, z); - if ((cutFlags & CUT_ZPOS) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_XNEG | CONNECT_YPOS_XNEG) != connectedFlags) + if ((cutFlags & CUT_ZPOS) != 0 + && (connectedFlags | CONNECT_YPOS | CONNECT_XNEG | CONNECT_YPOS_XNEG) != connectedFlags) renderCutFace(FACE_ZPOS, blockAccess, block, x, y, z); - if ((cutFlags & CUT_XNEG) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_ZPOS | CONNECT_YPOS_ZPOS) != connectedFlags) + if ((cutFlags & CUT_XNEG) != 0 + && (connectedFlags | CONNECT_YPOS | CONNECT_ZPOS | CONNECT_YPOS_ZPOS) != connectedFlags) renderCutFace(FACE_XNEG, blockAccess, block, x, y, z); } if ((cutFlags & TEST_YPOS_ZPOS_XPOS) != 0) { renderHelper.setRenderBounds(xPos - unit, yPos - unit, zPos - unit, xPos, yPos, zPos); - if ((cutFlags & CUT_YPOS) != 0 && (connectedFlags | CONNECT_ZPOS | CONNECT_XPOS | CONNECT_ZPOS_XPOS) != connectedFlags) + if ((cutFlags & CUT_YPOS) != 0 + && (connectedFlags | CONNECT_ZPOS | CONNECT_XPOS | CONNECT_ZPOS_XPOS) != connectedFlags) renderCutFace(FACE_YPOS, blockAccess, block, x, y, z); - if ((cutFlags & CUT_ZPOS) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_XPOS | CONNECT_YPOS_XPOS) != connectedFlags) + if ((cutFlags & CUT_ZPOS) != 0 + && (connectedFlags | CONNECT_YPOS | CONNECT_XPOS | CONNECT_YPOS_XPOS) != connectedFlags) renderCutFace(FACE_ZPOS, blockAccess, block, x, y, z); - if ((cutFlags & CUT_XPOS) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_ZPOS | CONNECT_YPOS_ZPOS) != connectedFlags) + if ((cutFlags & CUT_XPOS) != 0 + && (connectedFlags | CONNECT_YPOS | CONNECT_ZPOS | CONNECT_YPOS_ZPOS) != connectedFlags) renderCutFace(FACE_XPOS, blockAccess, block, x, y, z); } } - public void renderInterior (IBlockAccess blockAccess, Block block, double x, double y, double z, double xNeg, double yNeg, double zNeg, double xPos, double yPos, double zPos, int connectedFlags, int cutFlags) { + public void renderInterior( + IBlockAccess blockAccess, + Block block, + double x, + double y, + double z, + double xNeg, + double yNeg, + double zNeg, + double xPos, + double yPos, + double zPos, + int connectedFlags, + int cutFlags) { RenderHelper renderHelper = RenderHelper.instance; - if ((cutFlags & CUT_YNEG) != 0) - connectedFlags |= PLANE_YNEG; - if ((cutFlags & CUT_YPOS) != 0) - connectedFlags |= PLANE_YPOS; - if ((cutFlags & CUT_ZNEG) != 0) - connectedFlags |= CONNECT_ZNEG; - if ((cutFlags & CUT_ZPOS) != 0) - connectedFlags |= CONNECT_ZPOS; - if ((cutFlags & CUT_XNEG) != 0) - connectedFlags |= CONNECT_XNEG; - if ((cutFlags & CUT_XPOS) != 0) - connectedFlags |= CONNECT_XPOS; + if ((cutFlags & CUT_YNEG) != 0) connectedFlags |= PLANE_YNEG; + if ((cutFlags & CUT_YPOS) != 0) connectedFlags |= PLANE_YPOS; + if ((cutFlags & CUT_ZNEG) != 0) connectedFlags |= CONNECT_ZNEG; + if ((cutFlags & CUT_ZPOS) != 0) connectedFlags |= CONNECT_ZPOS; + if ((cutFlags & CUT_XNEG) != 0) connectedFlags |= CONNECT_XNEG; + if ((cutFlags & CUT_XPOS) != 0) connectedFlags |= CONNECT_XPOS; renderHelper.setRenderBounds(xNeg + unit, yNeg + unit, zNeg + unit, xPos - unit, yPos - unit, zPos - unit); @@ -462,98 +512,93 @@ public class ModularBoxRenderer renderInteriorFace(FACE_XNEG, blockAccess, block, x, y, z); } - if (unit == 0) - return; + if (unit == 0) return; // Render edge faces - if ((connectedFlags & TEST_YNEG_ZNEG) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_ZNEG | CONNECT_YNEG_ZNEG) != connectedFlags) { + if ((connectedFlags & TEST_YNEG_ZNEG) != 0 + && (connectedFlags | CONNECT_YNEG | CONNECT_ZNEG | CONNECT_YNEG_ZNEG) != connectedFlags) { renderHelper.setRenderBounds(xNeg + unit, yNeg, zNeg, xPos - unit, yNeg + unit, zNeg + unit); - if ((connectedFlags & CONNECT_YNEG) != 0) - renderInteriorFace(FACE_ZPOS, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_ZNEG) != 0) - renderInteriorFace(FACE_YPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_YNEG) != 0) renderInteriorFace(FACE_ZPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_ZNEG) != 0) renderInteriorFace(FACE_YPOS, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YNEG_ZPOS) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_ZPOS | CONNECT_YNEG_ZPOS) != connectedFlags) { + if ((connectedFlags & TEST_YNEG_ZPOS) != 0 + && (connectedFlags | CONNECT_YNEG | CONNECT_ZPOS | CONNECT_YNEG_ZPOS) != connectedFlags) { renderHelper.setRenderBounds(xNeg + unit, yNeg, zPos - unit, xPos - unit, yNeg + unit, zPos); - if ((connectedFlags & CONNECT_YNEG) != 0) - renderInteriorFace(FACE_ZNEG, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_ZPOS) != 0) - renderInteriorFace(FACE_YPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_YNEG) != 0) renderInteriorFace(FACE_ZNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_ZPOS) != 0) renderInteriorFace(FACE_YPOS, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YNEG_XNEG) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_XNEG | CONNECT_YNEG_XNEG) != connectedFlags) { + if ((connectedFlags & TEST_YNEG_XNEG) != 0 + && (connectedFlags | CONNECT_YNEG | CONNECT_XNEG | CONNECT_YNEG_XNEG) != connectedFlags) { renderHelper.setRenderBounds(xNeg, yNeg, zNeg + unit, xNeg + unit, yNeg + unit, zPos - unit); - if ((connectedFlags & CONNECT_YNEG) != 0) - renderInteriorFace(FACE_XPOS, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_XNEG) != 0) - renderInteriorFace(FACE_YPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_YNEG) != 0) renderInteriorFace(FACE_XPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_XNEG) != 0) renderInteriorFace(FACE_YPOS, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YNEG_XPOS) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_XPOS | CONNECT_YNEG_XPOS) != connectedFlags) { + if ((connectedFlags & TEST_YNEG_XPOS) != 0 + && (connectedFlags | CONNECT_YNEG | CONNECT_XPOS | CONNECT_YNEG_XPOS) != connectedFlags) { renderHelper.setRenderBounds(xPos - unit, yNeg, zNeg + unit, xPos, yNeg + unit, zPos - unit); - if ((connectedFlags & CONNECT_YNEG) != 0) - renderInteriorFace(FACE_XNEG, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_XPOS) != 0) - renderInteriorFace(FACE_YPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_YNEG) != 0) renderInteriorFace(FACE_XNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_XPOS) != 0) renderInteriorFace(FACE_YPOS, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YPOS_ZNEG) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_ZNEG | CONNECT_YPOS_ZNEG) != connectedFlags) { + if ((connectedFlags & TEST_YPOS_ZNEG) != 0 + && (connectedFlags | CONNECT_YPOS | CONNECT_ZNEG | CONNECT_YPOS_ZNEG) != connectedFlags) { renderHelper.setRenderBounds(xNeg + unit, yPos - unit, zNeg, xPos - unit, yPos, zNeg + unit); - if ((connectedFlags & CONNECT_YPOS) != 0) - renderInteriorFace(FACE_ZPOS, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_ZNEG) != 0) - renderInteriorFace(FACE_YNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_YPOS) != 0) renderInteriorFace(FACE_ZPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_ZNEG) != 0) renderInteriorFace(FACE_YNEG, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YPOS_ZPOS) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_ZPOS | CONNECT_YPOS_ZPOS) != connectedFlags) { + if ((connectedFlags & TEST_YPOS_ZPOS) != 0 + && (connectedFlags | CONNECT_YPOS | CONNECT_ZPOS | CONNECT_YPOS_ZPOS) != connectedFlags) { renderHelper.setRenderBounds(xNeg + unit, yPos - unit, zPos - unit, xPos - unit, yPos, zPos); - if ((connectedFlags & CONNECT_YPOS) != 0) - renderInteriorFace(FACE_ZNEG, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_ZPOS) != 0) - renderInteriorFace(FACE_YNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_YPOS) != 0) renderInteriorFace(FACE_ZNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_ZPOS) != 0) renderInteriorFace(FACE_YNEG, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YPOS_XNEG) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_XNEG | CONNECT_YPOS_XNEG) != connectedFlags) { + if ((connectedFlags & TEST_YPOS_XNEG) != 0 + && (connectedFlags | CONNECT_YPOS | CONNECT_XNEG | CONNECT_YPOS_XNEG) != connectedFlags) { renderHelper.setRenderBounds(xNeg, yPos - unit, zNeg + unit, xNeg + unit, yPos, zPos - unit); - if ((connectedFlags & CONNECT_YPOS) != 0) - renderInteriorFace(FACE_XPOS, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_XNEG) != 0) - renderInteriorFace(FACE_YNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_YPOS) != 0) renderInteriorFace(FACE_XPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_XNEG) != 0) renderInteriorFace(FACE_YNEG, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YPOS_XPOS) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_XPOS | CONNECT_YPOS_XPOS) != connectedFlags) { + if ((connectedFlags & TEST_YPOS_XPOS) != 0 + && (connectedFlags | CONNECT_YPOS | CONNECT_XPOS | CONNECT_YPOS_XPOS) != connectedFlags) { renderHelper.setRenderBounds(xPos - unit, yPos - unit, zNeg + unit, xPos, yPos, zPos - unit); - if ((connectedFlags & CONNECT_YPOS) != 0) - renderInteriorFace(FACE_XNEG, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_XPOS) != 0) - renderInteriorFace(FACE_YNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_YPOS) != 0) renderInteriorFace(FACE_XNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_XPOS) != 0) renderInteriorFace(FACE_YNEG, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_ZNEG_XNEG) != 0 && (connectedFlags | CONNECT_ZNEG | CONNECT_XNEG | CONNECT_ZNEG_XNEG) != connectedFlags) { + if ((connectedFlags & TEST_ZNEG_XNEG) != 0 + && (connectedFlags | CONNECT_ZNEG | CONNECT_XNEG | CONNECT_ZNEG_XNEG) != connectedFlags) { renderHelper.setRenderBounds(xNeg, yNeg + unit, zNeg, xNeg + unit, yPos - unit, zNeg + unit); - if ((connectedFlags & CONNECT_ZNEG) != 0) - renderInteriorFace(FACE_XPOS, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_XNEG) != 0) - renderInteriorFace(FACE_ZPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_ZNEG) != 0) renderInteriorFace(FACE_XPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_XNEG) != 0) renderInteriorFace(FACE_ZPOS, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_ZNEG_XPOS) != 0 && (connectedFlags | CONNECT_ZNEG | CONNECT_XPOS | CONNECT_ZNEG_XPOS) != connectedFlags) { + if ((connectedFlags & TEST_ZNEG_XPOS) != 0 + && (connectedFlags | CONNECT_ZNEG | CONNECT_XPOS | CONNECT_ZNEG_XPOS) != connectedFlags) { renderHelper.setRenderBounds(xPos - unit, yNeg + unit, zNeg, xPos, yPos - unit, zNeg + unit); - if ((connectedFlags & CONNECT_ZNEG) != 0) - renderInteriorFace(FACE_XNEG, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_XPOS) != 0) - renderInteriorFace(FACE_ZPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_ZNEG) != 0) renderInteriorFace(FACE_XNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_XPOS) != 0) renderInteriorFace(FACE_ZPOS, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_ZPOS_XNEG) != 0 && (connectedFlags | CONNECT_ZPOS | CONNECT_XNEG | CONNECT_ZPOS_XNEG) != connectedFlags) { + if ((connectedFlags & TEST_ZPOS_XNEG) != 0 + && (connectedFlags | CONNECT_ZPOS | CONNECT_XNEG | CONNECT_ZPOS_XNEG) != connectedFlags) { renderHelper.setRenderBounds(xNeg, yNeg + unit, zPos - unit, xNeg + unit, yPos - unit, zPos); - if ((connectedFlags & CONNECT_ZPOS) != 0) - renderInteriorFace(FACE_XPOS, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_XNEG) != 0) - renderInteriorFace(FACE_ZNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_ZPOS) != 0) renderInteriorFace(FACE_XPOS, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_XNEG) != 0) renderInteriorFace(FACE_ZNEG, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_ZPOS_XPOS) != 0 && (connectedFlags | CONNECT_ZPOS | CONNECT_XPOS | CONNECT_ZPOS_XPOS) != connectedFlags) { + if ((connectedFlags & TEST_ZPOS_XPOS) != 0 + && (connectedFlags | CONNECT_ZPOS | CONNECT_XPOS | CONNECT_ZPOS_XPOS) != connectedFlags) { renderHelper.setRenderBounds(xPos - unit, yNeg + unit, zPos - unit, xPos, yPos - unit, zPos); - if ((connectedFlags & CONNECT_ZPOS) != 0) - renderInteriorFace(FACE_XNEG, blockAccess, block, x, y, z); - if ((connectedFlags & CONNECT_XPOS) != 0) - renderInteriorFace(FACE_ZNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_ZPOS) != 0) renderInteriorFace(FACE_XNEG, blockAccess, block, x, y, z); + if ((connectedFlags & CONNECT_XPOS) != 0) renderInteriorFace(FACE_ZNEG, blockAccess, block, x, y, z); } // Render corner faces - if ((connectedFlags & TEST_YNEG_ZNEG_XNEG) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_ZNEG | CONNECT_XNEG | CONNECT_YNEG_ZNEG | CONNECT_YNEG_XNEG | CONNECT_ZNEG_XNEG) != connectedFlags) { + if ((connectedFlags & TEST_YNEG_ZNEG_XNEG) != 0 + && (connectedFlags + | CONNECT_YNEG + | CONNECT_ZNEG + | CONNECT_XNEG + | CONNECT_YNEG_ZNEG + | CONNECT_YNEG_XNEG + | CONNECT_ZNEG_XNEG) + != connectedFlags) { renderHelper.setRenderBounds(xNeg, yNeg, zNeg, xNeg + unit, yNeg + unit, zNeg + unit); if ((connectedFlags | CONNECT_YNEG | CONNECT_ZNEG) == connectedFlags) renderInteriorFace(FACE_XPOS, blockAccess, block, x, y, z); @@ -562,7 +607,15 @@ public class ModularBoxRenderer if ((connectedFlags | CONNECT_ZNEG | CONNECT_XNEG) == connectedFlags) renderInteriorFace(FACE_YPOS, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YNEG_ZNEG_XPOS) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_ZNEG | CONNECT_XPOS | CONNECT_YNEG_ZNEG | CONNECT_YNEG_XPOS | CONNECT_ZNEG_XPOS) != connectedFlags) { + if ((connectedFlags & TEST_YNEG_ZNEG_XPOS) != 0 + && (connectedFlags + | CONNECT_YNEG + | CONNECT_ZNEG + | CONNECT_XPOS + | CONNECT_YNEG_ZNEG + | CONNECT_YNEG_XPOS + | CONNECT_ZNEG_XPOS) + != connectedFlags) { renderHelper.setRenderBounds(xPos - unit, yNeg, zNeg, xPos, yNeg + unit, zNeg + unit); if ((connectedFlags | CONNECT_YNEG | CONNECT_ZNEG) == connectedFlags) renderInteriorFace(FACE_XNEG, blockAccess, block, x, y, z); @@ -571,7 +624,15 @@ public class ModularBoxRenderer if ((connectedFlags | CONNECT_ZNEG | CONNECT_XPOS) == connectedFlags) renderInteriorFace(FACE_YPOS, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YNEG_ZPOS_XNEG) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_ZPOS | CONNECT_XNEG | CONNECT_YNEG_ZPOS | CONNECT_YNEG_XNEG | CONNECT_ZPOS_XNEG) != connectedFlags) { + if ((connectedFlags & TEST_YNEG_ZPOS_XNEG) != 0 + && (connectedFlags + | CONNECT_YNEG + | CONNECT_ZPOS + | CONNECT_XNEG + | CONNECT_YNEG_ZPOS + | CONNECT_YNEG_XNEG + | CONNECT_ZPOS_XNEG) + != connectedFlags) { renderHelper.setRenderBounds(xNeg, yNeg, zPos - unit, xNeg + unit, yNeg + unit, zPos); if ((connectedFlags | CONNECT_YNEG | CONNECT_ZPOS) == connectedFlags) renderInteriorFace(FACE_XPOS, blockAccess, block, x, y, z); @@ -580,7 +641,15 @@ public class ModularBoxRenderer if ((connectedFlags | CONNECT_ZPOS | CONNECT_XNEG) == connectedFlags) renderInteriorFace(FACE_YPOS, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YNEG_ZPOS_XPOS) != 0 && (connectedFlags | CONNECT_YNEG | CONNECT_ZPOS | CONNECT_XPOS | CONNECT_YNEG_ZPOS | CONNECT_YNEG_XPOS | CONNECT_ZPOS_XPOS) != connectedFlags) { + if ((connectedFlags & TEST_YNEG_ZPOS_XPOS) != 0 + && (connectedFlags + | CONNECT_YNEG + | CONNECT_ZPOS + | CONNECT_XPOS + | CONNECT_YNEG_ZPOS + | CONNECT_YNEG_XPOS + | CONNECT_ZPOS_XPOS) + != connectedFlags) { renderHelper.setRenderBounds(xPos - unit, yNeg, zPos - unit, xPos, yNeg + unit, zPos); if ((connectedFlags | CONNECT_YNEG | CONNECT_ZPOS) == connectedFlags) renderInteriorFace(FACE_XNEG, blockAccess, block, x, y, z); @@ -589,7 +658,15 @@ public class ModularBoxRenderer if ((connectedFlags | CONNECT_ZPOS | CONNECT_XPOS) == connectedFlags) renderInteriorFace(FACE_YPOS, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YPOS_ZNEG_XNEG) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_ZNEG | CONNECT_XNEG | CONNECT_YPOS_ZNEG | CONNECT_YPOS_XNEG | CONNECT_ZNEG_XNEG) != connectedFlags) { + if ((connectedFlags & TEST_YPOS_ZNEG_XNEG) != 0 + && (connectedFlags + | CONNECT_YPOS + | CONNECT_ZNEG + | CONNECT_XNEG + | CONNECT_YPOS_ZNEG + | CONNECT_YPOS_XNEG + | CONNECT_ZNEG_XNEG) + != connectedFlags) { renderHelper.setRenderBounds(xNeg, yPos - unit, zNeg, xNeg + unit, yPos, zNeg + unit); if ((connectedFlags | CONNECT_YPOS | CONNECT_ZNEG) == connectedFlags) renderInteriorFace(FACE_XPOS, blockAccess, block, x, y, z); @@ -598,7 +675,15 @@ public class ModularBoxRenderer if ((connectedFlags | CONNECT_ZNEG | CONNECT_XNEG) == connectedFlags) renderInteriorFace(FACE_YNEG, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YPOS_ZNEG_XPOS) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_ZNEG | CONNECT_XPOS | CONNECT_YPOS_ZNEG | CONNECT_YPOS_XPOS | CONNECT_ZNEG_XPOS) != connectedFlags) { + if ((connectedFlags & TEST_YPOS_ZNEG_XPOS) != 0 + && (connectedFlags + | CONNECT_YPOS + | CONNECT_ZNEG + | CONNECT_XPOS + | CONNECT_YPOS_ZNEG + | CONNECT_YPOS_XPOS + | CONNECT_ZNEG_XPOS) + != connectedFlags) { renderHelper.setRenderBounds(xPos - unit, yPos - unit, zNeg, xPos, yPos, zNeg + unit); if ((connectedFlags | CONNECT_YPOS | CONNECT_ZNEG) == connectedFlags) renderInteriorFace(FACE_XNEG, blockAccess, block, x, y, z); @@ -607,7 +692,15 @@ public class ModularBoxRenderer if ((connectedFlags | CONNECT_ZNEG | CONNECT_XPOS) == connectedFlags) renderInteriorFace(FACE_YNEG, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YPOS_ZPOS_XNEG) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_ZPOS | CONNECT_XNEG | CONNECT_YPOS_ZPOS | CONNECT_YPOS_XNEG | CONNECT_ZPOS_XNEG) != connectedFlags) { + if ((connectedFlags & TEST_YPOS_ZPOS_XNEG) != 0 + && (connectedFlags + | CONNECT_YPOS + | CONNECT_ZPOS + | CONNECT_XNEG + | CONNECT_YPOS_ZPOS + | CONNECT_YPOS_XNEG + | CONNECT_ZPOS_XNEG) + != connectedFlags) { renderHelper.setRenderBounds(xNeg, yPos - unit, zPos - unit, xNeg + unit, yPos, zPos); if ((connectedFlags | CONNECT_YPOS | CONNECT_ZPOS) == connectedFlags) renderInteriorFace(FACE_XPOS, blockAccess, block, x, y, z); @@ -616,7 +709,15 @@ public class ModularBoxRenderer if ((connectedFlags | CONNECT_ZPOS | CONNECT_XNEG) == connectedFlags) renderInteriorFace(FACE_YNEG, blockAccess, block, x, y, z); } - if ((connectedFlags & TEST_YPOS_ZPOS_XPOS) != 0 && (connectedFlags | CONNECT_YPOS | CONNECT_ZPOS | CONNECT_XPOS | CONNECT_YPOS_ZPOS | CONNECT_YPOS_XPOS | CONNECT_ZPOS_XPOS) != connectedFlags) { + if ((connectedFlags & TEST_YPOS_ZPOS_XPOS) != 0 + && (connectedFlags + | CONNECT_YPOS + | CONNECT_ZPOS + | CONNECT_XPOS + | CONNECT_YPOS_ZPOS + | CONNECT_YPOS_XPOS + | CONNECT_ZPOS_XPOS) + != connectedFlags) { renderHelper.setRenderBounds(xPos - unit, yPos - unit, zPos - unit, xPos, yPos, zPos); if ((connectedFlags | CONNECT_YPOS | CONNECT_ZPOS) == connectedFlags) renderInteriorFace(FACE_XNEG, blockAccess, block, x, y, z); @@ -627,7 +728,17 @@ public class ModularBoxRenderer } } - private void renderFace (int face, IBlockAccess blockAccess, Block block, double x, double y, double z, IIcon icon, float r, float g, float b) { + private void renderFace( + int face, + IBlockAccess blockAccess, + Block block, + double x, + double y, + double z, + IIcon icon, + float r, + float g, + float b) { RenderHelper renderHelper = RenderHelper.instance; switch (face) { case FACE_YNEG: @@ -645,11 +756,21 @@ public class ModularBoxRenderer } } - private void renderExteriorFace (int face, IBlockAccess blockAccess, Block block, double x, double y, double z) { - renderFace(face, blockAccess, block, x, y, z, exteriorIcon[face], exteriorColor[face][0], exteriorColor[face][1], exteriorColor[face][2]); + private void renderExteriorFace(int face, IBlockAccess blockAccess, Block block, double x, double y, double z) { + renderFace( + face, + blockAccess, + block, + x, + y, + z, + exteriorIcon[face], + exteriorColor[face][0], + exteriorColor[face][1], + exteriorColor[face][2]); } - private void renderInteriorFace (int face, IBlockAccess blockAccess, Block block, double x, double y, double z) { + private void renderInteriorFace(int face, IBlockAccess blockAccess, Block block, double x, double y, double z) { IIcon icon = interiorIcon[face]; float r = interiorColor[face][0]; float g = interiorColor[face][1]; @@ -658,7 +779,17 @@ public class ModularBoxRenderer renderFace(face, blockAccess, block, x, y, z, icon, r, g, b); } - private void renderCutFace (int face, IBlockAccess blockAccess, Block block, double x, double y, double z) { - renderFace(face, blockAccess, block, x, y, z, cutIcon[face], cutColor[face][0], cutColor[face][1], cutColor[face][2]); + private void renderCutFace(int face, IBlockAccess blockAccess, Block block, double x, double y, double z) { + renderFace( + face, + blockAccess, + block, + x, + y, + z, + cutIcon[face], + cutColor[face][0], + cutColor[face][1], + cutColor[face][2]); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/PanelBoxRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/PanelBoxRenderer.java index bdd8b1e..bd191e3 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/PanelBoxRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/PanelBoxRenderer.java @@ -5,8 +5,7 @@ import net.minecraft.block.Block; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -public class PanelBoxRenderer -{ +public class PanelBoxRenderer { public static final int FACE_YNEG = 0; public static final int FACE_YPOS = 1; public static final int FACE_ZNEG = 2; @@ -14,8 +13,12 @@ public class PanelBoxRenderer public static final int FACE_XNEG = 4; public static final int FACE_XPOS = 5; - private static final int TRIM_CUT = ModularBoxRenderer.CUT_XNEG | ModularBoxRenderer.CUT_YNEG | ModularBoxRenderer.CUT_ZNEG - | ModularBoxRenderer.CUT_XPOS | ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_ZPOS; + private static final int TRIM_CUT = ModularBoxRenderer.CUT_XNEG + | ModularBoxRenderer.CUT_YNEG + | ModularBoxRenderer.CUT_ZNEG + | ModularBoxRenderer.CUT_XPOS + | ModularBoxRenderer.CUT_YPOS + | ModularBoxRenderer.CUT_ZPOS; private ModularBoxRenderer trimRenderer = new ModularBoxRenderer(); @@ -28,139 +31,235 @@ public class PanelBoxRenderer private float[] panelColor = new float[3]; private IIcon panelIcon; - public void setTrimWidth (double width) { + public void setTrimWidth(double width) { trimWidth = width; } - public void setTrimDepth (double depth) { + public void setTrimDepth(double depth) { trimDepth = depth; } - public void setTrimIcon (IIcon icon) { + public void setTrimIcon(IIcon icon) { trimIcon = icon; } - public void setTrimColor (float[] color) { + public void setTrimColor(float[] color) { copyFrom(trimColor, color); } - public void setPanelIcon (IIcon icon) { + public void setPanelIcon(IIcon icon) { panelIcon = icon; } - public void setPanelColor (float[] color) { + public void setPanelColor(float[] color) { copyFrom(panelColor, color); } - public void renderFacePanel (int face, IBlockAccess blockAccess, Block block, double x, double y, double z, double xNeg, double yNeg, double zNeg, double xPos, double yPos, double zPos) { + public void renderFacePanel( + int face, + IBlockAccess blockAccess, + Block block, + double x, + double y, + double z, + double xNeg, + double yNeg, + double zNeg, + double xPos, + double yPos, + double zPos) { RenderHelper renderer = RenderHelper.instance; switch (face) { case FACE_YNEG: - renderer.setRenderBounds(xNeg + trimWidth, yNeg + trimDepth, zNeg + trimWidth, xPos - trimWidth, yNeg + trimDepth, zPos - trimWidth); + renderer.setRenderBounds( + xNeg + trimWidth, + yNeg + trimDepth, + zNeg + trimWidth, + xPos - trimWidth, + yNeg + trimDepth, + zPos - trimWidth); renderPaneltFace(face, blockAccess, block, x, y, z); break; case FACE_YPOS: - renderer.setRenderBounds(xNeg + trimWidth, yPos - trimDepth, zNeg + trimWidth, xPos - trimWidth, yPos - trimDepth, zPos - trimWidth); + renderer.setRenderBounds( + xNeg + trimWidth, + yPos - trimDepth, + zNeg + trimWidth, + xPos - trimWidth, + yPos - trimDepth, + zPos - trimWidth); renderPaneltFace(face, blockAccess, block, x, y, z); break; case FACE_ZNEG: - renderer.setRenderBounds(xNeg + trimWidth, yNeg + trimWidth, zNeg + trimDepth, xPos - trimWidth, yPos - trimWidth, zNeg + trimDepth); + renderer.setRenderBounds( + xNeg + trimWidth, + yNeg + trimWidth, + zNeg + trimDepth, + xPos - trimWidth, + yPos - trimWidth, + zNeg + trimDepth); renderPaneltFace(face, blockAccess, block, x, y, z); break; case FACE_ZPOS: - renderer.setRenderBounds(xNeg + trimWidth, yNeg + trimWidth, zPos - trimDepth, xPos - trimWidth, yPos - trimWidth, zPos - trimDepth); + renderer.setRenderBounds( + xNeg + trimWidth, + yNeg + trimWidth, + zPos - trimDepth, + xPos - trimWidth, + yPos - trimWidth, + zPos - trimDepth); renderPaneltFace(face, blockAccess, block, x, y, z); break; case FACE_XNEG: - renderer.setRenderBounds(xNeg + trimDepth, yNeg + trimWidth, zNeg + trimWidth, xNeg + trimDepth, yPos - trimWidth, zPos - trimWidth); + renderer.setRenderBounds( + xNeg + trimDepth, + yNeg + trimWidth, + zNeg + trimWidth, + xNeg + trimDepth, + yPos - trimWidth, + zPos - trimWidth); renderPaneltFace(face, blockAccess, block, x, y, z); break; case FACE_XPOS: - renderer.setRenderBounds(xPos - trimDepth, yNeg + trimWidth, zNeg + trimWidth, xPos - trimDepth, yPos - trimWidth, zPos - trimWidth); + renderer.setRenderBounds( + xPos - trimDepth, + yNeg + trimWidth, + zNeg + trimWidth, + xPos - trimDepth, + yPos - trimWidth, + zPos - trimWidth); renderPaneltFace(face, blockAccess, block, x, y, z); break; } } - public void renderInteriorTrim (int face, IBlockAccess blockAccess, Block block, double x, double y, double z, double xNeg, double yNeg, double zNeg, double xPos, double yPos, double zPos) { + public void renderInteriorTrim( + int face, + IBlockAccess blockAccess, + Block block, + double x, + double y, + double z, + double xNeg, + double yNeg, + double zNeg, + double xPos, + double yPos, + double zPos) { RenderHelper renderer = RenderHelper.instance; switch (face) { case FACE_YNEG: - renderer.setRenderBounds(xNeg + trimWidth, yNeg, zPos - trimWidth, xPos - trimWidth, yNeg + trimDepth, zPos - trimWidth); + renderer.setRenderBounds( + xNeg + trimWidth, yNeg, zPos - trimWidth, xPos - trimWidth, yNeg + trimDepth, zPos - trimWidth); renderCutFace(FACE_ZNEG, blockAccess, block, x, y, z); - renderer.setRenderBounds(xNeg + trimWidth, yNeg, zNeg + trimWidth, xPos - trimWidth, yNeg + trimDepth, zNeg + trimWidth); + renderer.setRenderBounds( + xNeg + trimWidth, yNeg, zNeg + trimWidth, xPos - trimWidth, yNeg + trimDepth, zNeg + trimWidth); renderCutFace(FACE_ZPOS, blockAccess, block, x, y, z); - renderer.setRenderBounds(xPos - trimWidth, yNeg, zNeg + trimWidth, xPos - trimWidth, yNeg + trimDepth, zPos - trimWidth); + renderer.setRenderBounds( + xPos - trimWidth, yNeg, zNeg + trimWidth, xPos - trimWidth, yNeg + trimDepth, zPos - trimWidth); renderCutFace(FACE_XNEG, blockAccess, block, x, y, z); - renderer.setRenderBounds(xNeg + trimWidth, yNeg, zNeg + trimWidth, xNeg + trimWidth, yNeg + trimDepth, zPos - trimWidth); + renderer.setRenderBounds( + xNeg + trimWidth, yNeg, zNeg + trimWidth, xNeg + trimWidth, yNeg + trimDepth, zPos - trimWidth); renderCutFace(FACE_XPOS, blockAccess, block, x, y, z); break; case FACE_YPOS: - renderer.setRenderBounds(xNeg + trimWidth, yPos - trimDepth, zPos - trimWidth, xPos - trimWidth, yPos, zPos - trimWidth); + renderer.setRenderBounds( + xNeg + trimWidth, yPos - trimDepth, zPos - trimWidth, xPos - trimWidth, yPos, zPos - trimWidth); renderCutFace(FACE_ZNEG, blockAccess, block, x, y, z); - renderer.setRenderBounds(xNeg + trimWidth, yPos - trimDepth, zNeg + trimWidth, xPos - trimWidth, yPos, zNeg + trimWidth); + renderer.setRenderBounds( + xNeg + trimWidth, yPos - trimDepth, zNeg + trimWidth, xPos - trimWidth, yPos, zNeg + trimWidth); renderCutFace(FACE_ZPOS, blockAccess, block, x, y, z); - renderer.setRenderBounds(xPos - trimWidth, yPos - trimDepth, zNeg + trimWidth, xPos - trimWidth, yPos, zPos - trimWidth); + renderer.setRenderBounds( + xPos - trimWidth, yPos - trimDepth, zNeg + trimWidth, xPos - trimWidth, yPos, zPos - trimWidth); renderCutFace(FACE_XNEG, blockAccess, block, x, y, z); - renderer.setRenderBounds(xNeg + trimWidth, yPos - trimDepth, zNeg + trimWidth, xNeg + trimWidth, yPos, zPos - trimWidth); + renderer.setRenderBounds( + xNeg + trimWidth, yPos - trimDepth, zNeg + trimWidth, xNeg + trimWidth, yPos, zPos - trimWidth); renderCutFace(FACE_XPOS, blockAccess, block, x, y, z); break; case FACE_ZNEG: - renderer.setRenderBounds(xNeg + trimWidth, yPos - trimWidth, zNeg, xPos - trimWidth, yPos - trimWidth, zNeg + trimDepth); + renderer.setRenderBounds( + xNeg + trimWidth, yPos - trimWidth, zNeg, xPos - trimWidth, yPos - trimWidth, zNeg + trimDepth); renderCutFace(FACE_YNEG, blockAccess, block, x, y, z); - renderer.setRenderBounds(xNeg + trimWidth, yNeg + trimWidth, zNeg, xPos - trimWidth, yNeg + trimWidth, zNeg + trimDepth); + renderer.setRenderBounds( + xNeg + trimWidth, yNeg + trimWidth, zNeg, xPos - trimWidth, yNeg + trimWidth, zNeg + trimDepth); renderCutFace(FACE_YPOS, blockAccess, block, x, y, z); - renderer.setRenderBounds(xPos - trimWidth, yNeg + trimWidth, zNeg, xPos - trimWidth, yPos - trimWidth, zNeg + trimDepth); + renderer.setRenderBounds( + xPos - trimWidth, yNeg + trimWidth, zNeg, xPos - trimWidth, yPos - trimWidth, zNeg + trimDepth); renderCutFace(FACE_XNEG, blockAccess, block, x, y, z); - renderer.setRenderBounds(xNeg + trimWidth, yNeg + trimWidth, zNeg, xNeg + trimWidth, yPos - trimWidth, zNeg + trimDepth); + renderer.setRenderBounds( + xNeg + trimWidth, yNeg + trimWidth, zNeg, xNeg + trimWidth, yPos - trimWidth, zNeg + trimDepth); renderCutFace(FACE_XPOS, blockAccess, block, x, y, z); break; case FACE_ZPOS: - renderer.setRenderBounds(xNeg + trimWidth, yPos - trimWidth, zPos - trimDepth, xPos - trimWidth, yPos - trimWidth, zPos); + renderer.setRenderBounds( + xNeg + trimWidth, yPos - trimWidth, zPos - trimDepth, xPos - trimWidth, yPos - trimWidth, zPos); renderCutFace(FACE_YNEG, blockAccess, block, x, y, z); - renderer.setRenderBounds(xNeg + trimWidth, yNeg + trimWidth, zPos - trimDepth, xPos - trimWidth, yNeg + trimWidth, zPos); + renderer.setRenderBounds( + xNeg + trimWidth, yNeg + trimWidth, zPos - trimDepth, xPos - trimWidth, yNeg + trimWidth, zPos); renderCutFace(FACE_YPOS, blockAccess, block, x, y, z); - renderer.setRenderBounds(xPos - trimWidth, yNeg + trimWidth, zPos - trimDepth, xPos - trimWidth, yPos - trimWidth, zPos); + renderer.setRenderBounds( + xPos - trimWidth, yNeg + trimWidth, zPos - trimDepth, xPos - trimWidth, yPos - trimWidth, zPos); renderCutFace(FACE_XNEG, blockAccess, block, x, y, z); - renderer.setRenderBounds(xNeg + trimWidth, yNeg + trimWidth, zPos - trimDepth, xNeg + trimWidth, yPos - trimWidth, zPos); + renderer.setRenderBounds( + xNeg + trimWidth, yNeg + trimWidth, zPos - trimDepth, xNeg + trimWidth, yPos - trimWidth, zPos); renderCutFace(FACE_XPOS, blockAccess, block, x, y, z); break; case FACE_XNEG: - renderer.setRenderBounds(xNeg, yNeg + trimWidth, zPos - trimWidth, xNeg + trimDepth, yPos - trimWidth, zPos - trimWidth); + renderer.setRenderBounds( + xNeg, yNeg + trimWidth, zPos - trimWidth, xNeg + trimDepth, yPos - trimWidth, zPos - trimWidth); renderCutFace(FACE_ZNEG, blockAccess, block, x, y, z); - renderer.setRenderBounds(xNeg, yNeg + trimWidth, zNeg + trimWidth, xNeg + trimDepth, yPos - trimWidth, zNeg + trimWidth); + renderer.setRenderBounds( + xNeg, yNeg + trimWidth, zNeg + trimWidth, xNeg + trimDepth, yPos - trimWidth, zNeg + trimWidth); renderCutFace(FACE_ZPOS, blockAccess, block, x, y, z); - renderer.setRenderBounds(xNeg, yPos - trimWidth, zNeg + trimWidth, xNeg + trimDepth, yPos - trimWidth, zPos - trimWidth); + renderer.setRenderBounds( + xNeg, yPos - trimWidth, zNeg + trimWidth, xNeg + trimDepth, yPos - trimWidth, zPos - trimWidth); renderCutFace(FACE_YNEG, blockAccess, block, x, y, z); - renderer.setRenderBounds(xNeg, yNeg + trimWidth, zNeg + trimWidth, xNeg + trimDepth, yNeg + trimWidth, zPos - trimWidth); + renderer.setRenderBounds( + xNeg, yNeg + trimWidth, zNeg + trimWidth, xNeg + trimDepth, yNeg + trimWidth, zPos - trimWidth); renderCutFace(FACE_YPOS, blockAccess, block, x, y, z); break; case FACE_XPOS: - renderer.setRenderBounds(xPos - trimDepth, yNeg + trimWidth, zPos - trimWidth, xPos, yPos - trimWidth, zPos - trimWidth); + renderer.setRenderBounds( + xPos - trimDepth, yNeg + trimWidth, zPos - trimWidth, xPos, yPos - trimWidth, zPos - trimWidth); renderCutFace(FACE_ZNEG, blockAccess, block, x, y, z); - renderer.setRenderBounds(xPos - trimDepth, yNeg + trimWidth, zNeg + trimWidth, xPos, yPos - trimWidth, zNeg + trimWidth); + renderer.setRenderBounds( + xPos - trimDepth, yNeg + trimWidth, zNeg + trimWidth, xPos, yPos - trimWidth, zNeg + trimWidth); renderCutFace(FACE_ZPOS, blockAccess, block, x, y, z); - renderer.setRenderBounds(xPos - trimDepth, yPos - trimWidth, zNeg + trimWidth, xPos, yPos - trimWidth, zPos - trimWidth); + renderer.setRenderBounds( + xPos - trimDepth, yPos - trimWidth, zNeg + trimWidth, xPos, yPos - trimWidth, zPos - trimWidth); renderCutFace(FACE_YNEG, blockAccess, block, x, y, z); - renderer.setRenderBounds(xPos - trimDepth, yNeg + trimWidth, zNeg + trimWidth, xPos, yNeg + trimWidth, zPos - trimWidth); + renderer.setRenderBounds( + xPos - trimDepth, yNeg + trimWidth, zNeg + trimWidth, xPos, yNeg + trimWidth, zPos - trimWidth); renderCutFace(FACE_YPOS, blockAccess, block, x, y, z); break; } } - public void renderFaceTrim (int face, IBlockAccess blockAccess, Block block, double x, double y, double z, double xNeg, double yNeg, double zNeg, double xPos, double yPos, double zPos) { + public void renderFaceTrim( + int face, + IBlockAccess blockAccess, + Block block, + double x, + double y, + double z, + double xNeg, + double yNeg, + double zNeg, + double xPos, + double yPos, + double zPos) { double unit = trimWidth; RenderHelper renderer = RenderHelper.instance; @@ -184,7 +283,7 @@ public class PanelBoxRenderer renderer.setRenderBounds(xPos - unit, yNeg, zNeg + unit, xPos, yNeg, zPos - unit); renderCutFace(face, blockAccess, block, x, y, z); break; - + case FACE_YPOS: renderer.setRenderBounds(xNeg, yPos, zNeg, xNeg + unit, yPos, zNeg + unit); renderCutFace(face, blockAccess, block, x, y, z); @@ -287,21 +386,41 @@ public class PanelBoxRenderer } } - private void renderCutFace (int face, IBlockAccess blockAccess, Block block, double x, double y, double z) { - RenderHelper.instance.renderFace(face, blockAccess, block, (int)x, (int)y, (int)z, trimIcon, trimColor[0], trimColor[1], trimColor[2]); + private void renderCutFace(int face, IBlockAccess blockAccess, Block block, double x, double y, double z) { + RenderHelper.instance.renderFace( + face, + blockAccess, + block, + (int) x, + (int) y, + (int) z, + trimIcon, + trimColor[0], + trimColor[1], + trimColor[2]); } - private void renderPaneltFace (int face, IBlockAccess blockAccess, Block block, double x, double y, double z) { - RenderHelper.instance.renderFace(face, blockAccess, block, (int)x, (int)y, (int)z, panelIcon, panelColor[0], panelColor[1], panelColor[2]); + private void renderPaneltFace(int face, IBlockAccess blockAccess, Block block, double x, double y, double z) { + RenderHelper.instance.renderFace( + face, + blockAccess, + block, + (int) x, + (int) y, + (int) z, + panelIcon, + panelColor[0], + panelColor[1], + panelColor[2]); } - private void copyFrom (float[] target, float[] source) { + private void copyFrom(float[] target, float[] source) { target[0] = source[0]; target[1] = source[1]; target[2] = source[2]; } - private void copyFrom (float[] target, float r, float g, float b) { + private void copyFrom(float[] target, float r, float g, float b) { target[0] = r; target[1] = g; target[2] = b; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/RenderUtil.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/RenderUtil.java index 04aa1d0..9d17877 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/RenderUtil.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/RenderUtil.java @@ -9,16 +9,15 @@ import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; -public final class RenderUtil -{ +public final class RenderUtil { private static float[] colorScratch = new float[3]; - private RenderUtil () { } + private RenderUtil() {} - public static void calculateBaseColor (float[] target, int color) { - float r = (float)(color >> 16 & 255) / 255f; - float g = (float)(color >> 8 & 255) / 255f; - float b = (float)(color & 255) / 255f; + public static void calculateBaseColor(float[] target, int color) { + float r = (float) (color >> 16 & 255) / 255f; + float g = (float) (color >> 8 & 255) / 255f; + float b = (float) (color & 255) / 255f; if (EntityRenderer.anaglyphEnable) { float gray = (r * 30f + g * 59f + b * 11f) / 100f; @@ -35,22 +34,22 @@ public final class RenderUtil target[2] = b; } - public static void scaleColor (float[] target, float[] source, float scale) { + public static void scaleColor(float[] target, float[] source, float scale) { target[0] = source[0] * scale; target[1] = source[1] * scale; target[2] = source[2] * scale; } - public static void setTessellatorColor (Tessellator tessellator, float[] color) { + public static void setTessellatorColor(Tessellator tessellator, float[] color) { tessellator.setColorOpaque_F(color[0], color[1], color[2]); } - public static void renderEmptyPlane (Block block, int x, int y, int z, RenderBlocks renderer) { + public static void renderEmptyPlane(Block block, int x, int y, int z, RenderBlocks renderer) { renderer.setRenderBounds(0, 0, 0, 0, 0, 0); renderer.renderFaceYNeg(block, x, y, z, Blocks.dirt.getIcon(0, 0)); } - public static void renderBlock (RenderBlocks renderer, Block block, int x, int y, int z) { + public static void renderBlock(RenderBlocks renderer, Block block, int x, int y, int z) { calculateBaseColor(colorScratch, block.colorMultiplier(renderer.blockAccess, x, y, z)); float r = colorScratch[0]; float g = colorScratch[1]; @@ -64,196 +63,202 @@ public final class RenderUtil renderFaceXPos(renderer, block, x, y, z, block.getIcon(renderer.blockAccess, x, y, z, 5), r, g, b); } - public static void renderFaceYNeg (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon) { + public static void renderFaceYNeg(RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon) { calculateBaseColor(colorScratch, block.colorMultiplier(renderer.blockAccess, x, y, z)); renderFaceYNeg(renderer, block, x, y, z, icon, colorScratch[0], colorScratch[1], colorScratch[2]); } - public static void renderFaceYPos (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon) { + public static void renderFaceYPos(RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon) { calculateBaseColor(colorScratch, block.colorMultiplier(renderer.blockAccess, x, y, z)); renderFaceYPos(renderer, block, x, y, z, icon, colorScratch[0], colorScratch[1], colorScratch[2]); } - public static void renderFaceZNeg (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon) { + public static void renderFaceZNeg(RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon) { calculateBaseColor(colorScratch, block.colorMultiplier(renderer.blockAccess, x, y, z)); renderFaceZNeg(renderer, block, x, y, z, icon, colorScratch[0], colorScratch[1], colorScratch[2]); } - public static void renderFaceZPos (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon) { + public static void renderFaceZPos(RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon) { calculateBaseColor(colorScratch, block.colorMultiplier(renderer.blockAccess, x, y, z)); renderFaceZPos(renderer, block, x, y, z, icon, colorScratch[0], colorScratch[1], colorScratch[2]); } - public static void renderFaceXNeg (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon) { + public static void renderFaceXNeg(RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon) { calculateBaseColor(colorScratch, block.colorMultiplier(renderer.blockAccess, x, y, z)); renderFaceXNeg(renderer, block, x, y, z, icon, colorScratch[0], colorScratch[1], colorScratch[2]); } - public static void renderFaceXPos (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon) { + public static void renderFaceXPos(RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon) { calculateBaseColor(colorScratch, block.colorMultiplier(renderer.blockAccess, x, y, z)); renderFaceXPos(renderer, block, x, y, z, icon, colorScratch[0], colorScratch[1], colorScratch[2]); } - public static void renderFaceYNeg (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { - if (Minecraft.isAmbientOcclusionEnabled() && renderer.blockAccess != null && block.getLightValue(renderer.blockAccess, x, y, z) == 0) + public static void renderFaceYNeg( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + if (Minecraft.isAmbientOcclusionEnabled() + && renderer.blockAccess != null + && block.getLightValue(renderer.blockAccess, x, y, z) == 0) renderFaceYNegAOPartial(renderer, block, x, y, z, icon, r, g, b); - else - renderFaceYNegColorMult(renderer, block, x, y, z, icon, r, g, b); + else renderFaceYNegColorMult(renderer, block, x, y, z, icon, r, g, b); } - public static void renderFaceYPos (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { - if (Minecraft.isAmbientOcclusionEnabled() && renderer.blockAccess != null && block.getLightValue(renderer.blockAccess, x, y, z) == 0) + public static void renderFaceYPos( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + if (Minecraft.isAmbientOcclusionEnabled() + && renderer.blockAccess != null + && block.getLightValue(renderer.blockAccess, x, y, z) == 0) renderFaceYPosAOPartial(renderer, block, x, y, z, icon, r, g, b); - else - renderFaceYPosColorMult(renderer, block, x, y, z, icon, r, g, b); + else renderFaceYPosColorMult(renderer, block, x, y, z, icon, r, g, b); } - public static void renderFaceZNeg (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { - if (Minecraft.isAmbientOcclusionEnabled() && renderer.blockAccess != null && block.getLightValue(renderer.blockAccess, x, y, z) == 0) + public static void renderFaceZNeg( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + if (Minecraft.isAmbientOcclusionEnabled() + && renderer.blockAccess != null + && block.getLightValue(renderer.blockAccess, x, y, z) == 0) renderFaceZNegAOPartial(renderer, block, x, y, z, icon, r, g, b); - else - renderFaceZNegColorMult(renderer, block, x, y, z, icon, r, g, b); + else renderFaceZNegColorMult(renderer, block, x, y, z, icon, r, g, b); } - public static void renderFaceZPos (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { - if (Minecraft.isAmbientOcclusionEnabled() && renderer.blockAccess != null && block.getLightValue(renderer.blockAccess, x, y, z) == 0) + public static void renderFaceZPos( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + if (Minecraft.isAmbientOcclusionEnabled() + && renderer.blockAccess != null + && block.getLightValue(renderer.blockAccess, x, y, z) == 0) renderFaceZPosAOPartial(renderer, block, x, y, z, icon, r, g, b); - else - renderFaceZPosColorMult(renderer, block, x, y, z, icon, r, g, b); + else renderFaceZPosColorMult(renderer, block, x, y, z, icon, r, g, b); } - public static void renderFaceXNeg (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { - if (Minecraft.isAmbientOcclusionEnabled() && renderer.blockAccess != null && block.getLightValue(renderer.blockAccess, x, y, z) == 0) + public static void renderFaceXNeg( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + if (Minecraft.isAmbientOcclusionEnabled() + && renderer.blockAccess != null + && block.getLightValue(renderer.blockAccess, x, y, z) == 0) renderFaceXNegAOPartial(renderer, block, x, y, z, icon, r, g, b); - else - renderFaceXNegColorMult(renderer, block, x, y, z, icon, r, g, b); + else renderFaceXNegColorMult(renderer, block, x, y, z, icon, r, g, b); } - public static void renderFaceXPos (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { - if (Minecraft.isAmbientOcclusionEnabled() && renderer.blockAccess != null && block.getLightValue(renderer.blockAccess, x, y, z) == 0) + public static void renderFaceXPos( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + if (Minecraft.isAmbientOcclusionEnabled() + && renderer.blockAccess != null + && block.getLightValue(renderer.blockAccess, x, y, z) == 0) renderFaceXPosAOPartial(renderer, block, x, y, z, icon, r, g, b); - else - renderFaceXPosColorMult(renderer, block, x, y, z, icon, r, g, b); + else renderFaceXPosColorMult(renderer, block, x, y, z, icon, r, g, b); } - public static void renderFaceYNegColorMult (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { - if (icon == null) - return; + public static void renderFaceYNegColorMult( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + if (icon == null) return; Tessellator tessellator = Tessellator.instance; tessellator.setColorOpaque_F(.5f * r, .5f * g, .5f * b); if (renderer.blockAccess == null) { tessellator.startDrawingQuads(); tessellator.setNormal(0, -1, 0); - } - else - tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, x, (renderer.renderMinY > 0) ? y : y - 1, z)); + } else + tessellator.setBrightness(block.getMixedBrightnessForBlock( + renderer.blockAccess, x, (renderer.renderMinY > 0) ? y : y - 1, z)); renderer.enableAO = false; renderer.renderFaceYNeg(block, (double) x, (double) y, (double) z, icon); - if (renderer.blockAccess == null) - tessellator.draw(); + if (renderer.blockAccess == null) tessellator.draw(); } - public static void renderFaceYPosColorMult (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { - if (icon == null) - return; + public static void renderFaceYPosColorMult( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + if (icon == null) return; Tessellator tessellator = Tessellator.instance; tessellator.setColorOpaque_F(1f * r, 1f * g, 1f * b); if (renderer.blockAccess == null) { tessellator.startDrawingQuads(); tessellator.setNormal(0, 1, 0); - } - else - tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, x, (renderer.renderMaxY < 1) ? y : y + 1, z)); + } else + tessellator.setBrightness(block.getMixedBrightnessForBlock( + renderer.blockAccess, x, (renderer.renderMaxY < 1) ? y : y + 1, z)); renderer.enableAO = false; renderer.renderFaceYPos(block, (double) x, (double) y, (double) z, icon); - if (renderer.blockAccess == null) - tessellator.draw(); + if (renderer.blockAccess == null) tessellator.draw(); } - public static void renderFaceZNegColorMult (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { - if (icon == null) - return; + public static void renderFaceZNegColorMult( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + if (icon == null) return; Tessellator tessellator = Tessellator.instance; tessellator.setColorOpaque_F(.8f * r, .8f * g, .8f * b); if (renderer.blockAccess == null) { tessellator.startDrawingQuads(); tessellator.setNormal(0, 0, -1); - } - else - tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, (renderer.renderMinZ > 0) ? z : z - 1)); + } else + tessellator.setBrightness(block.getMixedBrightnessForBlock( + renderer.blockAccess, x, y, (renderer.renderMinZ > 0) ? z : z - 1)); renderer.enableAO = false; renderer.renderFaceZNeg(block, (double) x, (double) y, (double) z, icon); - if (renderer.blockAccess == null) - tessellator.draw(); + if (renderer.blockAccess == null) tessellator.draw(); } - public static void renderFaceZPosColorMult (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { - if (icon == null) - return; + public static void renderFaceZPosColorMult( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + if (icon == null) return; Tessellator tessellator = Tessellator.instance; tessellator.setColorOpaque_F(.8f * r, .8f * g, .8f * b); if (renderer.blockAccess == null) { tessellator.startDrawingQuads(); tessellator.setNormal(0, 0, 1); - } - else - tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, (renderer.renderMaxZ < 1) ? z : z + 1)); + } else + tessellator.setBrightness(block.getMixedBrightnessForBlock( + renderer.blockAccess, x, y, (renderer.renderMaxZ < 1) ? z : z + 1)); renderer.enableAO = false; renderer.renderFaceZPos(block, (double) x, (double) y, (double) z, icon); - if (renderer.blockAccess == null) - tessellator.draw(); + if (renderer.blockAccess == null) tessellator.draw(); } - public static void renderFaceXNegColorMult (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { - if (icon == null) - return; + public static void renderFaceXNegColorMult( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + if (icon == null) return; Tessellator tessellator = Tessellator.instance; tessellator.setColorOpaque_F(.6f * r, .6f * g, .6f * b); if (renderer.blockAccess == null) { tessellator.startDrawingQuads(); tessellator.setNormal(-1, 0, 0); - } - else - tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, (renderer.renderMinX > 0) ? x : x - 1, y, z)); + } else + tessellator.setBrightness(block.getMixedBrightnessForBlock( + renderer.blockAccess, (renderer.renderMinX > 0) ? x : x - 1, y, z)); renderer.enableAO = false; renderer.renderFaceXNeg(block, (double) x, (double) y, (double) z, icon); - if (renderer.blockAccess == null) - tessellator.draw(); + if (renderer.blockAccess == null) tessellator.draw(); } - public static void renderFaceXPosColorMult (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { - if (icon == null) - return; + public static void renderFaceXPosColorMult( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + if (icon == null) return; Tessellator tessellator = Tessellator.instance; tessellator.setColorOpaque_F(.6f * r, .6f * g, .6f * b); if (renderer.blockAccess == null) { tessellator.startDrawingQuads(); tessellator.setNormal(1, 0, 0); - } - else - tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, (renderer.renderMaxX < 1) ? x : x + 1, y, z)); + } else + tessellator.setBrightness(block.getMixedBrightnessForBlock( + renderer.blockAccess, (renderer.renderMaxX < 1) ? x : x + 1, y, z)); renderer.enableAO = false; renderer.renderFaceXPos(block, (double) x, (double) y, (double) z, icon); - if (renderer.blockAccess == null) - tessellator.draw(); + if (renderer.blockAccess == null) tessellator.draw(); } private static int aoBrightnessXYNN; @@ -332,7 +337,16 @@ public final class RenderUtil private static float aoLightValueScratchXYZIPN; private static float aoLightValueScratchXYZIPP; - private static void setupAOBrightnessZNeg (RenderBlocks renderer, Block block, int x, int y, int z, boolean bgXP, boolean bgXN, boolean bgYP, boolean bgYN) { + private static void setupAOBrightnessZNeg( + RenderBlocks renderer, + Block block, + int x, + int y, + int z, + boolean bgXP, + boolean bgXN, + boolean bgYP, + boolean bgYN) { aoLightValueScratchXZNN = renderer.blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(); aoLightValueScratchYZNN = renderer.blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(); aoLightValueScratchYZPN = renderer.blockAccess.getBlock(x, y + 1, z).getAmbientOcclusionLightValue(); @@ -352,27 +366,40 @@ public final class RenderUtil aoBrightnessXYZPPN = aoBrightnessXZPN; if (bgXN || bgYN) { - aoLightValueScratchXYZNNN = renderer.blockAccess.getBlock(x - 1, y - 1, z).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZNNN = + renderer.blockAccess.getBlock(x - 1, y - 1, z).getAmbientOcclusionLightValue(); aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(renderer.blockAccess, x - 1, y - 1, z); } if (bgXN || bgYP) { - aoLightValueScratchXYZNPN = renderer.blockAccess.getBlock(x - 1, y + 1, z).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZNPN = + renderer.blockAccess.getBlock(x - 1, y + 1, z).getAmbientOcclusionLightValue(); aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(renderer.blockAccess, x - 1, y + 1, z); } if (bgXP || bgYN) { - aoLightValueScratchXYZPNN = renderer.blockAccess.getBlock(x + 1, y - 1, z).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZPNN = + renderer.blockAccess.getBlock(x + 1, y - 1, z).getAmbientOcclusionLightValue(); aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(renderer.blockAccess, x + 1, y - 1, z); } if (bgXP || bgYP) { - aoLightValueScratchXYZPPN = renderer.blockAccess.getBlock(x + 1, y + 1, z).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZPPN = + renderer.blockAccess.getBlock(x + 1, y + 1, z).getAmbientOcclusionLightValue(); aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(renderer.blockAccess, x + 1, y + 1, z); } } - private static void setupAOBrightnessZPos (RenderBlocks renderer, Block block, int x, int y, int z, boolean bgXP, boolean bgXN, boolean bgYP, boolean bgYN) { + private static void setupAOBrightnessZPos( + RenderBlocks renderer, + Block block, + int x, + int y, + int z, + boolean bgXP, + boolean bgXN, + boolean bgYP, + boolean bgYN) { aoLightValueScratchXZNP = renderer.blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(); aoLightValueScratchXZPP = renderer.blockAccess.getBlock(x + 1, y, z).getAmbientOcclusionLightValue(); aoLightValueScratchYZNP = renderer.blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(); @@ -392,27 +419,40 @@ public final class RenderUtil aoBrightnessXYZPPP = aoBrightnessXZPP; if (bgXN || bgYN) { - aoLightValueScratchXYZNNP = renderer.blockAccess.getBlock(x - 1, y - 1, z).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZNNP = + renderer.blockAccess.getBlock(x - 1, y - 1, z).getAmbientOcclusionLightValue(); aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(renderer.blockAccess, x - 1, y - 1, z); } if (bgXN || bgYP) { - aoLightValueScratchXYZNPP = renderer.blockAccess.getBlock(x - 1, y + 1, z).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZNPP = + renderer.blockAccess.getBlock(x - 1, y + 1, z).getAmbientOcclusionLightValue(); aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(renderer.blockAccess, x - 1, y + 1, z); } if (bgXP || bgYN) { - aoLightValueScratchXYZPNP = renderer.blockAccess.getBlock(x + 1, y - 1, z).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZPNP = + renderer.blockAccess.getBlock(x + 1, y - 1, z).getAmbientOcclusionLightValue(); aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(renderer.blockAccess, x + 1, y - 1, z); } if (bgXP || bgYP) { - aoLightValueScratchXYZPPP = renderer.blockAccess.getBlock(x + 1, y + 1, z).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZPPP = + renderer.blockAccess.getBlock(x + 1, y + 1, z).getAmbientOcclusionLightValue(); aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(renderer.blockAccess, x + 1, y + 1, z); } } - private static void setupAOBrightnessXNeg (RenderBlocks renderer, Block block, int x, int y, int z, boolean bgYP, boolean bgYN, boolean bgZN, boolean bgZP) { + private static void setupAOBrightnessXNeg( + RenderBlocks renderer, + Block block, + int x, + int y, + int z, + boolean bgYP, + boolean bgYN, + boolean bgZN, + boolean bgZP) { aoLightValueScratchXYNN = renderer.blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(); aoLightValueScratchXZNN = renderer.blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(); aoLightValueScratchXZNP = renderer.blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(); @@ -432,27 +472,40 @@ public final class RenderUtil aoBrightnessXYZNPP = aoBrightnessXZNP; if (bgZN || bgYN) { - aoLightValueScratchXYZNNN = renderer.blockAccess.getBlock(x, y - 1, z - 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZNNN = + renderer.blockAccess.getBlock(x, y - 1, z - 1).getAmbientOcclusionLightValue(); aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y - 1, z - 1); } if (bgZP || bgYN) { - aoLightValueScratchXYZNNP = renderer.blockAccess.getBlock(x, y - 1, z + 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZNNP = + renderer.blockAccess.getBlock(x, y - 1, z + 1).getAmbientOcclusionLightValue(); aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y - 1, z + 1); } if (bgZN || bgYP) { - aoLightValueScratchXYZNPN = renderer.blockAccess.getBlock(x, y + 1, z - 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZNPN = + renderer.blockAccess.getBlock(x, y + 1, z - 1).getAmbientOcclusionLightValue(); aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y + 1, z - 1); } if (bgZP || bgYP) { - aoLightValueScratchXYZNPP = renderer.blockAccess.getBlock(x, y + 1, z + 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZNPP = + renderer.blockAccess.getBlock(x, y + 1, z + 1).getAmbientOcclusionLightValue(); aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y + 1, z + 1); } } - private static void setupAOBrightnessXPos (RenderBlocks renderer, Block block, int x, int y, int z, boolean bgYP, boolean bgYN, boolean bgZN, boolean bgZP) { + private static void setupAOBrightnessXPos( + RenderBlocks renderer, + Block block, + int x, + int y, + int z, + boolean bgYP, + boolean bgYN, + boolean bgZN, + boolean bgZP) { aoLightValueScratchXYPN = renderer.blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(); aoLightValueScratchXZPN = renderer.blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(); aoLightValueScratchXZPP = renderer.blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(); @@ -472,27 +525,31 @@ public final class RenderUtil aoBrightnessXYZPPP = aoBrightnessXZPP; if (bgYN || bgZN) { - aoLightValueScratchXYZPNN = renderer.blockAccess.getBlock(x, y - 1, z - 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZPNN = + renderer.blockAccess.getBlock(x, y - 1, z - 1).getAmbientOcclusionLightValue(); aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y - 1, z - 1); } if (bgYN || bgZP) { - aoLightValueScratchXYZPNP = renderer.blockAccess.getBlock(x, y - 1, z + 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZPNP = + renderer.blockAccess.getBlock(x, y - 1, z + 1).getAmbientOcclusionLightValue(); aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y - 1, z + 1); } if (bgYP || bgZN) { - aoLightValueScratchXYZPPN = renderer.blockAccess.getBlock(x, y + 1, z - 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZPPN = + renderer.blockAccess.getBlock(x, y + 1, z - 1).getAmbientOcclusionLightValue(); aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y + 1, z - 1); } if (bgYP || bgZP) { - aoLightValueScratchXYZPPP = renderer.blockAccess.getBlock(x, y + 1, z + 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZPPP = + renderer.blockAccess.getBlock(x, y + 1, z + 1).getAmbientOcclusionLightValue(); aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y + 1, z + 1); } } - private static void mixAOBrightnessLightValueZ (float fMin, float fMax) { + private static void mixAOBrightnessLightValueZ(float fMin, float fMax) { if (fMin == 1 && fMax == 0) { aoLightValueScratchXZNI = aoLightValueScratchXZNN; aoLightValueScratchYZNI = aoLightValueScratchYZNN; @@ -511,8 +568,7 @@ public final class RenderUtil aoBrightnessXYZNPI = aoBrightnessXYZNPN; aoBrightnessXYZPNI = aoBrightnessXYZPNN; aoBrightnessXYZPPI = aoBrightnessXYZPPN; - } - else if (fMin == 0 && fMax == 1) { + } else if (fMin == 0 && fMax == 1) { aoLightValueScratchXZNI = aoLightValueScratchXZNP; aoLightValueScratchYZNI = aoLightValueScratchYZNP; aoLightValueScratchYZPI = aoLightValueScratchYZPP; @@ -530,8 +586,7 @@ public final class RenderUtil aoBrightnessXYZNPI = aoBrightnessXYZNPP; aoBrightnessXYZPNI = aoBrightnessXYZPNP; aoBrightnessXYZPPI = aoBrightnessXYZPPP; - } - else { + } else { aoLightValueScratchXZNI = aoLightValueScratchXZNN * fMin + aoLightValueScratchXZNP * fMax; aoLightValueScratchYZNI = aoLightValueScratchYZNN * fMin + aoLightValueScratchYZNP * fMax; aoLightValueScratchYZPI = aoLightValueScratchYZPN * fMin + aoLightValueScratchYZPP * fMax; @@ -552,7 +607,7 @@ public final class RenderUtil } } - private static void mixAOBrightnessLightValueX (float fMin, float fMax) { + private static void mixAOBrightnessLightValueX(float fMin, float fMax) { if (fMin == 1 && fMax == 0) { aoLightValueScratchXYIN = aoLightValueScratchXYNN; aoLightValueScratchXZIN = aoLightValueScratchXZNN; @@ -571,8 +626,7 @@ public final class RenderUtil aoBrightnessXYZINP = aoBrightnessXYZNNP; aoBrightnessXYZIPN = aoBrightnessXYZNPN; aoBrightnessXYZIPP = aoBrightnessXYZNPP; - } - else if (fMin == 0 && fMax == 1) { + } else if (fMin == 0 && fMax == 1) { aoLightValueScratchXYIN = aoLightValueScratchXYPN; aoLightValueScratchXZIN = aoLightValueScratchXZPN; aoLightValueScratchXZIP = aoLightValueScratchXZPP; @@ -590,8 +644,7 @@ public final class RenderUtil aoBrightnessXYZINP = aoBrightnessXYZPNP; aoBrightnessXYZIPN = aoBrightnessXYZPPN; aoBrightnessXYZIPP = aoBrightnessXYZPPP; - } - else { + } else { aoLightValueScratchXYIN = aoLightValueScratchXYNN * fMin + aoLightValueScratchXYPN * fMax; aoLightValueScratchXZIN = aoLightValueScratchXZNN * fMin + aoLightValueScratchXZPN * fMax; aoLightValueScratchXZIP = aoLightValueScratchXZNP * fMin + aoLightValueScratchXZPP * fMax; @@ -612,12 +665,12 @@ public final class RenderUtil } } - public static void renderFaceYNegAOPartial (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + public static void renderFaceYNegAOPartial( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (renderer.renderMinY <= 0.0D) - --y; + if (renderer.renderMinY <= 0.0D) --y; aoBrightnessXYNN = block.getMixedBrightnessForBlock(renderer.blockAccess, x - 1, y, z); aoBrightnessYZNN = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z - 1); @@ -643,56 +696,119 @@ public final class RenderUtil boolean blocksGrassYZNN = renderer.blockAccess.getBlock(x, y - 1, z - 1).getCanBlockGrass(); if (blocksGrassYZNN || blocksGrassXYNN) { - aoLightValueScratchXYZNNN = renderer.blockAccess.getBlock(x - 1, y, z - 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZNNN = + renderer.blockAccess.getBlock(x - 1, y, z - 1).getAmbientOcclusionLightValue(); aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(renderer.blockAccess, x - 1, y, z - 1); } if (blocksGrassYZNP || blocksGrassXYNN) { - aoLightValueScratchXYZNNP = renderer.blockAccess.getBlock(x - 1, y, z + 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZNNP = + renderer.blockAccess.getBlock(x - 1, y, z + 1).getAmbientOcclusionLightValue(); aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(renderer.blockAccess, x - 1, y, z + 1); } if (blocksGrassYZNN || blocksGrassXYPN) { - aoLightValueScratchXYZPNN = renderer.blockAccess.getBlock(x + 1, y, z - 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZPNN = + renderer.blockAccess.getBlock(x + 1, y, z - 1).getAmbientOcclusionLightValue(); aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(renderer.blockAccess, x + 1, y, z - 1); } if (blocksGrassYZNP || blocksGrassXYPN) { - aoLightValueScratchXYZPNP = renderer.blockAccess.getBlock(x + 1, y, z + 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZPNP = + renderer.blockAccess.getBlock(x + 1, y, z + 1).getAmbientOcclusionLightValue(); aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(renderer.blockAccess, x + 1, y, z + 1); } - if (renderer.renderMinY <= 0.0D) - ++y; + if (renderer.renderMinY <= 0.0D) ++y; int blockBrightness = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z); - if (renderer.renderMinY <= 0.0D || !renderer.blockAccess.getBlock(x, y - 1, z).isOpaqueCube()) + if (renderer.renderMinY <= 0.0D + || !renderer.blockAccess.getBlock(x, y - 1, z).isOpaqueCube()) blockBrightness = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y - 1, z); float aoOpposingBlock = renderer.blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(); - float aoXYZNNP = (aoLightValueScratchXYZNNP + aoLightValueScratchXYNN + aoLightValueScratchYZNP + aoOpposingBlock) / 4.0F; // TL - float aoXYZPNP = (aoLightValueScratchYZNP + aoOpposingBlock + aoLightValueScratchXYZPNP + aoLightValueScratchXYPN) / 4.0F; // TR - float aoXYZPNN = (aoOpposingBlock + aoLightValueScratchYZNN + aoLightValueScratchXYPN + aoLightValueScratchXYZPNN) / 4.0F; // BR - float aoXYZNNN = (aoLightValueScratchXYNN + aoLightValueScratchXYZNNN + aoOpposingBlock + aoLightValueScratchYZNN) / 4.0F; // BL + float aoXYZNNP = + (aoLightValueScratchXYZNNP + aoLightValueScratchXYNN + aoLightValueScratchYZNP + aoOpposingBlock) + / 4.0F; // TL + float aoXYZPNP = + (aoLightValueScratchYZNP + aoOpposingBlock + aoLightValueScratchXYZPNP + aoLightValueScratchXYPN) + / 4.0F; // TR + float aoXYZPNN = + (aoOpposingBlock + aoLightValueScratchYZNN + aoLightValueScratchXYPN + aoLightValueScratchXYZPNN) + / 4.0F; // BR + float aoXYZNNN = + (aoLightValueScratchXYNN + aoLightValueScratchXYZNNN + aoOpposingBlock + aoLightValueScratchYZNN) + / 4.0F; // BL - float aoTL = (float)((double)aoXYZNNP * renderer.renderMinX * (1.0D - renderer.renderMaxZ) + (double)aoXYZPNP * renderer.renderMinX * renderer.renderMaxZ + (double)aoXYZPNN * (1.0D - renderer.renderMinX) * renderer.renderMaxZ + (double)aoXYZNNN * (1.0D - renderer.renderMinX) * (1.0D - renderer.renderMaxZ)); - float aoBL = (float)((double)aoXYZNNP * renderer.renderMinX * (1.0D - renderer.renderMinZ) + (double)aoXYZPNP * renderer.renderMinX * renderer.renderMinZ + (double)aoXYZPNN * (1.0D - renderer.renderMinX) * renderer.renderMinZ + (double)aoXYZNNN * (1.0D - renderer.renderMinX) * (1.0D - renderer.renderMinZ)); - float aoBR = (float)((double)aoXYZNNP * renderer.renderMaxX * (1.0D - renderer.renderMinZ) + (double)aoXYZPNP * renderer.renderMaxX * renderer.renderMinZ + (double)aoXYZPNN * (1.0D - renderer.renderMaxX) * renderer.renderMinZ + (double)aoXYZNNN * (1.0D - renderer.renderMaxX) * (1.0D - renderer.renderMinZ)); - float aoTR = (float)((double)aoXYZNNP * renderer.renderMaxX * (1.0D - renderer.renderMaxZ) + (double)aoXYZPNP * renderer.renderMaxX * renderer.renderMaxZ + (double)aoXYZPNN * (1.0D - renderer.renderMaxX) * renderer.renderMaxZ + (double)aoXYZNNN * (1.0D - renderer.renderMaxX) * (1.0D - renderer.renderMaxZ)); + float aoTL = (float) ((double) aoXYZNNP * renderer.renderMinX * (1.0D - renderer.renderMaxZ) + + (double) aoXYZPNP * renderer.renderMinX * renderer.renderMaxZ + + (double) aoXYZPNN * (1.0D - renderer.renderMinX) * renderer.renderMaxZ + + (double) aoXYZNNN * (1.0D - renderer.renderMinX) * (1.0D - renderer.renderMaxZ)); + float aoBL = (float) ((double) aoXYZNNP * renderer.renderMinX * (1.0D - renderer.renderMinZ) + + (double) aoXYZPNP * renderer.renderMinX * renderer.renderMinZ + + (double) aoXYZPNN * (1.0D - renderer.renderMinX) * renderer.renderMinZ + + (double) aoXYZNNN * (1.0D - renderer.renderMinX) * (1.0D - renderer.renderMinZ)); + float aoBR = (float) ((double) aoXYZNNP * renderer.renderMaxX * (1.0D - renderer.renderMinZ) + + (double) aoXYZPNP * renderer.renderMaxX * renderer.renderMinZ + + (double) aoXYZPNN * (1.0D - renderer.renderMaxX) * renderer.renderMinZ + + (double) aoXYZNNN * (1.0D - renderer.renderMaxX) * (1.0D - renderer.renderMinZ)); + float aoTR = (float) ((double) aoXYZNNP * renderer.renderMaxX * (1.0D - renderer.renderMaxZ) + + (double) aoXYZPNP * renderer.renderMaxX * renderer.renderMaxZ + + (double) aoXYZPNN * (1.0D - renderer.renderMaxX) * renderer.renderMaxZ + + (double) aoXYZNNN * (1.0D - renderer.renderMaxX) * (1.0D - renderer.renderMaxZ)); - int brXYZNNP = renderer.getAoBrightness(aoBrightnessXYZNNP, aoBrightnessXYNN, aoBrightnessYZNP, blockBrightness); - int brXYZPNP = renderer.getAoBrightness(aoBrightnessYZNP, aoBrightnessXYZPNP, aoBrightnessXYPN, blockBrightness); - int brXYZPNN = renderer.getAoBrightness(aoBrightnessYZNN, aoBrightnessXYPN, aoBrightnessXYZPNN, blockBrightness); - int brXYZNNN = renderer.getAoBrightness(aoBrightnessXYNN, aoBrightnessXYZNNN, aoBrightnessYZNN, blockBrightness); + int brXYZNNP = + renderer.getAoBrightness(aoBrightnessXYZNNP, aoBrightnessXYNN, aoBrightnessYZNP, blockBrightness); + int brXYZPNP = + renderer.getAoBrightness(aoBrightnessYZNP, aoBrightnessXYZPNP, aoBrightnessXYPN, blockBrightness); + int brXYZPNN = + renderer.getAoBrightness(aoBrightnessYZNN, aoBrightnessXYPN, aoBrightnessXYZPNN, blockBrightness); + int brXYZNNN = + renderer.getAoBrightness(aoBrightnessXYNN, aoBrightnessXYZNNN, aoBrightnessYZNN, blockBrightness); - renderer.brightnessTopLeft = renderer.mixAoBrightness(brXYZNNP, brXYZNNN, brXYZPNN, brXYZPNP, renderer.renderMaxX * (1.0D - renderer.renderMaxZ), (1.0D - renderer.renderMaxX) * (1.0D - renderer.renderMaxZ), (1.0D - renderer.renderMaxX) * renderer.renderMaxZ, renderer.renderMaxX * renderer.renderMaxZ); - renderer.brightnessBottomLeft = renderer.mixAoBrightness(brXYZNNP, brXYZNNN, brXYZPNN, brXYZPNP, renderer.renderMaxX * (1.0D - renderer.renderMinZ), (1.0D - renderer.renderMaxX) * (1.0D - renderer.renderMinZ), (1.0D - renderer.renderMaxX) * renderer.renderMinZ, renderer.renderMaxX * renderer.renderMinZ); - renderer.brightnessBottomRight = renderer.mixAoBrightness(brXYZNNP, brXYZNNN, brXYZPNN, brXYZPNP, renderer.renderMinX * (1.0D - renderer.renderMinZ), (1.0D - renderer.renderMinX) * (1.0D - renderer.renderMinZ), (1.0D - renderer.renderMinX) * renderer.renderMinZ, renderer.renderMinX * renderer.renderMinZ); - renderer.brightnessTopRight = renderer.mixAoBrightness(brXYZNNP, brXYZNNN, brXYZPNN, brXYZPNP, renderer.renderMinX * (1.0D - renderer.renderMaxZ), (1.0D - renderer.renderMinX) * (1.0D - renderer.renderMaxZ), (1.0D - renderer.renderMinX) * renderer.renderMaxZ, renderer.renderMinX * renderer.renderMaxZ); + renderer.brightnessTopLeft = renderer.mixAoBrightness( + brXYZNNP, + brXYZNNN, + brXYZPNN, + brXYZPNP, + renderer.renderMaxX * (1.0D - renderer.renderMaxZ), + (1.0D - renderer.renderMaxX) * (1.0D - renderer.renderMaxZ), + (1.0D - renderer.renderMaxX) * renderer.renderMaxZ, + renderer.renderMaxX * renderer.renderMaxZ); + renderer.brightnessBottomLeft = renderer.mixAoBrightness( + brXYZNNP, + brXYZNNN, + brXYZPNN, + brXYZPNP, + renderer.renderMaxX * (1.0D - renderer.renderMinZ), + (1.0D - renderer.renderMaxX) * (1.0D - renderer.renderMinZ), + (1.0D - renderer.renderMaxX) * renderer.renderMinZ, + renderer.renderMaxX * renderer.renderMinZ); + renderer.brightnessBottomRight = renderer.mixAoBrightness( + brXYZNNP, + brXYZNNN, + brXYZPNN, + brXYZPNP, + renderer.renderMinX * (1.0D - renderer.renderMinZ), + (1.0D - renderer.renderMinX) * (1.0D - renderer.renderMinZ), + (1.0D - renderer.renderMinX) * renderer.renderMinZ, + renderer.renderMinX * renderer.renderMinZ); + renderer.brightnessTopRight = renderer.mixAoBrightness( + brXYZNNP, + brXYZNNN, + brXYZPNN, + brXYZPNP, + renderer.renderMinX * (1.0D - renderer.renderMaxZ), + (1.0D - renderer.renderMinX) * (1.0D - renderer.renderMaxZ), + (1.0D - renderer.renderMinX) * renderer.renderMaxZ, + renderer.renderMinX * renderer.renderMaxZ); - renderer.colorRedTopLeft = renderer.colorRedBottomLeft = renderer.colorRedBottomRight = renderer.colorRedTopRight = r * 0.5F; - renderer.colorGreenTopLeft = renderer.colorGreenBottomLeft = renderer.colorGreenBottomRight = renderer.colorGreenTopRight = g * 0.5F; - renderer.colorBlueTopLeft = renderer.colorBlueBottomLeft = renderer.colorBlueBottomRight = renderer.colorBlueTopRight = b * 0.5F; + renderer.colorRedTopLeft = + renderer.colorRedBottomLeft = renderer.colorRedBottomRight = renderer.colorRedTopRight = r * 0.5F; + renderer.colorGreenTopLeft = + renderer.colorGreenBottomLeft = renderer.colorGreenBottomRight = renderer.colorGreenTopRight = g * 0.5F; + renderer.colorBlueTopLeft = + renderer.colorBlueBottomLeft = renderer.colorBlueBottomRight = renderer.colorBlueTopRight = b * 0.5F; renderer.colorRedTopLeft *= aoTL; renderer.colorGreenTopLeft *= aoTL; @@ -708,16 +824,16 @@ public final class RenderUtil renderer.colorBlueTopRight *= aoTR; renderer.enableAO = true; - renderer.renderFaceYNeg(block, (double)x, (double)y, (double)z, icon); + renderer.renderFaceYNeg(block, (double) x, (double) y, (double) z, icon); renderer.enableAO = false; } - public static void renderFaceYPosAOPartial (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + public static void renderFaceYPosAOPartial( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (renderer.renderMaxY >= 1.0D) - ++y; + if (renderer.renderMaxY >= 1.0D) ++y; aoBrightnessXYNP = block.getMixedBrightnessForBlock(renderer.blockAccess, x - 1, y, z); aoBrightnessXYPP = block.getMixedBrightnessForBlock(renderer.blockAccess, x + 1, y, z); @@ -743,56 +859,91 @@ public final class RenderUtil boolean blocksGrassYZPN = renderer.blockAccess.getBlock(x, y + 1, z - 1).getCanBlockGrass(); if (blocksGrassYZPN || blocksGrassXYNP) { - aoLightValueScratchXYZNPN = renderer.blockAccess.getBlock(x - 1, y, z - 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZNPN = + renderer.blockAccess.getBlock(x - 1, y, z - 1).getAmbientOcclusionLightValue(); aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(renderer.blockAccess, x - 1, y, z - 1); } if (blocksGrassYZPN || blocksGrassXYPP) { - aoLightValueScratchXYZPPN = renderer.blockAccess.getBlock(x + 1, y, z - 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZPPN = + renderer.blockAccess.getBlock(x + 1, y, z - 1).getAmbientOcclusionLightValue(); aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(renderer.blockAccess, x + 1, y, z - 1); } if (blocksGrassYZPP || blocksGrassXYNP) { - aoLightValueScratchXYZNPP = renderer.blockAccess.getBlock(x - 1, y, z + 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZNPP = + renderer.blockAccess.getBlock(x - 1, y, z + 1).getAmbientOcclusionLightValue(); aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(renderer.blockAccess, x - 1, y, z + 1); } if (blocksGrassYZPP || blocksGrassXYPP) { - aoLightValueScratchXYZPPP = renderer.blockAccess.getBlock(x + 1, y, z + 1).getAmbientOcclusionLightValue(); + aoLightValueScratchXYZPPP = + renderer.blockAccess.getBlock(x + 1, y, z + 1).getAmbientOcclusionLightValue(); aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(renderer.blockAccess, x + 1, y, z + 1); } - if (renderer.renderMaxY >= 1.0D) - --y; + if (renderer.renderMaxY >= 1.0D) --y; int blockBrightness = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z); - if (renderer.renderMaxY >= 1.0D || !renderer.blockAccess.getBlock(x, y + 1, z).isOpaqueCube()) + if (renderer.renderMaxY >= 1.0D + || !renderer.blockAccess.getBlock(x, y + 1, z).isOpaqueCube()) blockBrightness = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y + 1, z); float aoOpposingBlock = renderer.blockAccess.getBlock(x, y + 1, z).getAmbientOcclusionLightValue(); - float aoXYZNPN = (aoLightValueScratchXYZNPP + aoLightValueScratchXYNP + aoLightValueScratchYZPP + aoOpposingBlock) / 4.0F; // TR - float aoXYZNPP = (aoLightValueScratchYZPP + aoOpposingBlock + aoLightValueScratchXYZPPP + aoLightValueScratchXYPP) / 4.0F; // TL - float aoXYZPPP = (aoOpposingBlock + aoLightValueScratchYZPN + aoLightValueScratchXYPP + aoLightValueScratchXYZPPN) / 4.0F; // BL - float aoXYZPPN = (aoLightValueScratchXYNP + aoLightValueScratchXYZNPN + aoOpposingBlock + aoLightValueScratchYZPN) / 4.0F; // BR + float aoXYZNPN = + (aoLightValueScratchXYZNPP + aoLightValueScratchXYNP + aoLightValueScratchYZPP + aoOpposingBlock) + / 4.0F; // TR + float aoXYZNPP = + (aoLightValueScratchYZPP + aoOpposingBlock + aoLightValueScratchXYZPPP + aoLightValueScratchXYPP) + / 4.0F; // TL + float aoXYZPPP = + (aoOpposingBlock + aoLightValueScratchYZPN + aoLightValueScratchXYPP + aoLightValueScratchXYZPPN) + / 4.0F; // BL + float aoXYZPPN = + (aoLightValueScratchXYNP + aoLightValueScratchXYZNPN + aoOpposingBlock + aoLightValueScratchYZPN) + / 4.0F; // BR - float aoTL = (float)((double)aoXYZPPP * renderer.renderMaxX * (1.0D - renderer.renderMaxZ) + (double)aoXYZNPP * renderer.renderMaxX * renderer.renderMaxZ + (double)aoXYZNPN * (1.0D - renderer.renderMaxX) * renderer.renderMaxZ + (double)aoXYZPPN * (1.0D - renderer.renderMaxX) * (1.0D - renderer.renderMaxZ)); - float aoBL = (float)((double)aoXYZPPP * renderer.renderMaxX * (1.0D - renderer.renderMinZ) + (double)aoXYZNPP * renderer.renderMaxX * renderer.renderMinZ + (double)aoXYZNPN * (1.0D - renderer.renderMaxX) * renderer.renderMinZ + (double)aoXYZPPN * (1.0D - renderer.renderMaxX) * (1.0D - renderer.renderMinZ)); - float aoBR = (float)((double)aoXYZPPP * renderer.renderMinX * (1.0D - renderer.renderMinZ) + (double)aoXYZNPP * renderer.renderMinX * renderer.renderMinZ + (double)aoXYZNPN * (1.0D - renderer.renderMinX) * renderer.renderMinZ + (double)aoXYZPPN * (1.0D - renderer.renderMinX) * (1.0D - renderer.renderMinZ)); - float aoTR = (float)((double)aoXYZPPP * renderer.renderMinX * (1.0D - renderer.renderMaxZ) + (double)aoXYZNPP * renderer.renderMinX * renderer.renderMaxZ + (double)aoXYZNPN * (1.0D - renderer.renderMinX) * renderer.renderMaxZ + (double)aoXYZPPN * (1.0D - renderer.renderMinX) * (1.0D - renderer.renderMaxZ)); + float aoTL = (float) ((double) aoXYZPPP * renderer.renderMaxX * (1.0D - renderer.renderMaxZ) + + (double) aoXYZNPP * renderer.renderMaxX * renderer.renderMaxZ + + (double) aoXYZNPN * (1.0D - renderer.renderMaxX) * renderer.renderMaxZ + + (double) aoXYZPPN * (1.0D - renderer.renderMaxX) * (1.0D - renderer.renderMaxZ)); + float aoBL = (float) ((double) aoXYZPPP * renderer.renderMaxX * (1.0D - renderer.renderMinZ) + + (double) aoXYZNPP * renderer.renderMaxX * renderer.renderMinZ + + (double) aoXYZNPN * (1.0D - renderer.renderMaxX) * renderer.renderMinZ + + (double) aoXYZPPN * (1.0D - renderer.renderMaxX) * (1.0D - renderer.renderMinZ)); + float aoBR = (float) ((double) aoXYZPPP * renderer.renderMinX * (1.0D - renderer.renderMinZ) + + (double) aoXYZNPP * renderer.renderMinX * renderer.renderMinZ + + (double) aoXYZNPN * (1.0D - renderer.renderMinX) * renderer.renderMinZ + + (double) aoXYZPPN * (1.0D - renderer.renderMinX) * (1.0D - renderer.renderMinZ)); + float aoTR = (float) ((double) aoXYZPPP * renderer.renderMinX * (1.0D - renderer.renderMaxZ) + + (double) aoXYZNPP * renderer.renderMinX * renderer.renderMaxZ + + (double) aoXYZNPN * (1.0D - renderer.renderMinX) * renderer.renderMaxZ + + (double) aoXYZPPN * (1.0D - renderer.renderMinX) * (1.0D - renderer.renderMaxZ)); - int brXYZPPN = renderer.getAoBrightness(aoBrightnessXYNP, aoBrightnessXYZNPP, aoBrightnessYZPP, blockBrightness); - int brXYZNPN = renderer.getAoBrightness(aoBrightnessYZPP, aoBrightnessXYPP, aoBrightnessXYZPPP, blockBrightness); - int brXYZNPP = renderer.getAoBrightness(aoBrightnessYZPN, aoBrightnessXYZPPN, aoBrightnessXYPP, blockBrightness); - int brXYZPPP = renderer.getAoBrightness(aoBrightnessXYZNPN, aoBrightnessXYNP, aoBrightnessYZPN, blockBrightness); + int brXYZPPN = + renderer.getAoBrightness(aoBrightnessXYNP, aoBrightnessXYZNPP, aoBrightnessYZPP, blockBrightness); + int brXYZNPN = + renderer.getAoBrightness(aoBrightnessYZPP, aoBrightnessXYPP, aoBrightnessXYZPPP, blockBrightness); + int brXYZNPP = + renderer.getAoBrightness(aoBrightnessYZPN, aoBrightnessXYZPPN, aoBrightnessXYPP, blockBrightness); + int brXYZPPP = + renderer.getAoBrightness(aoBrightnessXYZNPN, aoBrightnessXYNP, aoBrightnessYZPN, blockBrightness); - renderer.brightnessTopLeft = mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, renderer.renderMaxZ, renderer.renderMaxX); - renderer.brightnessBottomLeft = mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, renderer.renderMinZ, renderer.renderMaxX); - renderer.brightnessBottomRight = mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, renderer.renderMinZ, renderer.renderMinX); - renderer.brightnessTopRight = mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, renderer.renderMaxZ, renderer.renderMinX); + renderer.brightnessTopLeft = + mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, renderer.renderMaxZ, renderer.renderMaxX); + renderer.brightnessBottomLeft = + mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, renderer.renderMinZ, renderer.renderMaxX); + renderer.brightnessBottomRight = + mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, renderer.renderMinZ, renderer.renderMinX); + renderer.brightnessTopRight = + mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, renderer.renderMaxZ, renderer.renderMinX); - renderer.colorRedTopLeft = renderer.colorRedBottomLeft = renderer.colorRedBottomRight = renderer.colorRedTopRight = r; - renderer.colorGreenTopLeft = renderer.colorGreenBottomLeft = renderer.colorGreenBottomRight = renderer.colorGreenTopRight = g; - renderer.colorBlueTopLeft = renderer.colorBlueBottomLeft = renderer.colorBlueBottomRight = renderer.colorBlueTopRight = b; + renderer.colorRedTopLeft = + renderer.colorRedBottomLeft = renderer.colorRedBottomRight = renderer.colorRedTopRight = r; + renderer.colorGreenTopLeft = + renderer.colorGreenBottomLeft = renderer.colorGreenBottomRight = renderer.colorGreenTopRight = g; + renderer.colorBlueTopLeft = + renderer.colorBlueBottomLeft = renderer.colorBlueBottomRight = renderer.colorBlueTopRight = b; renderer.colorRedTopLeft *= aoTL; renderer.colorGreenTopLeft *= aoTL; @@ -812,53 +963,120 @@ public final class RenderUtil renderer.enableAO = false; } - public static void renderFaceZNegAOPartial (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + public static void renderFaceZNegAOPartial( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); int zGrass = (renderer.renderMinZ <= 0) ? z - 1 : z; - boolean blocksGrassXZPN = !renderer.blockAccess.getBlock(x + 1, y, zGrass).getCanBlockGrass(); - boolean blocksGrassXZNN = !renderer.blockAccess.getBlock(x - 1, y, zGrass).getCanBlockGrass(); - boolean blocksGrassYZPN = !renderer.blockAccess.getBlock(x, y + 1, zGrass).getCanBlockGrass(); - boolean blocksGrassYZNN = !renderer.blockAccess.getBlock(x, y - 1, zGrass).getCanBlockGrass(); + boolean blocksGrassXZPN = + !renderer.blockAccess.getBlock(x + 1, y, zGrass).getCanBlockGrass(); + boolean blocksGrassXZNN = + !renderer.blockAccess.getBlock(x - 1, y, zGrass).getCanBlockGrass(); + boolean blocksGrassYZPN = + !renderer.blockAccess.getBlock(x, y + 1, zGrass).getCanBlockGrass(); + boolean blocksGrassYZNN = + !renderer.blockAccess.getBlock(x, y - 1, zGrass).getCanBlockGrass(); if (renderer.renderMinZ > 0) - setupAOBrightnessZNeg(renderer, block, x, y, z, blocksGrassXZPN, blocksGrassXZNN, blocksGrassYZPN, blocksGrassYZNN); + setupAOBrightnessZNeg( + renderer, block, x, y, z, blocksGrassXZPN, blocksGrassXZNN, blocksGrassYZPN, blocksGrassYZNN); - setupAOBrightnessZPos(renderer, block, x, y, z - 1, blocksGrassXZPN, blocksGrassXZNN, blocksGrassYZPN, blocksGrassYZNN); + setupAOBrightnessZPos( + renderer, block, x, y, z - 1, blocksGrassXZPN, blocksGrassXZNN, blocksGrassYZPN, blocksGrassYZNN); - float zClamp = MathHelper.clamp_float((float)renderer.renderMinZ, 0, 1); + float zClamp = MathHelper.clamp_float((float) renderer.renderMinZ, 0, 1); mixAOBrightnessLightValueZ(zClamp, 1 - zClamp); int blockBrightness = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z); - if (renderer.renderMinZ <= 0.0D || !renderer.blockAccess.getBlock(x, y, z - 1).isOpaqueCube()) + if (renderer.renderMinZ <= 0.0D + || !renderer.blockAccess.getBlock(x, y, z - 1).isOpaqueCube()) blockBrightness = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z - 1); float aoOpposingBlock = renderer.blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(); - float aoXYZNPN = (aoLightValueScratchXZNI + aoLightValueScratchXYZNPI + aoOpposingBlock + aoLightValueScratchYZPI) / 4.0F; - float aoXYZPPN = (aoOpposingBlock + aoLightValueScratchYZPI + aoLightValueScratchXZPI + aoLightValueScratchXYZPPI) / 4.0F; - float aoXYZPNN = (aoLightValueScratchYZNI + aoOpposingBlock + aoLightValueScratchXYZPNI + aoLightValueScratchXZPI) / 4.0F; - float aoXYZNNN = (aoLightValueScratchXYZNNI + aoLightValueScratchXZNI + aoLightValueScratchYZNI + aoOpposingBlock) / 4.0F; + float aoXYZNPN = + (aoLightValueScratchXZNI + aoLightValueScratchXYZNPI + aoOpposingBlock + aoLightValueScratchYZPI) + / 4.0F; + float aoXYZPPN = + (aoOpposingBlock + aoLightValueScratchYZPI + aoLightValueScratchXZPI + aoLightValueScratchXYZPPI) + / 4.0F; + float aoXYZPNN = + (aoLightValueScratchYZNI + aoOpposingBlock + aoLightValueScratchXYZPNI + aoLightValueScratchXZPI) + / 4.0F; + float aoXYZNNN = + (aoLightValueScratchXYZNNI + aoLightValueScratchXZNI + aoLightValueScratchYZNI + aoOpposingBlock) + / 4.0F; - float aoTL = (float)((double)aoXYZNPN * renderer.renderMaxY * (1.0D - renderer.renderMinX) + (double)aoXYZPPN * renderer.renderMaxY * renderer.renderMinX + (double)aoXYZPNN * (1.0D - renderer.renderMaxY) * renderer.renderMinX + (double)aoXYZNNN * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinX)); - float aoBL = (float)((double)aoXYZNPN * renderer.renderMaxY * (1.0D - renderer.renderMaxX) + (double)aoXYZPPN * renderer.renderMaxY * renderer.renderMaxX + (double)aoXYZPNN * (1.0D - renderer.renderMaxY) * renderer.renderMaxX + (double)aoXYZNNN * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxX)); - float aoBR = (float)((double)aoXYZNPN * renderer.renderMinY * (1.0D - renderer.renderMaxX) + (double)aoXYZPPN * renderer.renderMinY * renderer.renderMaxX + (double)aoXYZPNN * (1.0D - renderer.renderMinY) * renderer.renderMaxX + (double)aoXYZNNN * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxX)); - float aoTR = (float)((double)aoXYZNPN * renderer.renderMinY * (1.0D - renderer.renderMinX) + (double)aoXYZPPN * renderer.renderMinY * renderer.renderMinX + (double)aoXYZPNN * (1.0D - renderer.renderMinY) * renderer.renderMinX + (double)aoXYZNNN * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinX)); + float aoTL = (float) ((double) aoXYZNPN * renderer.renderMaxY * (1.0D - renderer.renderMinX) + + (double) aoXYZPPN * renderer.renderMaxY * renderer.renderMinX + + (double) aoXYZPNN * (1.0D - renderer.renderMaxY) * renderer.renderMinX + + (double) aoXYZNNN * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinX)); + float aoBL = (float) ((double) aoXYZNPN * renderer.renderMaxY * (1.0D - renderer.renderMaxX) + + (double) aoXYZPPN * renderer.renderMaxY * renderer.renderMaxX + + (double) aoXYZPNN * (1.0D - renderer.renderMaxY) * renderer.renderMaxX + + (double) aoXYZNNN * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxX)); + float aoBR = (float) ((double) aoXYZNPN * renderer.renderMinY * (1.0D - renderer.renderMaxX) + + (double) aoXYZPPN * renderer.renderMinY * renderer.renderMaxX + + (double) aoXYZPNN * (1.0D - renderer.renderMinY) * renderer.renderMaxX + + (double) aoXYZNNN * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxX)); + float aoTR = (float) ((double) aoXYZNPN * renderer.renderMinY * (1.0D - renderer.renderMinX) + + (double) aoXYZPPN * renderer.renderMinY * renderer.renderMinX + + (double) aoXYZPNN * (1.0D - renderer.renderMinY) * renderer.renderMinX + + (double) aoXYZNNN * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinX)); - int brXYZNPN = renderer.getAoBrightness(aoBrightnessXZNI, aoBrightnessXYZNPI, aoBrightnessYZPI, blockBrightness); - int brXYZPPN = renderer.getAoBrightness(aoBrightnessYZPI, aoBrightnessXZPI, aoBrightnessXYZPPI, blockBrightness); - int brXYZPNN = renderer.getAoBrightness(aoBrightnessYZNI, aoBrightnessXYZPNI, aoBrightnessXZPI, blockBrightness); - int brXYZNNN = renderer.getAoBrightness(aoBrightnessXYZNNI, aoBrightnessXZNI, aoBrightnessYZNI, blockBrightness); + int brXYZNPN = + renderer.getAoBrightness(aoBrightnessXZNI, aoBrightnessXYZNPI, aoBrightnessYZPI, blockBrightness); + int brXYZPPN = + renderer.getAoBrightness(aoBrightnessYZPI, aoBrightnessXZPI, aoBrightnessXYZPPI, blockBrightness); + int brXYZPNN = + renderer.getAoBrightness(aoBrightnessYZNI, aoBrightnessXYZPNI, aoBrightnessXZPI, blockBrightness); + int brXYZNNN = + renderer.getAoBrightness(aoBrightnessXYZNNI, aoBrightnessXZNI, aoBrightnessYZNI, blockBrightness); - renderer.brightnessTopLeft = renderer.mixAoBrightness(brXYZNPN, brXYZPPN, brXYZPNN, brXYZNNN, renderer.renderMaxY * (1.0D - renderer.renderMinX), renderer.renderMaxY * renderer.renderMinX, (1.0D - renderer.renderMaxY) * renderer.renderMinX, (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinX)); - renderer.brightnessBottomLeft = renderer.mixAoBrightness(brXYZNPN, brXYZPPN, brXYZPNN, brXYZNNN, renderer.renderMaxY * (1.0D - renderer.renderMaxX), renderer.renderMaxY * renderer.renderMaxX, (1.0D - renderer.renderMaxY) * renderer.renderMaxX, (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxX)); - renderer.brightnessBottomRight = renderer.mixAoBrightness(brXYZNPN, brXYZPPN, brXYZPNN, brXYZNNN, renderer.renderMinY * (1.0D - renderer.renderMaxX), renderer.renderMinY * renderer.renderMaxX, (1.0D - renderer.renderMinY) * renderer.renderMaxX, (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxX)); - renderer.brightnessTopRight = renderer.mixAoBrightness(brXYZNPN, brXYZPPN, brXYZPNN, brXYZNNN, renderer.renderMinY * (1.0D - renderer.renderMinX), renderer.renderMinY * renderer.renderMinX, (1.0D - renderer.renderMinY) * renderer.renderMinX, (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinX)); + renderer.brightnessTopLeft = renderer.mixAoBrightness( + brXYZNPN, + brXYZPPN, + brXYZPNN, + brXYZNNN, + renderer.renderMaxY * (1.0D - renderer.renderMinX), + renderer.renderMaxY * renderer.renderMinX, + (1.0D - renderer.renderMaxY) * renderer.renderMinX, + (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinX)); + renderer.brightnessBottomLeft = renderer.mixAoBrightness( + brXYZNPN, + brXYZPPN, + brXYZPNN, + brXYZNNN, + renderer.renderMaxY * (1.0D - renderer.renderMaxX), + renderer.renderMaxY * renderer.renderMaxX, + (1.0D - renderer.renderMaxY) * renderer.renderMaxX, + (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxX)); + renderer.brightnessBottomRight = renderer.mixAoBrightness( + brXYZNPN, + brXYZPPN, + brXYZPNN, + brXYZNNN, + renderer.renderMinY * (1.0D - renderer.renderMaxX), + renderer.renderMinY * renderer.renderMaxX, + (1.0D - renderer.renderMinY) * renderer.renderMaxX, + (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxX)); + renderer.brightnessTopRight = renderer.mixAoBrightness( + brXYZNPN, + brXYZPPN, + brXYZPNN, + brXYZNNN, + renderer.renderMinY * (1.0D - renderer.renderMinX), + renderer.renderMinY * renderer.renderMinX, + (1.0D - renderer.renderMinY) * renderer.renderMinX, + (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinX)); - renderer.colorRedTopLeft = renderer.colorRedBottomLeft = renderer.colorRedBottomRight = renderer.colorRedTopRight = r * 0.8F; - renderer.colorGreenTopLeft = renderer.colorGreenBottomLeft = renderer.colorGreenBottomRight = renderer.colorGreenTopRight = g * 0.8F; - renderer.colorBlueTopLeft = renderer.colorBlueBottomLeft = renderer.colorBlueBottomRight = renderer.colorBlueTopRight = b * 0.8F; + renderer.colorRedTopLeft = + renderer.colorRedBottomLeft = renderer.colorRedBottomRight = renderer.colorRedTopRight = r * 0.8F; + renderer.colorGreenTopLeft = + renderer.colorGreenBottomLeft = renderer.colorGreenBottomRight = renderer.colorGreenTopRight = g * 0.8F; + renderer.colorBlueTopLeft = + renderer.colorBlueBottomLeft = renderer.colorBlueBottomRight = renderer.colorBlueTopRight = b * 0.8F; renderer.colorRedTopLeft *= aoTL; renderer.colorGreenTopLeft *= aoTL; @@ -874,59 +1092,124 @@ public final class RenderUtil renderer.colorBlueTopRight *= aoTR; renderer.enableAO = true; - renderer.renderFaceZNeg(block, (double)x, (double)y, (double)z, icon); + renderer.renderFaceZNeg(block, (double) x, (double) y, (double) z, icon); renderer.enableAO = false; } - - - public static void renderFaceZPosAOPartial (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + public static void renderFaceZPosAOPartial( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); int zGrass = (renderer.renderMaxZ >= 1) ? z + 1 : z; - boolean blocksGrassXZPP = !renderer.blockAccess.getBlock(x + 1, y, zGrass).getCanBlockGrass(); - boolean blocksGrassXZNP = !renderer.blockAccess.getBlock(x - 1, y, zGrass).getCanBlockGrass(); - boolean blocksGrassYZPP = !renderer.blockAccess.getBlock(x, y + 1, zGrass).getCanBlockGrass(); - boolean blocksGrassYZNP = !renderer.blockAccess.getBlock(x, y - 1, zGrass).getCanBlockGrass(); + boolean blocksGrassXZPP = + !renderer.blockAccess.getBlock(x + 1, y, zGrass).getCanBlockGrass(); + boolean blocksGrassXZNP = + !renderer.blockAccess.getBlock(x - 1, y, zGrass).getCanBlockGrass(); + boolean blocksGrassYZPP = + !renderer.blockAccess.getBlock(x, y + 1, zGrass).getCanBlockGrass(); + boolean blocksGrassYZNP = + !renderer.blockAccess.getBlock(x, y - 1, zGrass).getCanBlockGrass(); if (renderer.renderMaxZ < 1) - setupAOBrightnessZPos(renderer, block, x, y, z, blocksGrassXZPP, blocksGrassXZNP, blocksGrassYZPP, blocksGrassYZNP); + setupAOBrightnessZPos( + renderer, block, x, y, z, blocksGrassXZPP, blocksGrassXZNP, blocksGrassYZPP, blocksGrassYZNP); - setupAOBrightnessZNeg(renderer, block, x, y, z + 1, blocksGrassXZPP, blocksGrassXZNP, blocksGrassYZPP, blocksGrassYZNP); + setupAOBrightnessZNeg( + renderer, block, x, y, z + 1, blocksGrassXZPP, blocksGrassXZNP, blocksGrassYZPP, blocksGrassYZNP); - float zClamp = MathHelper.clamp_float((float)renderer.renderMaxZ, 0, 1); + float zClamp = MathHelper.clamp_float((float) renderer.renderMaxZ, 0, 1); mixAOBrightnessLightValueZ(zClamp, 1 - zClamp); int blockBrightness = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z); - if (renderer.renderMaxZ >= 1.0D || !renderer.blockAccess.getBlock(x, y, z + 1).isOpaqueCube()) + if (renderer.renderMaxZ >= 1.0D + || !renderer.blockAccess.getBlock(x, y, z + 1).isOpaqueCube()) blockBrightness = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z + 1); float aoOpposingBlock = renderer.blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(); - float aoXYZNPP = (aoLightValueScratchXZNI + aoLightValueScratchXYZNPI + aoOpposingBlock + aoLightValueScratchYZPI) / 4.0F; - float aoXYZPPP = (aoOpposingBlock + aoLightValueScratchYZPI + aoLightValueScratchXZPI + aoLightValueScratchXYZPPI) / 4.0F; - float aoXYZPNP = (aoLightValueScratchYZNI + aoOpposingBlock + aoLightValueScratchXYZPNI + aoLightValueScratchXZPI) / 4.0F; - float aoXYZNNP = (aoLightValueScratchXYZNNI + aoLightValueScratchXZNI + aoLightValueScratchYZNI + aoOpposingBlock) / 4.0F; + float aoXYZNPP = + (aoLightValueScratchXZNI + aoLightValueScratchXYZNPI + aoOpposingBlock + aoLightValueScratchYZPI) + / 4.0F; + float aoXYZPPP = + (aoOpposingBlock + aoLightValueScratchYZPI + aoLightValueScratchXZPI + aoLightValueScratchXYZPPI) + / 4.0F; + float aoXYZPNP = + (aoLightValueScratchYZNI + aoOpposingBlock + aoLightValueScratchXYZPNI + aoLightValueScratchXZPI) + / 4.0F; + float aoXYZNNP = + (aoLightValueScratchXYZNNI + aoLightValueScratchXZNI + aoLightValueScratchYZNI + aoOpposingBlock) + / 4.0F; - float aoTL = (float)((double)aoXYZNPP * renderer.renderMaxY * (1.0D - renderer.renderMinX) + (double)aoXYZPPP * renderer.renderMaxY * renderer.renderMinX + (double)aoXYZPNP * (1.0D - renderer.renderMaxY) * renderer.renderMinX + (double)aoXYZNNP * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinX)); - float aoBL = (float)((double)aoXYZNPP * renderer.renderMinY * (1.0D - renderer.renderMinX) + (double)aoXYZPPP * renderer.renderMinY * renderer.renderMinX + (double)aoXYZPNP * (1.0D - renderer.renderMinY) * renderer.renderMinX + (double)aoXYZNNP * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinX)); - float aoBR = (float)((double)aoXYZNPP * renderer.renderMinY * (1.0D - renderer.renderMaxX) + (double)aoXYZPPP * renderer.renderMinY * renderer.renderMaxX + (double)aoXYZPNP * (1.0D - renderer.renderMinY) * renderer.renderMaxX + (double)aoXYZNNP * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxX)); - float aoTR = (float)((double)aoXYZNPP * renderer.renderMaxY * (1.0D - renderer.renderMaxX) + (double)aoXYZPPP * renderer.renderMaxY * renderer.renderMaxX + (double)aoXYZPNP * (1.0D - renderer.renderMaxY) * renderer.renderMaxX + (double)aoXYZNNP * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxX)); + float aoTL = (float) ((double) aoXYZNPP * renderer.renderMaxY * (1.0D - renderer.renderMinX) + + (double) aoXYZPPP * renderer.renderMaxY * renderer.renderMinX + + (double) aoXYZPNP * (1.0D - renderer.renderMaxY) * renderer.renderMinX + + (double) aoXYZNNP * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinX)); + float aoBL = (float) ((double) aoXYZNPP * renderer.renderMinY * (1.0D - renderer.renderMinX) + + (double) aoXYZPPP * renderer.renderMinY * renderer.renderMinX + + (double) aoXYZPNP * (1.0D - renderer.renderMinY) * renderer.renderMinX + + (double) aoXYZNNP * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinX)); + float aoBR = (float) ((double) aoXYZNPP * renderer.renderMinY * (1.0D - renderer.renderMaxX) + + (double) aoXYZPPP * renderer.renderMinY * renderer.renderMaxX + + (double) aoXYZPNP * (1.0D - renderer.renderMinY) * renderer.renderMaxX + + (double) aoXYZNNP * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxX)); + float aoTR = (float) ((double) aoXYZNPP * renderer.renderMaxY * (1.0D - renderer.renderMaxX) + + (double) aoXYZPPP * renderer.renderMaxY * renderer.renderMaxX + + (double) aoXYZPNP * (1.0D - renderer.renderMaxY) * renderer.renderMaxX + + (double) aoXYZNNP * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxX)); - int brXYZNPP = renderer.getAoBrightness(aoBrightnessXZNI, aoBrightnessXYZNPI, aoBrightnessYZPI, blockBrightness); - int brXYZPPP = renderer.getAoBrightness(aoBrightnessYZPI, aoBrightnessXZPI, aoBrightnessXYZPPI, blockBrightness); - int brXYZPNP = renderer.getAoBrightness(aoBrightnessYZNI, aoBrightnessXYZPNI, aoBrightnessXZPI, blockBrightness); - int brXYZNNP = renderer.getAoBrightness(aoBrightnessXYZNNI, aoBrightnessXZNI, aoBrightnessYZNI, blockBrightness); + int brXYZNPP = + renderer.getAoBrightness(aoBrightnessXZNI, aoBrightnessXYZNPI, aoBrightnessYZPI, blockBrightness); + int brXYZPPP = + renderer.getAoBrightness(aoBrightnessYZPI, aoBrightnessXZPI, aoBrightnessXYZPPI, blockBrightness); + int brXYZPNP = + renderer.getAoBrightness(aoBrightnessYZNI, aoBrightnessXYZPNI, aoBrightnessXZPI, blockBrightness); + int brXYZNNP = + renderer.getAoBrightness(aoBrightnessXYZNNI, aoBrightnessXZNI, aoBrightnessYZNI, blockBrightness); - renderer.brightnessTopLeft = renderer.mixAoBrightness(brXYZNPP, brXYZNNP, brXYZPNP, brXYZPPP, renderer.renderMaxY * (1.0D - renderer.renderMinX), (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinX), (1.0D - renderer.renderMaxY) * renderer.renderMinX, renderer.renderMaxY * renderer.renderMinX); - renderer.brightnessBottomLeft = renderer.mixAoBrightness(brXYZNPP, brXYZNNP, brXYZPNP, brXYZPPP, renderer.renderMinY * (1.0D - renderer.renderMinX), (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinX), (1.0D - renderer.renderMinY) * renderer.renderMinX, renderer.renderMinY * renderer.renderMinX); - renderer.brightnessBottomRight = renderer.mixAoBrightness(brXYZNPP, brXYZNNP, brXYZPNP, brXYZPPP, renderer.renderMinY * (1.0D - renderer.renderMaxX), (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxX), (1.0D - renderer.renderMinY) * renderer.renderMaxX, renderer.renderMinY * renderer.renderMaxX); - renderer.brightnessTopRight = renderer.mixAoBrightness(brXYZNPP, brXYZNNP, brXYZPNP, brXYZPPP, renderer.renderMaxY * (1.0D - renderer.renderMaxX), (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxX), (1.0D - renderer.renderMaxY) * renderer.renderMaxX, renderer.renderMaxY * renderer.renderMaxX); + renderer.brightnessTopLeft = renderer.mixAoBrightness( + brXYZNPP, + brXYZNNP, + brXYZPNP, + brXYZPPP, + renderer.renderMaxY * (1.0D - renderer.renderMinX), + (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinX), + (1.0D - renderer.renderMaxY) * renderer.renderMinX, + renderer.renderMaxY * renderer.renderMinX); + renderer.brightnessBottomLeft = renderer.mixAoBrightness( + brXYZNPP, + brXYZNNP, + brXYZPNP, + brXYZPPP, + renderer.renderMinY * (1.0D - renderer.renderMinX), + (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinX), + (1.0D - renderer.renderMinY) * renderer.renderMinX, + renderer.renderMinY * renderer.renderMinX); + renderer.brightnessBottomRight = renderer.mixAoBrightness( + brXYZNPP, + brXYZNNP, + brXYZPNP, + brXYZPPP, + renderer.renderMinY * (1.0D - renderer.renderMaxX), + (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxX), + (1.0D - renderer.renderMinY) * renderer.renderMaxX, + renderer.renderMinY * renderer.renderMaxX); + renderer.brightnessTopRight = renderer.mixAoBrightness( + brXYZNPP, + brXYZNNP, + brXYZPNP, + brXYZPPP, + renderer.renderMaxY * (1.0D - renderer.renderMaxX), + (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxX), + (1.0D - renderer.renderMaxY) * renderer.renderMaxX, + renderer.renderMaxY * renderer.renderMaxX); - renderer.colorRedTopLeft = renderer.colorRedBottomLeft = renderer.colorRedBottomRight = renderer.colorRedTopRight = r * 0.8F; - renderer.colorGreenTopLeft = renderer.colorGreenBottomLeft = renderer.colorGreenBottomRight = renderer.colorGreenTopRight = g * 0.8F; - renderer.colorBlueTopLeft = renderer.colorBlueBottomLeft = renderer.colorBlueBottomRight = renderer.colorBlueTopRight = b * 0.8F; + renderer.colorRedTopLeft = + renderer.colorRedBottomLeft = renderer.colorRedBottomRight = renderer.colorRedTopRight = r * 0.8F; + renderer.colorGreenTopLeft = + renderer.colorGreenBottomLeft = renderer.colorGreenBottomRight = renderer.colorGreenTopRight = g * 0.8F; + renderer.colorBlueTopLeft = + renderer.colorBlueBottomLeft = renderer.colorBlueBottomRight = renderer.colorBlueTopRight = b * 0.8F; renderer.colorRedTopLeft *= aoTL; renderer.colorGreenTopLeft *= aoTL; @@ -946,53 +1229,120 @@ public final class RenderUtil renderer.enableAO = false; } - public static void renderFaceXNegAOPartial (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + public static void renderFaceXNegAOPartial( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); int xGrass = (renderer.renderMinX <= 0) ? x - 1 : x; - boolean blocksGrassXYNP = !renderer.blockAccess.getBlock(xGrass, y + 1, z).getCanBlockGrass(); - boolean blocksGrassXYNN = !renderer.blockAccess.getBlock(xGrass, y - 1, z).getCanBlockGrass(); - boolean blocksGrassXZNN = !renderer.blockAccess.getBlock(xGrass, y, z - 1).getCanBlockGrass(); - boolean blocksGrassXZNP = !renderer.blockAccess.getBlock(xGrass, y, z + 1).getCanBlockGrass(); + boolean blocksGrassXYNP = + !renderer.blockAccess.getBlock(xGrass, y + 1, z).getCanBlockGrass(); + boolean blocksGrassXYNN = + !renderer.blockAccess.getBlock(xGrass, y - 1, z).getCanBlockGrass(); + boolean blocksGrassXZNN = + !renderer.blockAccess.getBlock(xGrass, y, z - 1).getCanBlockGrass(); + boolean blocksGrassXZNP = + !renderer.blockAccess.getBlock(xGrass, y, z + 1).getCanBlockGrass(); if (renderer.renderMinX > 0) - setupAOBrightnessXNeg(renderer, block, x, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + setupAOBrightnessXNeg( + renderer, block, x, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); - setupAOBrightnessXPos(renderer, block, x - 1, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + setupAOBrightnessXPos( + renderer, block, x - 1, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); - float xClamp = MathHelper.clamp_float((float)renderer.renderMinX, 0, 1); + float xClamp = MathHelper.clamp_float((float) renderer.renderMinX, 0, 1); mixAOBrightnessLightValueX(xClamp, 1 - xClamp); int blockBrightness = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z); - if (renderer.renderMinX <= 0.0D || !renderer.blockAccess.getBlock(x - 1, y, z).isOpaqueCube()) + if (renderer.renderMinX <= 0.0D + || !renderer.blockAccess.getBlock(x - 1, y, z).isOpaqueCube()) blockBrightness = block.getMixedBrightnessForBlock(renderer.blockAccess, x - 1, y, z); float aoOpposingBlock = renderer.blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(); - float aoXYZNNP = (aoLightValueScratchXYIN + aoLightValueScratchXYZINP + aoOpposingBlock + aoLightValueScratchXZIP) / 4.0F; - float aoXYZNPP = (aoOpposingBlock + aoLightValueScratchXZIP + aoLightValueScratchXYIP + aoLightValueScratchXYZIPP) / 4.0F; - float aoXYZNPN = (aoLightValueScratchXZIN + aoOpposingBlock + aoLightValueScratchXYZIPN + aoLightValueScratchXYIP) / 4.0F; - float aoXYZNNN = (aoLightValueScratchXYZINN + aoLightValueScratchXYIN + aoLightValueScratchXZIN + aoOpposingBlock) / 4.0F; + float aoXYZNNP = + (aoLightValueScratchXYIN + aoLightValueScratchXYZINP + aoOpposingBlock + aoLightValueScratchXZIP) + / 4.0F; + float aoXYZNPP = + (aoOpposingBlock + aoLightValueScratchXZIP + aoLightValueScratchXYIP + aoLightValueScratchXYZIPP) + / 4.0F; + float aoXYZNPN = + (aoLightValueScratchXZIN + aoOpposingBlock + aoLightValueScratchXYZIPN + aoLightValueScratchXYIP) + / 4.0F; + float aoXYZNNN = + (aoLightValueScratchXYZINN + aoLightValueScratchXYIN + aoLightValueScratchXZIN + aoOpposingBlock) + / 4.0F; - float aoTL = (float)((double)aoXYZNPP * renderer.renderMaxY * renderer.renderMaxZ + (double)aoXYZNPN * renderer.renderMaxY * (1.0D - renderer.renderMaxZ) + (double)aoXYZNNN * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxZ) + (double)aoXYZNNP * (1.0D - renderer.renderMaxY) * renderer.renderMaxZ); - float aoBL = (float)((double)aoXYZNPP * renderer.renderMaxY * renderer.renderMinZ + (double)aoXYZNPN * renderer.renderMaxY * (1.0D - renderer.renderMinZ) + (double)aoXYZNNN * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinZ) + (double)aoXYZNNP * (1.0D - renderer.renderMaxY) * renderer.renderMinZ); - float aoBR = (float)((double)aoXYZNPP * renderer.renderMinY * renderer.renderMinZ + (double)aoXYZNPN * renderer.renderMinY * (1.0D - renderer.renderMinZ) + (double)aoXYZNNN * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinZ) + (double)aoXYZNNP * (1.0D - renderer.renderMinY) * renderer.renderMinZ); - float aoTR = (float)((double)aoXYZNPP * renderer.renderMinY * renderer.renderMaxZ + (double)aoXYZNPN * renderer.renderMinY * (1.0D - renderer.renderMaxZ) + (double)aoXYZNNN * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxZ) + (double)aoXYZNNP * (1.0D - renderer.renderMinY) * renderer.renderMaxZ); + float aoTL = (float) ((double) aoXYZNPP * renderer.renderMaxY * renderer.renderMaxZ + + (double) aoXYZNPN * renderer.renderMaxY * (1.0D - renderer.renderMaxZ) + + (double) aoXYZNNN * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxZ) + + (double) aoXYZNNP * (1.0D - renderer.renderMaxY) * renderer.renderMaxZ); + float aoBL = (float) ((double) aoXYZNPP * renderer.renderMaxY * renderer.renderMinZ + + (double) aoXYZNPN * renderer.renderMaxY * (1.0D - renderer.renderMinZ) + + (double) aoXYZNNN * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinZ) + + (double) aoXYZNNP * (1.0D - renderer.renderMaxY) * renderer.renderMinZ); + float aoBR = (float) ((double) aoXYZNPP * renderer.renderMinY * renderer.renderMinZ + + (double) aoXYZNPN * renderer.renderMinY * (1.0D - renderer.renderMinZ) + + (double) aoXYZNNN * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinZ) + + (double) aoXYZNNP * (1.0D - renderer.renderMinY) * renderer.renderMinZ); + float aoTR = (float) ((double) aoXYZNPP * renderer.renderMinY * renderer.renderMaxZ + + (double) aoXYZNPN * renderer.renderMinY * (1.0D - renderer.renderMaxZ) + + (double) aoXYZNNN * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxZ) + + (double) aoXYZNNP * (1.0D - renderer.renderMinY) * renderer.renderMaxZ); - int brXYZNNP = renderer.getAoBrightness(aoBrightnessXYIN, aoBrightnessXYZINP, aoBrightnessXZIP, blockBrightness); - int brXYZNPP = renderer.getAoBrightness(aoBrightnessXZIP, aoBrightnessXYIP, aoBrightnessXYZIPP, blockBrightness); - int brXYZNPN = renderer.getAoBrightness(aoBrightnessXZIN, aoBrightnessXYZIPN, aoBrightnessXYIP, blockBrightness); - int brXYZNNN = renderer.getAoBrightness(aoBrightnessXYZINN, aoBrightnessXYIN, aoBrightnessXZIN, blockBrightness); + int brXYZNNP = + renderer.getAoBrightness(aoBrightnessXYIN, aoBrightnessXYZINP, aoBrightnessXZIP, blockBrightness); + int brXYZNPP = + renderer.getAoBrightness(aoBrightnessXZIP, aoBrightnessXYIP, aoBrightnessXYZIPP, blockBrightness); + int brXYZNPN = + renderer.getAoBrightness(aoBrightnessXZIN, aoBrightnessXYZIPN, aoBrightnessXYIP, blockBrightness); + int brXYZNNN = + renderer.getAoBrightness(aoBrightnessXYZINN, aoBrightnessXYIN, aoBrightnessXZIN, blockBrightness); - renderer.brightnessTopLeft = renderer.mixAoBrightness(brXYZNPP, brXYZNPN, brXYZNNN, brXYZNNP, renderer.renderMaxY * renderer.renderMaxZ, renderer.renderMaxY * (1.0D - renderer.renderMaxZ), (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxZ), (1.0D - renderer.renderMaxY) * renderer.renderMaxZ); - renderer.brightnessBottomLeft = renderer.mixAoBrightness(brXYZNPP, brXYZNPN, brXYZNNN, brXYZNNP, renderer.renderMaxY * renderer.renderMinZ, renderer.renderMaxY * (1.0D - renderer.renderMinZ), (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinZ), (1.0D - renderer.renderMaxY) * renderer.renderMinZ); - renderer.brightnessBottomRight = renderer.mixAoBrightness(brXYZNPP, brXYZNPN, brXYZNNN, brXYZNNP, renderer.renderMinY * renderer.renderMinZ, renderer.renderMinY * (1.0D - renderer.renderMinZ), (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinZ), (1.0D - renderer.renderMinY) * renderer.renderMinZ); - renderer.brightnessTopRight = renderer.mixAoBrightness(brXYZNPP, brXYZNPN, brXYZNNN, brXYZNNP, renderer.renderMinY * renderer.renderMaxZ, renderer.renderMinY * (1.0D - renderer.renderMaxZ), (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxZ), (1.0D - renderer.renderMinY) * renderer.renderMaxZ); + renderer.brightnessTopLeft = renderer.mixAoBrightness( + brXYZNPP, + brXYZNPN, + brXYZNNN, + brXYZNNP, + renderer.renderMaxY * renderer.renderMaxZ, + renderer.renderMaxY * (1.0D - renderer.renderMaxZ), + (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxZ), + (1.0D - renderer.renderMaxY) * renderer.renderMaxZ); + renderer.brightnessBottomLeft = renderer.mixAoBrightness( + brXYZNPP, + brXYZNPN, + brXYZNNN, + brXYZNNP, + renderer.renderMaxY * renderer.renderMinZ, + renderer.renderMaxY * (1.0D - renderer.renderMinZ), + (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinZ), + (1.0D - renderer.renderMaxY) * renderer.renderMinZ); + renderer.brightnessBottomRight = renderer.mixAoBrightness( + brXYZNPP, + brXYZNPN, + brXYZNNN, + brXYZNNP, + renderer.renderMinY * renderer.renderMinZ, + renderer.renderMinY * (1.0D - renderer.renderMinZ), + (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinZ), + (1.0D - renderer.renderMinY) * renderer.renderMinZ); + renderer.brightnessTopRight = renderer.mixAoBrightness( + brXYZNPP, + brXYZNPN, + brXYZNNN, + brXYZNNP, + renderer.renderMinY * renderer.renderMaxZ, + renderer.renderMinY * (1.0D - renderer.renderMaxZ), + (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxZ), + (1.0D - renderer.renderMinY) * renderer.renderMaxZ); - renderer.colorRedTopLeft = renderer.colorRedBottomLeft = renderer.colorRedBottomRight = renderer.colorRedTopRight = r * 0.6F; - renderer.colorGreenTopLeft = renderer.colorGreenBottomLeft = renderer.colorGreenBottomRight = renderer.colorGreenTopRight = g * 0.6F; - renderer.colorBlueTopLeft = renderer.colorBlueBottomLeft = renderer.colorBlueBottomRight = renderer.colorBlueTopRight = b * 0.6F; + renderer.colorRedTopLeft = + renderer.colorRedBottomLeft = renderer.colorRedBottomRight = renderer.colorRedTopRight = r * 0.6F; + renderer.colorGreenTopLeft = + renderer.colorGreenBottomLeft = renderer.colorGreenBottomRight = renderer.colorGreenTopRight = g * 0.6F; + renderer.colorBlueTopLeft = + renderer.colorBlueBottomLeft = renderer.colorBlueBottomRight = renderer.colorBlueTopRight = b * 0.6F; renderer.colorRedTopLeft *= aoTL; renderer.colorGreenTopLeft *= aoTL; @@ -1012,53 +1362,120 @@ public final class RenderUtil renderer.enableAO = false; } - public static void renderFaceXPosAOPartial (RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + public static void renderFaceXPosAOPartial( + RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); int xGrass = (renderer.renderMaxX >= 1) ? x + 1 : x; - boolean blocksGrassXYNP = !renderer.blockAccess.getBlock(xGrass, y + 1, z).getCanBlockGrass(); - boolean blocksGrassXYNN = !renderer.blockAccess.getBlock(xGrass, y - 1, z).getCanBlockGrass(); - boolean blocksGrassXZNN = !renderer.blockAccess.getBlock(xGrass, y, z - 1).getCanBlockGrass(); - boolean blocksGrassXZNP = !renderer.blockAccess.getBlock(xGrass, y, z + 1).getCanBlockGrass(); + boolean blocksGrassXYNP = + !renderer.blockAccess.getBlock(xGrass, y + 1, z).getCanBlockGrass(); + boolean blocksGrassXYNN = + !renderer.blockAccess.getBlock(xGrass, y - 1, z).getCanBlockGrass(); + boolean blocksGrassXZNN = + !renderer.blockAccess.getBlock(xGrass, y, z - 1).getCanBlockGrass(); + boolean blocksGrassXZNP = + !renderer.blockAccess.getBlock(xGrass, y, z + 1).getCanBlockGrass(); if (renderer.renderMaxX < 1) - setupAOBrightnessXPos(renderer, block, x, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + setupAOBrightnessXPos( + renderer, block, x, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); - setupAOBrightnessXNeg(renderer, block, x + 1, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + setupAOBrightnessXNeg( + renderer, block, x + 1, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); - float xClamp = MathHelper.clamp_float((float)renderer.renderMaxX, 0, 1); + float xClamp = MathHelper.clamp_float((float) renderer.renderMaxX, 0, 1); mixAOBrightnessLightValueX(xClamp, 1 - xClamp); int blockBrightness = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z); - if (renderer.renderMaxX >= 1.0D || !renderer.blockAccess.getBlock(x + 1, y, z).isOpaqueCube()) + if (renderer.renderMaxX >= 1.0D + || !renderer.blockAccess.getBlock(x + 1, y, z).isOpaqueCube()) blockBrightness = block.getMixedBrightnessForBlock(renderer.blockAccess, x + 1, y, z); float aoOpposingBlock = renderer.blockAccess.getBlock(x + 1, y, z).getAmbientOcclusionLightValue(); - float aoXYZPNP = (aoLightValueScratchXYIN + aoLightValueScratchXYZINP + aoOpposingBlock + aoLightValueScratchXZIP) / 4.0F; - float aoXYZPNN = (aoLightValueScratchXYZINN + aoLightValueScratchXYIN + aoLightValueScratchXZIN + aoOpposingBlock) / 4.0F; - float aoXYZPPN = (aoLightValueScratchXZIN + aoOpposingBlock + aoLightValueScratchXYZIPN + aoLightValueScratchXYIP) / 4.0F; - float aoXYZPPP = (aoOpposingBlock + aoLightValueScratchXZIP + aoLightValueScratchXYIP + aoLightValueScratchXYZIPP) / 4.0F; + float aoXYZPNP = + (aoLightValueScratchXYIN + aoLightValueScratchXYZINP + aoOpposingBlock + aoLightValueScratchXZIP) + / 4.0F; + float aoXYZPNN = + (aoLightValueScratchXYZINN + aoLightValueScratchXYIN + aoLightValueScratchXZIN + aoOpposingBlock) + / 4.0F; + float aoXYZPPN = + (aoLightValueScratchXZIN + aoOpposingBlock + aoLightValueScratchXYZIPN + aoLightValueScratchXYIP) + / 4.0F; + float aoXYZPPP = + (aoOpposingBlock + aoLightValueScratchXZIP + aoLightValueScratchXYIP + aoLightValueScratchXYZIPP) + / 4.0F; - float aoTL = (float)((double)aoXYZPNP * (1.0D - renderer.renderMinY) * renderer.renderMaxZ + (double)aoXYZPNN * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxZ) + (double)aoXYZPPN * renderer.renderMinY * (1.0D - renderer.renderMaxZ) + (double)aoXYZPPP * renderer.renderMinY * renderer.renderMaxZ); - float aoBL = (float)((double)aoXYZPNP * (1.0D - renderer.renderMinY) * renderer.renderMinZ + (double)aoXYZPNN * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinZ) + (double)aoXYZPPN * renderer.renderMinY * (1.0D - renderer.renderMinZ) + (double)aoXYZPPP * renderer.renderMinY * renderer.renderMinZ); - float aoBR = (float)((double)aoXYZPNP * (1.0D - renderer.renderMaxY) * renderer.renderMinZ + (double)aoXYZPNN * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinZ) + (double)aoXYZPPN * renderer.renderMaxY * (1.0D - renderer.renderMinZ) + (double)aoXYZPPP * renderer.renderMaxY * renderer.renderMinZ); - float aoTR = (float)((double)aoXYZPNP * (1.0D - renderer.renderMaxY) * renderer.renderMaxZ + (double)aoXYZPNN * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxZ) + (double)aoXYZPPN * renderer.renderMaxY * (1.0D - renderer.renderMaxZ) + (double)aoXYZPPP * renderer.renderMaxY * renderer.renderMaxZ); + float aoTL = (float) ((double) aoXYZPNP * (1.0D - renderer.renderMinY) * renderer.renderMaxZ + + (double) aoXYZPNN * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxZ) + + (double) aoXYZPPN * renderer.renderMinY * (1.0D - renderer.renderMaxZ) + + (double) aoXYZPPP * renderer.renderMinY * renderer.renderMaxZ); + float aoBL = (float) ((double) aoXYZPNP * (1.0D - renderer.renderMinY) * renderer.renderMinZ + + (double) aoXYZPNN * (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinZ) + + (double) aoXYZPPN * renderer.renderMinY * (1.0D - renderer.renderMinZ) + + (double) aoXYZPPP * renderer.renderMinY * renderer.renderMinZ); + float aoBR = (float) ((double) aoXYZPNP * (1.0D - renderer.renderMaxY) * renderer.renderMinZ + + (double) aoXYZPNN * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinZ) + + (double) aoXYZPPN * renderer.renderMaxY * (1.0D - renderer.renderMinZ) + + (double) aoXYZPPP * renderer.renderMaxY * renderer.renderMinZ); + float aoTR = (float) ((double) aoXYZPNP * (1.0D - renderer.renderMaxY) * renderer.renderMaxZ + + (double) aoXYZPNN * (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxZ) + + (double) aoXYZPPN * renderer.renderMaxY * (1.0D - renderer.renderMaxZ) + + (double) aoXYZPPP * renderer.renderMaxY * renderer.renderMaxZ); - int brXYZPNP = renderer.getAoBrightness(aoBrightnessXYIN, aoBrightnessXYZINP, aoBrightnessXZIP, blockBrightness); - int brXYZPNN = renderer.getAoBrightness(aoBrightnessXZIP, aoBrightnessXYIP, aoBrightnessXYZIPP, blockBrightness); - int brXYZPPN = renderer.getAoBrightness(aoBrightnessXZIN, aoBrightnessXYZIPN, aoBrightnessXYIP, blockBrightness); - int brXYZPPP = renderer.getAoBrightness(aoBrightnessXYZINN, aoBrightnessXYIN, aoBrightnessXZIN, blockBrightness); + int brXYZPNP = + renderer.getAoBrightness(aoBrightnessXYIN, aoBrightnessXYZINP, aoBrightnessXZIP, blockBrightness); + int brXYZPNN = + renderer.getAoBrightness(aoBrightnessXZIP, aoBrightnessXYIP, aoBrightnessXYZIPP, blockBrightness); + int brXYZPPN = + renderer.getAoBrightness(aoBrightnessXZIN, aoBrightnessXYZIPN, aoBrightnessXYIP, blockBrightness); + int brXYZPPP = + renderer.getAoBrightness(aoBrightnessXYZINN, aoBrightnessXYIN, aoBrightnessXZIN, blockBrightness); - renderer.brightnessTopLeft = renderer.mixAoBrightness(brXYZPNP, brXYZPPP, brXYZPPN, brXYZPNN, (1.0D - renderer.renderMinY) * renderer.renderMaxZ, (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxZ), renderer.renderMinY * (1.0D - renderer.renderMaxZ), renderer.renderMinY * renderer.renderMaxZ); - renderer.brightnessBottomLeft = renderer.mixAoBrightness(brXYZPNP, brXYZPPP, brXYZPPN, brXYZPNN, (1.0D - renderer.renderMinY) * renderer.renderMinZ, (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinZ), renderer.renderMinY * (1.0D - renderer.renderMinZ), renderer.renderMinY * renderer.renderMinZ); - renderer.brightnessBottomRight = renderer.mixAoBrightness(brXYZPNP, brXYZPPP, brXYZPPN, brXYZPNN, (1.0D - renderer.renderMaxY) * renderer.renderMinZ, (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinZ), renderer.renderMaxY * (1.0D - renderer.renderMinZ), renderer.renderMaxY * renderer.renderMinZ); - renderer.brightnessTopRight = renderer.mixAoBrightness(brXYZPNP, brXYZPPP, brXYZPPN, brXYZPNN, (1.0D - renderer.renderMaxY) * renderer.renderMaxZ, (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxZ), renderer.renderMaxY * (1.0D - renderer.renderMaxZ), renderer.renderMaxY * renderer.renderMaxZ); + renderer.brightnessTopLeft = renderer.mixAoBrightness( + brXYZPNP, + brXYZPPP, + brXYZPPN, + brXYZPNN, + (1.0D - renderer.renderMinY) * renderer.renderMaxZ, + (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMaxZ), + renderer.renderMinY * (1.0D - renderer.renderMaxZ), + renderer.renderMinY * renderer.renderMaxZ); + renderer.brightnessBottomLeft = renderer.mixAoBrightness( + brXYZPNP, + brXYZPPP, + brXYZPPN, + brXYZPNN, + (1.0D - renderer.renderMinY) * renderer.renderMinZ, + (1.0D - renderer.renderMinY) * (1.0D - renderer.renderMinZ), + renderer.renderMinY * (1.0D - renderer.renderMinZ), + renderer.renderMinY * renderer.renderMinZ); + renderer.brightnessBottomRight = renderer.mixAoBrightness( + brXYZPNP, + brXYZPPP, + brXYZPPN, + brXYZPNN, + (1.0D - renderer.renderMaxY) * renderer.renderMinZ, + (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMinZ), + renderer.renderMaxY * (1.0D - renderer.renderMinZ), + renderer.renderMaxY * renderer.renderMinZ); + renderer.brightnessTopRight = renderer.mixAoBrightness( + brXYZPNP, + brXYZPPP, + brXYZPPN, + brXYZPNN, + (1.0D - renderer.renderMaxY) * renderer.renderMaxZ, + (1.0D - renderer.renderMaxY) * (1.0D - renderer.renderMaxZ), + renderer.renderMaxY * (1.0D - renderer.renderMaxZ), + renderer.renderMaxY * renderer.renderMaxZ); - renderer.colorRedTopLeft = renderer.colorRedBottomLeft = renderer.colorRedBottomRight = renderer.colorRedTopRight = r * 0.6F; - renderer.colorGreenTopLeft = renderer.colorGreenBottomLeft = renderer.colorGreenBottomRight = renderer.colorGreenTopRight = g * 0.6F; - renderer.colorBlueTopLeft = renderer.colorBlueBottomLeft = renderer.colorBlueBottomRight = renderer.colorBlueTopRight = b * 0.6F; + renderer.colorRedTopLeft = + renderer.colorRedBottomLeft = renderer.colorRedBottomRight = renderer.colorRedTopRight = r * 0.6F; + renderer.colorGreenTopLeft = + renderer.colorGreenBottomLeft = renderer.colorGreenBottomRight = renderer.colorGreenTopRight = g * 0.6F; + renderer.colorBlueTopLeft = + renderer.colorBlueBottomLeft = renderer.colorBlueBottomRight = renderer.colorBlueTopRight = b * 0.6F; renderer.colorRedTopLeft *= aoTL; renderer.colorGreenTopLeft *= aoTL; @@ -1078,28 +1495,26 @@ public final class RenderUtil renderer.enableAO = false; } - public static int mixAOBrightness (int brightTL, int brightBL, int brightBR, int brightTR, double lerpTB, double lerpLR) - { + public static int mixAOBrightness( + int brightTL, int brightBL, int brightBR, int brightTR, double lerpTB, double lerpLR) { double brightSkyL = (brightTL >> 16 & 255) * (1 - lerpTB) + (brightBL >> 16 & 255) * lerpTB; double brightSkyR = (brightTR >> 16 & 255) * (1 - lerpTB) + (brightBR >> 16 & 255) * lerpTB; - int brightSky = (int)(brightSkyL * (1 - lerpLR) + brightSkyR * lerpLR) & 255; + int brightSky = (int) (brightSkyL * (1 - lerpLR) + brightSkyR * lerpLR) & 255; double brightBlkL = (brightTL & 255) * (1 - lerpTB) + (brightBL & 255) * lerpTB; double brightBlkR = (brightTR & 255) * (1 - lerpTB) + (brightBR & 255) * lerpTB; - int brightBlk = (int)(brightBlkL * (1 - lerpLR) + brightBlkR * lerpLR) & 255; + int brightBlk = (int) (brightBlkL * (1 - lerpLR) + brightBlkR * lerpLR) & 255; return brightSky << 16 | brightBlk; } - public static int mixAOBrightness (int brightMin, int brightMax, float fMin, float fMax) { - if (brightMin == 0) - return 0; - if (brightMax == 0) - return 0; + public static int mixAOBrightness(int brightMin, int brightMax, float fMin, float fMax) { + if (brightMin == 0) return 0; + if (brightMax == 0) return 0; float brightSky = (brightMin >> 16 & 255) * fMin + (brightMax >> 16 & 255) * fMax; float brightBlk = (brightMin & 255) * fMin + (brightMax & 255) * fMax; - return ((int)brightSky & 255) << 16 | ((int)brightBlk & 255); + return ((int) brightSky & 255) << 16 | ((int) brightBlk & 255); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/StorageRenderItem.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/StorageRenderItem.java index b1508f8..eff813c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/StorageRenderItem.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/StorageRenderItem.java @@ -7,20 +7,18 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; -public class StorageRenderItem extends RenderItem -{ +public class StorageRenderItem extends RenderItem { public ItemStack overrideStack; @Override - public void renderItemOverlayIntoGUI (FontRenderer font, TextureManager texManager, ItemStack item, int x, int y, String text) - { + public void renderItemOverlayIntoGUI( + FontRenderer font, TextureManager texManager, ItemStack item, int x, int y, String text) { if (item != overrideStack) { super.renderItemOverlayIntoGUI(font, texManager, item, x, y, text); return; } - if (item != null) - { + if (item != null) { float scale = .5f; float xoff = 0; if (font.getUnicodeFlag()) { @@ -28,8 +26,7 @@ public class StorageRenderItem extends RenderItem xoff = 1; } - if (item.stackSize > 1 || text != null) - { + if (item.stackSize > 1 || text != null) { if (item.stackSize >= 100000000 || (item.stackSize >= 1000000 && font.getUnicodeFlag())) text = (text == null) ? String.format("%.0fM", item.stackSize / 1000000f) : text; else if (item.stackSize >= 1000000) @@ -38,11 +35,10 @@ public class StorageRenderItem extends RenderItem text = (text == null) ? String.format("%.0fK", item.stackSize / 1000f) : text; else if (item.stackSize >= 10000) text = (text == null) ? String.format("%.1fK", item.stackSize / 1000f) : text; - else - text = (text == null) ? String.valueOf(item.stackSize) : text; + else text = (text == null) ? String.valueOf(item.stackSize) : text; - int textX = (int)((x + 16 + xoff - font.getStringWidth(text) * scale) / scale) - 1; - int textY = (int)((y + 16 - 7 * scale) / scale) - 1; + int textX = (int) ((x + 16 + xoff - font.getStringWidth(text) * scale) / scale) - 1; + int textY = (int) ((y + 16 - 7 * scale) / scale) - 1; GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); @@ -55,11 +51,10 @@ public class StorageRenderItem extends RenderItem GL11.glEnable(GL11.GL_DEPTH_TEST); } - if (item.getItem().showDurabilityBar(item)) - { + if (item.getItem().showDurabilityBar(item)) { double health = item.getItem().getDurabilityForDisplay(item); - int j1 = (int)Math.round(13.0D - health * 13.0D); - int k = (int)Math.round(255.0D - health * 255.0D); + int j1 = (int) Math.round(13.0D - health * 13.0D); + int k = (int) Math.round(255.0D - health * 255.0D); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); GL11.glDisable(GL11.GL_TEXTURE_2D); @@ -71,7 +66,8 @@ public class StorageRenderItem extends RenderItem this.renderQuad(tessellator, x + 2, y + 13, 13, 2, 0); this.renderQuad(tessellator, x + 2, y + 13, 12, 1, i1); this.renderQuad(tessellator, x + 2, y + 13, j1, 1, l); - //GL11.glEnable(GL11.GL_BLEND); // Forge: Disable Bled because it screws with a lot of things down the line. + // GL11.glEnable(GL11.GL_BLEND); // Forge: Disable Bled because it screws with a lot of things down the + // line. GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glEnable(GL11.GL_LIGHTING); @@ -81,8 +77,7 @@ public class StorageRenderItem extends RenderItem } } - private void renderQuad (Tessellator tessellator, int x, int y, int w, int h, int color) - { + private void renderQuad(Tessellator tessellator, int x, int y, int w, int h, int color) { tessellator.startDrawingQuads(); tessellator.setColorOpaque_I(color); tessellator.addVertex(x + 0, y + 0, 0); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityDrawersRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityDrawersRenderer.java index 72a58ce..afd5559 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityDrawersRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityDrawersRenderer.java @@ -8,6 +8,8 @@ import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; @@ -32,13 +34,10 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import java.util.ArrayList; -import java.util.List; - @SideOnly(Side.CLIENT) -public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer -{ - private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png"); +public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer { + private static final ResourceLocation RES_ITEM_GLINT = + new ResourceLocation("textures/misc/enchanted_item_glint.png"); private Vec3[] dirVectors = { Vec3.createVectorHelper(0, -1, 0), @@ -53,17 +52,17 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer private RenderBlocks renderBlocksRi = new RenderBlocks(); @Override - public byte getMiniBlockCount (ItemStack stack, byte original) { + public byte getMiniBlockCount(ItemStack stack, byte original) { return 1; } @Override - public boolean shouldBob () { + public boolean shouldBob() { return false; } @Override - public boolean shouldSpreadItems () { + public boolean shouldSpreadItems() { return false; } @@ -71,8 +70,16 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer // setting. This modified implementation will render these items without unsightly Z-fighting. @Override - public void renderItemIntoGUI (FontRenderer fontRenderer, TextureManager texManager, ItemStack itemStack, int x, int y, boolean renderEffect) { - if (itemStack.getItemSpriteNumber() == 0 && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(itemStack.getItem()).getRenderType())) { + public void renderItemIntoGUI( + FontRenderer fontRenderer, + TextureManager texManager, + ItemStack itemStack, + int x, + int y, + boolean renderEffect) { + if (itemStack.getItemSpriteNumber() == 0 + && RenderBlocks.renderItemIn3d( + Block.getBlockFromItem(itemStack.getItem()).getRenderType())) { renderItemIntoGUIBlock(fontRenderer, texManager, itemStack, x, y, renderEffect); return; } @@ -81,27 +88,25 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer int meta = itemStack.getItemDamage(); ResourceLocation loc = itemStack.getItem().requiresMultipleRenderPasses() - ? (item.getSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture) - : (texManager.getResourceLocation(itemStack.getItemSpriteNumber())); + ? (item.getSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture) + : (texManager.getResourceLocation(itemStack.getItemSpriteNumber())); for (int i = 0; i < item.getRenderPasses(meta); ++i) { OpenGlHelper.glBlendFunc(770, 771, 1, 0); texManager.bindTexture(loc); IIcon icon = itemStack.getItem().requiresMultipleRenderPasses() - ? item.getIcon(itemStack, i) - : itemStack.getIconIndex(); + ? item.getIcon(itemStack, i) + : itemStack.getIconIndex(); - if (icon == null) - continue; + if (icon == null) continue; int color = itemStack.getItem().getColorFromItemStack(itemStack, i); - float r = (float)(color >> 16 & 255) / 255.0F; - float g = (float)(color >> 8 & 255) / 255.0F; - float b = (float)(color & 255) / 255.0F; + float r = (float) (color >> 16 & 255) / 255.0F; + float g = (float) (color >> 8 & 255) / 255.0F; + float b = (float) (color & 255) / 255.0F; - if (renderWithColor) - GL11.glColor4f(r, g, b, 1.0F); + if (renderWithColor) GL11.glColor4f(r, g, b, 1.0F); GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); GL11.glPolygonOffset(-1f, -1); @@ -116,15 +121,14 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_LIGHTING); - if (renderEffect && itemStack.hasEffect(i)) - renderEffect(texManager, x, y); + if (renderEffect && itemStack.hasEffect(i)) renderEffect(texManager, x, y); GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); } } @Override - public void renderEffect (TextureManager manager, int x, int y) { + public void renderEffect(TextureManager manager, int x, int y) { GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); @@ -140,10 +144,8 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer GL11.glDepthFunc(GL11.GL_LEQUAL); } - private void renderGlint (int x, int y, int w, int h) - { - for (int i = 0; i < 2; ++i) - { + private void renderGlint(int x, int y, int w, int h) { + for (int i = 0; i < 2; ++i) { OpenGlHelper.glBlendFunc(772, 1, 0, 0); float uScale = 0.00390625F; float vScale = 0.00390625F; @@ -154,15 +156,23 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(x + 0, y + h, 0, (u + (float)h * hScale) * uScale, (v + (float)h) * vScale); - tessellator.addVertexWithUV(x + w, y + h, 0, (u + (float)w + (float)h * hScale) * uScale, (v + (float)h) * vScale); - tessellator.addVertexWithUV(x + w, y + 0, 0, (u + (float)w) * uScale, (v + 0.0F) * vScale); + tessellator.addVertexWithUV( + x + 0, y + h, 0, (u + (float) h * hScale) * uScale, (v + (float) h) * vScale); + tessellator.addVertexWithUV( + x + w, y + h, 0, (u + (float) w + (float) h * hScale) * uScale, (v + (float) h) * vScale); + tessellator.addVertexWithUV(x + w, y + 0, 0, (u + (float) w) * uScale, (v + 0.0F) * vScale); tessellator.addVertexWithUV(x + 0, y + 0, 0, (u + 0.0F) * uScale, (v + 0.0F) * vScale); tessellator.draw(); } } - private void renderItemIntoGUIBlock (FontRenderer fontRenderer, TextureManager texManager, ItemStack itemStack, int x, int y, boolean renderEffect) { + private void renderItemIntoGUIBlock( + FontRenderer fontRenderer, + TextureManager texManager, + ItemStack itemStack, + int x, + int y, + boolean renderEffect) { texManager.bindTexture(TextureMap.locationBlocksTexture); Block block = Block.getBlockFromItem(itemStack.getItem()); @@ -170,8 +180,7 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); GL11.glEnable(GL11.GL_BLEND); OpenGlHelper.glBlendFunc(770, 771, 1, 0); - } - else { + } else { GL11.glAlphaFunc(GL11.GL_GREATER, 0.5F); GL11.glDisable(GL11.GL_BLEND); } @@ -185,12 +194,11 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer GL11.glRotatef(45, 0, 1, 0); int color = itemStack.getItem().getColorFromItemStack(itemStack, 0); - float r = (float)(color >> 16 & 255) / 255.0F; - float g = (float)(color >> 8 & 255) / 255.0F; - float b = (float)(color & 255) / 255.0F; + float r = (float) (color >> 16 & 255) / 255.0F; + float g = (float) (color >> 8 & 255) / 255.0F; + float b = (float) (color & 255) / 255.0F; - if (this.renderWithColor) - GL11.glColor4f(r * 1, g * 1, b * 1, 1.0F); + if (this.renderWithColor) GL11.glColor4f(r * 1, g * 1, b * 1, 1.0F); GL11.glRotatef(-90, 0, 1, 0); GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); @@ -202,24 +210,23 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); - if (block.getRenderBlockPass() == 0) - GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); + if (block.getRenderBlockPass() == 0) GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); GL11.glPopMatrix(); } }; - private float itemOffset1X[] = new float[] { .5f }; - private float itemOffset1Y[] = new float[] { 8.25f }; + private float itemOffset1X[] = new float[] {.5f}; + private float itemOffset1Y[] = new float[] {8.25f}; - private float itemOffset2X[] = new float[] { .5f, .5f }; - private float itemOffset2Y[] = new float[] { 10.25f, 2.25f }; + private float itemOffset2X[] = new float[] {.5f, .5f}; + private float itemOffset2Y[] = new float[] {10.25f, 2.25f}; - private float itemOffset4X[] = new float[] { .25f, .25f, .75f, .75f }; - private float itemOffset4Y[] = new float[] { 10.25f, 2.25f, 10.25f, 2.25f }; + private float itemOffset4X[] = new float[] {.25f, .25f, .75f, .75f}; + private float itemOffset4Y[] = new float[] {10.25f, 2.25f, 10.25f, 2.25f}; - private float itemOffset3X[] = new float[] { .5f, .25f, .75f }; - private float itemOffset3Y[] = new float[] { 9.75f, 2.25f, 2.25f }; + private float itemOffset3X[] = new float[] {.5f, .25f, .75f}; + private float itemOffset3Y[] = new float[] {9.75f, 2.25f, 2.25f}; private RenderBlocks renderBlocks = new RenderBlocks(); @@ -227,41 +234,37 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer private static final float unit = .0625f; - private static int[] glStateRender = { GL11.GL_LIGHTING, GL11.GL_BLEND }; + private static int[] glStateRender = {GL11.GL_LIGHTING, GL11.GL_BLEND}; private List savedGLStateRender = GLUtil.makeGLState(glStateRender); - private static int[] glStateItemRender = { GL11.GL_LIGHTING, GL11.GL_ALPHA_TEST, GL11.GL_BLEND }; + private static int[] glStateItemRender = {GL11.GL_LIGHTING, GL11.GL_ALPHA_TEST, GL11.GL_BLEND}; private List savedGLStateItemRender = GLUtil.makeGLState(glStateItemRender); - private static int[] glLightRender = { GL11.GL_LIGHT0, GL11.GL_LIGHT1, GL11.GL_COLOR_MATERIAL, GL12.GL_RESCALE_NORMAL }; + private static int[] glLightRender = {GL11.GL_LIGHT0, GL11.GL_LIGHT1, GL11.GL_COLOR_MATERIAL, GL12.GL_RESCALE_NORMAL + }; private List savedGLLightRender = GLUtil.makeGLState(glLightRender); private List preLabelRenderHandlers = new ArrayList(); @Override - public void renderTileEntityAt (TileEntity tile, double x, double y, double z, float partialTickTime) { + public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTickTime) { TileEntityDrawers tileDrawers = (TileEntityDrawers) tile; - if (tileDrawers == null) - return; + if (tileDrawers == null) return; - if (tileDrawers.isShrouded() || tileDrawers.isSealed()) - return; + if (tileDrawers.isShrouded() || tileDrawers.isSealed()) return; // Don't bother rendering anything that is (probably) facing away from the player. EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; Vec3 faceVector = dirVectors[tileDrawers.getDirection()]; - float lookProduct = (float)player.getLook(partialTickTime).dotProduct(faceVector); + float lookProduct = (float) player.getLook(partialTickTime).dotProduct(faceVector); - if (lookProduct > .75f) - return; + if (lookProduct > .75f) return; float depth; Block block = tile.getWorldObj().getBlock(tile.xCoord, tile.yCoord, tile.zCoord); - if (block instanceof BlockDrawers) - depth = ((BlockDrawers) block).halfDepth ? .5f : 1; - else - return; + if (block instanceof BlockDrawers) depth = ((BlockDrawers) block).halfDepth ? .5f : 1; + else return; GL11.glPushMatrix(); GL11.glTranslated(x, y, z); @@ -269,14 +272,18 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer itemRenderer.setRenderManager(RenderManager.instance); ForgeDirection side = ForgeDirection.getOrientation(tileDrawers.getDirection()); - int ambLight = tile.getWorldObj().getLightBrightnessForSkyBlocks(tile.xCoord + side.offsetX, tile.yCoord + side.offsetY, tile.zCoord + side.offsetZ, 0); + int ambLight = tile.getWorldObj() + .getLightBrightnessForSkyBlocks( + tile.xCoord + side.offsetX, tile.yCoord + side.offsetY, tile.zCoord + side.offsetZ, 0); int lu = ambLight % 65536; int lv = ambLight / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lu, lv); - brightness = tile.getWorldObj().getLightBrightness(tile.xCoord + side.offsetX, tile.yCoord + side.offsetY, tile.zCoord + side.offsetZ) * 1.25f; - if (brightness > 1) - brightness = 1; + brightness = tile.getWorldObj() + .getLightBrightness( + tile.xCoord + side.offsetX, tile.yCoord + side.offsetY, tile.zCoord + side.offsetZ) + * 1.25f; + if (brightness > 1) brightness = 1; Minecraft mc = Minecraft.getMinecraft(); boolean cache = mc.gameSettings.fancyGraphics; @@ -285,10 +292,8 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer try { if (StorageDrawers.config.isFancyItemRenderEnabled()) renderFancyItemSet(tileDrawers, side, depth, partialTickTime); - else - renderFastItemSet(tileDrawers, side, depth, partialTickTime); - } - catch (Exception e) { + else renderFastItemSet(tileDrawers, side, depth, partialTickTime); + } catch (Exception e) { // Swallow exception } @@ -297,18 +302,16 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer GL11.glPopMatrix(); } - private void renderFancyItemSet (TileEntityDrawers tile, ForgeDirection side, float depth, float partialTickTime) { + private void renderFancyItemSet(TileEntityDrawers tile, ForgeDirection side, float depth, float partialTickTime) { boolean restoreGLState = false; int drawerCount = tile.getDrawerCount(); for (int i = 0; i < drawerCount; i++) { - if (!tile.isDrawerEnabled(i)) - continue; + if (!tile.isDrawerEnabled(i)) continue; IDrawer drawer = tile.getDrawer(i); ItemStack itemStack = drawer.getStoredItemPrototype(); - if (itemStack == null) - continue; + if (itemStack == null) continue; if (!restoreGLState) { restoreGLState = true; @@ -318,35 +321,30 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer renderFancyItem(itemStack, tile, i, side, depth, partialTickTime); } - if (restoreGLState) - GLUtil.restoreGLState(savedGLStateRender); + if (restoreGLState) GLUtil.restoreGLState(savedGLStateRender); } private boolean[] renderAsBlock = new boolean[4]; private ItemStack[] renderStacks = new ItemStack[4]; - private void renderFastItemSet (TileEntityDrawers tile, ForgeDirection side, float depth, float partialTickTime) { + private void renderFastItemSet(TileEntityDrawers tile, ForgeDirection side, float depth, float partialTickTime) { int drawerCount = tile.getDrawerCount(); boolean restoreItemState = false; boolean restoreBlockState = false; for (int i = 0; i < drawerCount; i++) { renderStacks[i] = null; - if (!tile.isDrawerEnabled(i)) - continue; + if (!tile.isDrawerEnabled(i)) continue; IDrawer drawer = tile.getDrawer(i); ItemStack itemStack = drawer.getStoredItemPrototype(); - if (itemStack == null) - continue; + if (itemStack == null) continue; renderStacks[i] = itemStack; renderAsBlock[i] = isItemBlockType(itemStack); - if (renderAsBlock[i]) - restoreBlockState = true; - else - restoreItemState = true; + if (renderAsBlock[i]) restoreBlockState = true; + else restoreItemState = true; } if (restoreItemState || restoreBlockState) { @@ -368,11 +366,17 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer } } - private void renderFancyItem (ItemStack itemStack, TileEntityDrawers tile, int slot, ForgeDirection side, float depth, float partialTickTime) { + private void renderFancyItem( + ItemStack itemStack, + TileEntityDrawers tile, + int slot, + ForgeDirection side, + float depth, + float partialTickTime) { int drawerCount = tile.getDrawerCount(); boolean isBlockType = isItemBlockType(itemStack); - BlockDrawers block = (BlockDrawers)tile.getBlockType(); + BlockDrawers block = (BlockDrawers) tile.getBlockType(); float xunit = getXOffset(drawerCount, slot); float yunit = getYOffset(drawerCount, slot); @@ -390,8 +394,9 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer double zDepth = 1 / relScale - itemBlock.getBlockBoundsMaxZ(); itemDepth += zDepth * zunit; + } catch (Exception e) { } - catch (Exception e) { }; + ; } switch (tile.getDirection()) { @@ -414,10 +419,8 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer } float yAdj = 0; - if (drawerCount == 2 || drawerCount == 4) - yAdj = -.5f; - else if (drawerCount == 1) - yAdj = -3f; + if (drawerCount == 2 || drawerCount == 4) yAdj = -.5f; + else if (drawerCount == 1) yAdj = -3f; GL11.glPushMatrix(); @@ -438,19 +441,24 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer EntityItem itemEnt = new EntityItem(null, 0, 0, 0, itemStack); itemEnt.hoverStart = 0; itemRenderer.doRender(itemEnt, 0, 0, 0, 0, 0); + } catch (Exception e) { } - catch (Exception e) { } GL11.glPopMatrix(); } - private void renderFastItem (ItemStack itemStack, TileEntityDrawers tile, int slot, ForgeDirection side, float depth, float partialTickTime) { + private void renderFastItem( + ItemStack itemStack, + TileEntityDrawers tile, + int slot, + ForgeDirection side, + float depth, + float partialTickTime) { boolean skipRenderHook = false; Block itemBlock = Block.getBlockFromItem(itemStack.getItem()); if (itemBlock != null) { String itemBlockName = GameData.getBlockRegistry().getNameForObject(itemBlock); - if (itemBlockName != null && itemBlockName.equals("Mariculture:tanks")) - skipRenderHook = true; + if (itemBlockName != null && itemBlockName.equals("Mariculture:tanks")) skipRenderHook = true; } Minecraft mc = Minecraft.getMinecraft(); @@ -459,12 +467,16 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer float yunit = getYOffset(drawerCount, slot); float size = (drawerCount == 1) ? .5f : .25f; - BlockDrawers block = (BlockDrawers)tile.getBlockType(); + BlockDrawers block = (BlockDrawers) tile.getBlockType(); GL11.glPushMatrix(); alignRendering(side); - moveRendering(size, getOffsetXForSide(side, xunit) * 16 - (8 * size), 12.25f - yunit, 1f - depth + block.getTrimDepth() - .005f); + moveRendering( + size, + getOffsetXForSide(side, xunit) * 16 - (8 * size), + 12.25f - yunit, + 1f - depth + block.getTrimDepth() - .005f); List renderHandlers = StorageDrawers.renderRegistry.getRenderHandlers(); for (int i = 0, n = renderHandlers.size(); i < n; i++) { @@ -476,8 +488,7 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer GL11.glScalef(2.6f, 2.6f, 1); GL11.glRotatef(171.6f, 0, 1, 0); GL11.glRotatef(84.9f, 1, 0, 0); - } - else { + } else { GL11.glScalef(1.92f, 1.92f, 1); GL11.glRotatef(169.2f, 0, 1, 0); GL11.glRotatef(79.0f, 1, 0, 0); @@ -490,69 +501,82 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer GL11.glDisable(GL11.GL_NORMALIZE); try { - if (skipRenderHook || !ForgeHooksClient.renderInventoryItem(this.renderBlocks, mc.renderEngine, itemStack, true, 0, 0, 0)) + if (skipRenderHook + || !ForgeHooksClient.renderInventoryItem( + this.renderBlocks, mc.renderEngine, itemStack, true, 0, 0, 0)) itemRenderer.renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, itemStack, 0, 0, true); + } catch (Exception e) { } - catch (Exception e) { } GL11.glPopMatrix(); } - private boolean isItemBlockType (ItemStack itemStack) { + private boolean isItemBlockType(ItemStack itemStack) { return itemStack.getItemSpriteNumber() == 0 - && itemStack.getItem() instanceof ItemBlock - && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(itemStack.getItem()).getRenderType()); + && itemStack.getItem() instanceof ItemBlock + && RenderBlocks.renderItemIn3d( + Block.getBlockFromItem(itemStack.getItem()).getRenderType()); } - private float getXOffset (int drawerCount, int slot) { + private float getXOffset(int drawerCount, int slot) { switch (drawerCount) { - case 1: return itemOffset1X[slot]; - case 2: return itemOffset2X[slot]; - case 3: return itemOffset3X[slot]; - case 4: return itemOffset4X[slot]; - default: return 0; + case 1: + return itemOffset1X[slot]; + case 2: + return itemOffset2X[slot]; + case 3: + return itemOffset3X[slot]; + case 4: + return itemOffset4X[slot]; + default: + return 0; } } - private float getYOffset (int drawerCount, int slot) { + private float getYOffset(int drawerCount, int slot) { switch (drawerCount) { - case 1: return itemOffset1Y[slot]; - case 2: return itemOffset2Y[slot]; - case 3: return itemOffset3Y[slot]; - case 4: return itemOffset4Y[slot]; - default: return 0; + case 1: + return itemOffset1Y[slot]; + case 2: + return itemOffset2Y[slot]; + case 3: + return itemOffset3Y[slot]; + case 4: + return itemOffset4Y[slot]; + default: + return 0; } } - private void alignRendering (ForgeDirection side) { + private void alignRendering(ForgeDirection side) { GL11.glTranslatef(.5f, .5f, .5f); - GL11.glRotatef(180f, 0, 0, 1f); // Render is upside-down: correct it. + GL11.glRotatef(180f, 0, 0, 1f); // Render is upside-down: correct it. GL11.glRotatef(getRotationYForSide2D(side), 0, 1, 0); GL11.glTranslatef(-.5f, -.5f, -.5f); } - private void moveRendering (float size, float offsetX, float offsetY, float offsetZ) { + private void moveRendering(float size, float offsetX, float offsetY, float offsetZ) { GL11.glTranslatef(0, 0, offsetZ); GL11.glScalef(1 / 16f, 1 / 16f, -.0001f); GL11.glTranslatef(offsetX, offsetY, 0); GL11.glScalef(size, size, 1); } - private static final float[] sideRotationY = { 0, 0, 0, 2, 1, 3 }; + private static final float[] sideRotationY = {0, 0, 0, 2, 1, 3}; - private float getRotationYForSide (ForgeDirection side) { + private float getRotationYForSide(ForgeDirection side) { return sideRotationY[side.ordinal()] * 90; } - private static final float[] sideRotationY2D = { 0, 0, 0, 2, 3, 1 }; + private static final float[] sideRotationY2D = {0, 0, 0, 2, 3, 1}; - private float getRotationYForSide2D (ForgeDirection side) { + private float getRotationYForSide2D(ForgeDirection side) { return sideRotationY2D[side.ordinal()] * 90; } - private static final float[] offsetX = { 0, 0, 0, 0, 0, 0 }; + private static final float[] offsetX = {0, 0, 0, 0, 0, 0}; - private float getOffsetXForSide (ForgeDirection side, float x) { + private float getOffsetXForSide(ForgeDirection side, float x) { return Math.abs(offsetX[side.ordinal()] - x); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityFramingRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityFramingRenderer.java index b975ac9..70d946f 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityFramingRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityFramingRenderer.java @@ -17,34 +17,31 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class TileEntityFramingRenderer extends TileEntitySpecialRenderer -{ +public class TileEntityFramingRenderer extends TileEntitySpecialRenderer { private RenderItem itemRenderer = new RenderItem() { @Override - public byte getMiniBlockCount (ItemStack stack, byte original) { + public byte getMiniBlockCount(ItemStack stack, byte original) { return 1; } @Override - public boolean shouldBob () { + public boolean shouldBob() { return false; } @Override - public boolean shouldSpreadItems () { + public boolean shouldSpreadItems() { return false; } }; @Override - public void renderTileEntityAt (TileEntity tile, double x, double y, double z, float partialTickTime) { + public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTickTime) { TileEntityFramingTable tileTable = (TileEntityFramingTable) tile; - if (tileTable == null) - return; + if (tileTable == null) return; int meta = tile.getBlockMetadata(); - if ((meta & 8) != 0) - return; + if ((meta & 8) != 0) return; itemRenderer.setRenderManager(RenderManager.instance); @@ -52,11 +49,16 @@ public class TileEntityFramingRenderer extends TileEntitySpecialRenderer if (target != null) { Block block = Block.getBlockFromItem(target.getItem()); if (block instanceof BlockDrawersCustom) { - ItemStack result = ItemCustomDrawers.makeItemStack(block, 1, tileTable.getStackInSlot(1), tileTable.getStackInSlot(2), tileTable.getStackInSlot(3)); + ItemStack result = ItemCustomDrawers.makeItemStack( + block, + 1, + tileTable.getStackInSlot(1), + tileTable.getStackInSlot(2), + tileTable.getStackInSlot(3)); renderSlot(tileTable, x, y, z, result, 2f, 0f, .25f, 0f); - } - else if (block instanceof BlockTrimCustom) { - ItemStack result = ItemCustomTrim.makeItemStack(block, 1, tileTable.getStackInSlot(1), tileTable.getStackInSlot(2)); + } else if (block instanceof BlockTrimCustom) { + ItemStack result = ItemCustomTrim.makeItemStack( + block, 1, tileTable.getStackInSlot(1), tileTable.getStackInSlot(2)); renderSlot(tileTable, x, y, z, result, 2f, 0f, .25f, 0f); } } @@ -66,13 +68,20 @@ public class TileEntityFramingRenderer extends TileEntitySpecialRenderer renderSlot(tileTable, x, y, z, tileTable.getStackInSlot(3), 1.15f, .225f, .15f, .65f); } - private void renderSlot (TileEntityFramingTable tileTable, double x, double y, double z, ItemStack item, float scale, float tx, float ty, float tz) { - if (item == null) - return; + private void renderSlot( + TileEntityFramingTable tileTable, + double x, + double y, + double z, + ItemStack item, + float scale, + float tx, + float ty, + float tz) { + if (item == null) return; Block itemBlock = Block.getBlockFromItem(item.getItem()); - if (itemBlock == null) - return; + if (itemBlock == null) return; int meta = tileTable.getBlockMetadata(); int side = meta & 0x07; @@ -84,12 +93,9 @@ public class TileEntityFramingRenderer extends TileEntitySpecialRenderer GL11.glTranslated(x + .5, y + 1, z + .5); - if (side == 2) - GL11.glRotatef(90, 0, 1, 0); - if (side == 3) - GL11.glRotatef(270, 0, 1, 0); - if (side == 4) - GL11.glRotatef(180, 0, 1, 0); + if (side == 2) GL11.glRotatef(90, 0, 1, 0); + if (side == 3) GL11.glRotatef(270, 0, 1, 0); + if (side == 4) GL11.glRotatef(180, 0, 1, 0); GL11.glTranslatef(0, 0f, .5f); GL11.glTranslatef(tx, ty, tz); @@ -102,8 +108,8 @@ public class TileEntityFramingRenderer extends TileEntitySpecialRenderer EntityItem itemEnt = new EntityItem(null, 0, 0, 0, item); itemEnt.hoverStart = 0; itemRenderer.doRender(itemEnt, 0, 0, 0, 0, 0); + } catch (Exception e) { } - catch (Exception e) { } GL11.glPopMatrix(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TrimCustomRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TrimCustomRenderer.java index 066134a..184bbb1 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TrimCustomRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TrimCustomRenderer.java @@ -11,43 +11,36 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -public class TrimCustomRenderer implements ISimpleBlockRenderingHandler -{ +public class TrimCustomRenderer implements ISimpleBlockRenderingHandler { private CommonTrimRenderer commonRender = new CommonTrimRenderer(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelId, RenderBlocks renderer) { - - } + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {} @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - if (!(block instanceof BlockTrimCustom)) - return false; + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + if (!(block instanceof BlockTrimCustom)) return false; return renderWorldBlock(world, x, y, z, (BlockTrimCustom) block, modelId, renderer); } - private boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, BlockTrimCustom block, int modelId, RenderBlocks renderer) { + private boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, BlockTrimCustom block, int modelId, RenderBlocks renderer) { TileEntityTrim tile = block.getTileEntity(world, x, y, z); - if (tile == null) - return false; + if (tile == null) return false; ItemStack materialSide = tile.getMaterialSide(); - if (materialSide == null) - materialSide = new ItemStack(block); + if (materialSide == null) materialSide = new ItemStack(block); ItemStack materialTrim = tile.getMaterialTrim(); - if (materialTrim == null) - materialTrim = materialSide; + if (materialTrim == null) materialTrim = materialSide; IIcon trimIcon = Block.getBlockFromItem(materialTrim.getItem()).getIcon(4, materialTrim.getItemDamage()); IIcon panelIcon = Block.getBlockFromItem(materialSide.getItem()).getIcon(4, materialSide.getItemDamage()); - if (trimIcon == null) - trimIcon = block.getDefaultTrimIcon(); - if (panelIcon == null) - panelIcon = block.getDefaultFaceIcon(); + if (trimIcon == null) trimIcon = block.getDefaultTrimIcon(); + if (panelIcon == null) panelIcon = block.getDefaultFaceIcon(); commonRender.render(world, x, y, z, block, panelIcon, trimIcon); @@ -55,12 +48,12 @@ public class TrimCustomRenderer implements ISimpleBlockRenderingHandler } @Override - public boolean shouldRender3DInInventory (int modelId) { + public boolean shouldRender3DInInventory(int modelId) { return true; } @Override - public int getRenderId () { + public int getRenderId() { return StorageDrawers.proxy.trimCustomRenderID; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TrimItemRender.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TrimItemRender.java index 6b28bc1..ac81140 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TrimItemRender.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TrimItemRender.java @@ -10,38 +10,33 @@ import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -public class TrimItemRender implements IItemRenderer -{ +public class TrimItemRender implements IItemRenderer { private CommonTrimRenderer commonRender = new CommonTrimRenderer(); @Override - public boolean handleRenderType (ItemStack item, ItemRenderType type) { + public boolean handleRenderType(ItemStack item, ItemRenderType type) { return true; } @Override - public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { return true; } @Override - public void renderItem (ItemRenderType type, ItemStack item, Object... data) { + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { RenderBlocks renderer = getRenderer(data); - if (renderer == null) - return; + if (renderer == null) return; Block block = Block.getBlockFromItem(item.getItem()); - if (!(block instanceof BlockTrimCustom)) - return; + if (!(block instanceof BlockTrimCustom)) return; renderTrim((BlockTrimCustom) block, item, renderer, type); } - private void renderTrim (BlockTrimCustom block, ItemStack item, RenderBlocks renderer, ItemRenderType renderType) { - if (renderType == ItemRenderType.INVENTORY) - GL11.glRotatef(90, 0, 1, 0); - if (renderType == ItemRenderType.ENTITY) - GL11.glRotatef(180, 0, 1, 0); + private void renderTrim(BlockTrimCustom block, ItemStack item, RenderBlocks renderer, ItemRenderType renderType) { + if (renderType == ItemRenderType.INVENTORY) GL11.glRotatef(90, 0, 1, 0); + if (renderType == ItemRenderType.ENTITY) GL11.glRotatef(180, 0, 1, 0); if (renderType == ItemRenderType.INVENTORY || renderType == ItemRenderType.ENTITY) GL11.glTranslatef(-.5f, -.5f, -.5f); @@ -51,24 +46,18 @@ public class TrimItemRender implements IItemRenderer if (item.hasTagCompound()) { NBTTagCompound tag = item.getTagCompound(); - if (tag.hasKey("MatS")) - materialSide = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatS")); - if (tag.hasKey("MatT")) - materialTrim = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatT")); + if (tag.hasKey("MatS")) materialSide = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatS")); + if (tag.hasKey("MatT")) materialTrim = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("MatT")); } - if (materialSide == null) - materialSide = new ItemStack(block); - if (materialTrim == null) - materialTrim = materialSide; + if (materialSide == null) materialSide = new ItemStack(block); + if (materialTrim == null) materialTrim = materialSide; IIcon trimIcon = Block.getBlockFromItem(materialTrim.getItem()).getIcon(4, materialTrim.getItemDamage()); IIcon panelIcon = Block.getBlockFromItem(materialSide.getItem()).getIcon(4, materialSide.getItemDamage()); - if (trimIcon == null) - trimIcon = block.getDefaultTrimIcon(); - if (panelIcon == null) - panelIcon = block.getDefaultFaceIcon(); + if (trimIcon == null) trimIcon = block.getDefaultTrimIcon(); + if (panelIcon == null) panelIcon = block.getDefaultFaceIcon(); commonRender.render(null, 0, 0, 0, block, panelIcon, trimIcon); @@ -76,10 +65,9 @@ public class TrimItemRender implements IItemRenderer GL11.glTranslatef(.5f, .5f, .5f); } - private RenderBlocks getRenderer (Object[] data) { + private RenderBlocks getRenderer(Object[] data) { for (Object obj : data) { - if (obj instanceof RenderBlocks) - return (RenderBlocks)obj; + if (obj instanceof RenderBlocks) return (RenderBlocks) obj; } return null; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonDrawerRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonDrawerRenderer.java index e22f696..b087eae 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonDrawerRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonDrawerRenderer.java @@ -1,7 +1,6 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer.common; import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.client.renderer.ModularBoxRenderer; import com.jaquadro.minecraft.storagedrawers.client.renderer.PanelBoxRenderer; import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; @@ -9,8 +8,7 @@ import com.jaquadro.minecraft.storagedrawers.util.RenderHelperState; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -public class CommonDrawerRenderer -{ +public class CommonDrawerRenderer { private PanelBoxRenderer panelRenderer = new PanelBoxRenderer(); private double depth; @@ -20,7 +18,7 @@ public class CommonDrawerRenderer private static double unit7 = 0.4375; private static double unit9 = 0.5625; - private RenderHelper start (IBlockAccess world, int x, int y, int z, BlockDrawersCustom block, int direction) { + private RenderHelper start(IBlockAccess world, int x, int y, int z, BlockDrawersCustom block, int direction) { depth = block.halfDepth ? .5 : 0; trimWidth = block.getTrimWidth(); trimDepth = block.getTrimDepth(); @@ -33,31 +31,39 @@ public class CommonDrawerRenderer panelRenderer.setPanelColor(ModularBoxRenderer.COLOR_WHITE); RenderHelper renderHelper = RenderHelper.instance; - if (world != null) - renderHelper.setColorAndBrightness(world, block, x, y, z); + if (world != null) renderHelper.setColorAndBrightness(world, block, x, y, z); renderHelper.state.setRotateTransform(RenderHelper.ZNEG, direction); - renderHelper.state.setUVRotation(RenderHelper.YPOS, RenderHelperState.ROTATION_BY_FACE_FACE[RenderHelper.ZNEG][direction]); + renderHelper.state.setUVRotation( + RenderHelper.YPOS, RenderHelperState.ROTATION_BY_FACE_FACE[RenderHelper.ZNEG][direction]); return renderHelper; } - private void end () { + private void end() { RenderHelper renderHelper = RenderHelper.instance; renderHelper.state.clearRotateTransform(); renderHelper.state.clearUVRotation(RenderHelper.YPOS); } - public void renderBasePass (IBlockAccess world, int x, int y, int z, BlockDrawersCustom block, int direction, IIcon iconSide, IIcon iconTrim, IIcon iconFront) { + public void renderBasePass( + IBlockAccess world, + int x, + int y, + int z, + BlockDrawersCustom block, + int direction, + IIcon iconSide, + IIcon iconTrim, + IIcon iconFront) { RenderHelper renderHelper = start(world, x, y, z, block, direction); panelRenderer.setTrimIcon(iconTrim); panelRenderer.setPanelIcon(iconSide); for (int i = 0; i < 6; i++) { - if (i != RenderHelper.ZNEG) - panelRenderer.renderFacePanel(i, world, block, x, y, z, 0, 0, depth, 1, 1, 1); + if (i != RenderHelper.ZNEG) panelRenderer.renderFacePanel(i, world, block, x, y, z, 0, 0, depth, 1, 1, 1); panelRenderer.renderFaceTrim(i, world, block, x, y, z, 0, 0, depth, 1, 1, 1); } @@ -67,8 +73,7 @@ public class CommonDrawerRenderer if (block.drawerCount == 1) { renderHelper.setRenderBounds(trimWidth, trimWidth, depth + trimDepth, 1 - trimWidth, 1 - trimWidth, 1); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconFront); - } - else if (block.drawerCount == 2) { + } else if (block.drawerCount == 2) { renderHelper.setRenderBounds(trimWidth, trimWidth, depth + trimDepth, 1 - trimWidth, unit7, 1); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconFront); renderHelper.setRenderBounds(trimWidth, unit9, depth + trimDepth, 1 - trimWidth, 1 - trimWidth, 1); @@ -76,8 +81,7 @@ public class CommonDrawerRenderer renderHelper.setRenderBounds(trimWidth, unit7, depth + trimDepth, 1 - trimWidth, unit9, 1); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconTrim); - } - else if (block.drawerCount == 4) { + } else if (block.drawerCount == 4) { renderHelper.state.flipTexture = true; renderHelper.setRenderBounds(trimWidth, trimWidth, depth + trimDepth, unit7, unit7, 1); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconFront); @@ -104,7 +108,15 @@ public class CommonDrawerRenderer end(); } - public void renderOverlayPass (IBlockAccess world, int x, int y, int z, BlockDrawersCustom block, int direction, IIcon iconTrim, IIcon iconFront) { + public void renderOverlayPass( + IBlockAccess world, + int x, + int y, + int z, + BlockDrawersCustom block, + int direction, + IIcon iconTrim, + IIcon iconFront) { RenderHelper renderHelper = start(world, x, y, z, block, direction); IIcon trimShadow = block.getTrimShadowOverlay(iconTrim == iconFront); @@ -116,8 +128,7 @@ public class CommonDrawerRenderer renderHelper.setRenderBounds(trimWidth, trimWidth, depth + trimDepth, 1 - trimWidth, 1 - trimWidth, 1); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getHandleOverlay()); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getFaceShadowOverlay()); - } - else if (block.drawerCount == 2) { + } else if (block.drawerCount == 2) { renderHelper.setRenderBounds(trimWidth, trimWidth, depth + trimDepth, 1 - trimWidth, unit7, 1); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getHandleOverlay()); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getFaceShadowOverlay()); @@ -128,8 +139,7 @@ public class CommonDrawerRenderer renderHelper.setRenderBounds(trimWidth, unit7, depth + trimDepth, 1 - trimWidth, unit9, 1); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, trimShadow); - } - else if (block.drawerCount == 4) { + } else if (block.drawerCount == 4) { renderHelper.setRenderBounds(trimWidth, trimWidth, depth + trimDepth, unit7, unit7, 1); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getHandleOverlay()); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getFaceShadowOverlay()); @@ -156,9 +166,7 @@ public class CommonDrawerRenderer renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, trimShadow); renderHelper.setRenderBounds(unit7, unit7, depth + trimDepth, unit9, unit9, 1); renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, trimShadow); - } - else - RenderHelper.instance.renderEmptyPlane(x, y, z); + } else RenderHelper.instance.renderEmptyPlane(x, y, z); end(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonFramingRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonFramingRenderer.java index c0374c2..410b6a9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonFramingRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonFramingRenderer.java @@ -6,78 +6,91 @@ import com.jaquadro.minecraft.storagedrawers.util.RenderHelperState; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -public class CommonFramingRenderer -{ +public class CommonFramingRenderer { private static double unit = .0625; private static double unit2 = unit * 2; private static double unit4 = unit * 4; private static double unit14 = unit * 14; - private static double[][] baseBoundsLeftY = new double[][] { - { unit, 1 - unit2, unit, 1, 1, 1 - unit } - }; + private static double[][] baseBoundsLeftY = new double[][] {{unit, 1 - unit2, unit, 1, 1, 1 - unit}}; private static double[][] trimBoundsLeftY = new double[][] { - { 0, 1 - unit2, unit, unit, 1, 1 - unit }, - { 0, 1 - unit2, 0, unit, 1, unit }, - { 0, 1 - unit2, 1 - unit, unit, 1, 1 }, - { unit, 1 - unit2, 0, 1, 1, unit }, - { unit, 1 - unit2, 1 - unit, 1, 1, 1 }, + {0, 1 - unit2, unit, unit, 1, 1 - unit}, + {0, 1 - unit2, 0, unit, 1, unit}, + {0, 1 - unit2, 1 - unit, unit, 1, 1}, + {unit, 1 - unit2, 0, 1, 1, unit}, + {unit, 1 - unit2, 1 - unit, 1, 1, 1}, }; private static double[][] trimBoundsLeftZ = new double[][] { - { 0, 1 - unit2, 0, unit, 1, 1 }, - { unit, 1 - unit2, 0, 1, 1, 1 }, + {0, 1 - unit2, 0, unit, 1, 1}, + {unit, 1 - unit2, 0, 1, 1, 1}, }; private static double[][] trimBoundsLeftX = new double[][] { - { 0, 1 - unit2, 0, 1, 1, unit }, - { 0, 1 - unit2, unit, 1, 1, 1 - unit }, - { 0, 1 - unit2, 1 - unit, 1, 1, 1 }, + {0, 1 - unit2, 0, 1, 1, unit}, + {0, 1 - unit2, unit, 1, 1, 1 - unit}, + {0, 1 - unit2, 1 - unit, 1, 1, 1}, }; - private static double[][] baseBoundsRightY = new double[][] { - { 0, 1 - unit2, unit, 1 - unit, 1, 1 - unit } - }; + private static double[][] baseBoundsRightY = new double[][] {{0, 1 - unit2, unit, 1 - unit, 1, 1 - unit}}; private static double[][] trimBoundsRightY = new double[][] { - { 1 - unit, 1 - unit2, unit, 1, 1, 1 - unit }, - { 1 - unit, 1 - unit2, 0, 1, 1, unit }, - { 1 - unit, 1 - unit2, 1 - unit, 1, 1, 1 }, - { 0, 1 - unit2, 0, 1 - unit, 1, unit }, - { 0, 1 - unit2, 1 - unit, 1 - unit, 1, 1 }, + {1 - unit, 1 - unit2, unit, 1, 1, 1 - unit}, + {1 - unit, 1 - unit2, 0, 1, 1, unit}, + {1 - unit, 1 - unit2, 1 - unit, 1, 1, 1}, + {0, 1 - unit2, 0, 1 - unit, 1, unit}, + {0, 1 - unit2, 1 - unit, 1 - unit, 1, 1}, }; private static double[][] trimBoundsRightZ = new double[][] { - { 1 - unit, 1 - unit2, 0, 1, 1, 1 }, - { 0, 1 - unit2, 0, 1 - unit, 1, 1 }, + {1 - unit, 1 - unit2, 0, 1, 1, 1}, + {0, 1 - unit2, 0, 1 - unit, 1, 1}, }; private static double[][] trimBoundsRightX = new double[][] { - { 0, 1 - unit2, 0, 1, 1, unit }, - { 0, 1 - unit2, unit, 1, 1, 1 - unit }, - { 0, 1 - unit2, 1 - unit, 1, 1, 1 }, + {0, 1 - unit2, 0, 1, 1, unit}, + {0, 1 - unit2, unit, 1, 1, 1 - unit}, + {0, 1 - unit2, 1 - unit, 1, 1, 1}, }; - public void renderLeft (IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block) { - renderTableBox(blockAccess, x, y, z, block, baseBoundsLeftY, trimBoundsLeftY, trimBoundsLeftZ, trimBoundsLeftX, true); + public void renderLeft(IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block) { + renderTableBox( + blockAccess, x, y, z, block, baseBoundsLeftY, trimBoundsLeftY, trimBoundsLeftZ, trimBoundsLeftX, true); renderStructure(blockAccess, x, y, z, block, true); } - public void renderRight (IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block) { - renderTableBox(blockAccess, x, y, z, block, baseBoundsRightY, trimBoundsRightY, trimBoundsRightZ, trimBoundsRightX, false); + public void renderRight(IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block) { + renderTableBox( + blockAccess, + x, + y, + z, + block, + baseBoundsRightY, + trimBoundsRightY, + trimBoundsRightZ, + trimBoundsRightX, + false); renderStructure(blockAccess, x, y, z, block, false); } - public void renderOverlayLeft (IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block) { + public void renderOverlayLeft(IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block) { renderOverlay(blockAccess, x, y, z, block, baseBoundsLeftY, true); } - public void renderOverlayRight (IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block) { + public void renderOverlayRight(IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block) { renderOverlay(blockAccess, x, y, z, block, baseBoundsRightY, false); } - public void renderOverlay (IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block, double[][] baseBoundsY, boolean left) { + public void renderOverlay( + IBlockAccess blockAccess, + int x, + int y, + int z, + BlockFramingTable block, + double[][] baseBoundsY, + boolean left) { IIcon iconOverlay = block.getIconOverlay(left); RenderHelper renderer = RenderHelper.instance; @@ -88,7 +101,7 @@ public class CommonFramingRenderer } } - private void renderStructure (IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block, boolean left) { + private void renderStructure(IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block, boolean left) { IIcon iconSurface = block.getIconBase(); renderFoot(blockAccess, x, y, z, block, iconSurface, left); @@ -96,7 +109,17 @@ public class CommonFramingRenderer renderBraces(blockAccess, x, y, z, block, iconSurface, left); } - private void renderTableBox (IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block, double[][] baseBoundsY, double[][] trimBoundsY, double[][] trimBoundsZ, double[][] trimBoundsX, boolean left) { + private void renderTableBox( + IBlockAccess blockAccess, + int x, + int y, + int z, + BlockFramingTable block, + double[][] baseBoundsY, + double[][] trimBoundsY, + double[][] trimBoundsZ, + double[][] trimBoundsX, + boolean left) { RenderHelper renderer = RenderHelper.instance; IIcon iconSurface = block.getIconBase(); @@ -128,7 +151,8 @@ public class CommonFramingRenderer } } - private void renderFoot (IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block, IIcon icon, boolean left) { + private void renderFoot( + IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block, IIcon icon, boolean left) { RenderHelper renderer = RenderHelper.instance; float oldColor = renderer.state.colorMultYPos; @@ -140,57 +164,49 @@ public class CommonFramingRenderer double xStart = left ? unit2 : 1 - unit2 - unit2; renderer.setRenderBounds(xStart, 0, 0, xStart + unit2, unit2, 1); - for (int i = 0; i < 6; i++) - renderer.renderFace(i, blockAccess, block, x,y , z, icon); + for (int i = 0; i < 6; i++) renderer.renderFace(i, blockAccess, block, x, y, z, icon); - for (int i = 0; i < 2; i++) - renderer.state.clearUVRotation(i); + for (int i = 0; i < 2; i++) renderer.state.clearUVRotation(i); renderer.state.colorMultYPos = oldColor; } - private void renderLegs (IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block, IIcon icon, boolean left) { + private void renderLegs( + IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block, IIcon icon, boolean left) { RenderHelper renderer = RenderHelper.instance; - for (int i = 2; i < 6; i++) - renderer.state.setUVRotation(i, RenderHelperState.ROTATE90); + for (int i = 2; i < 6; i++) renderer.state.setUVRotation(i, RenderHelperState.ROTATE90); double xStart = left ? unit2 : 1 - unit2 - unit2; renderer.setRenderBounds(xStart, unit2, unit2, xStart + unit2, 1 - unit2, unit2 + unit2); - for (int i = 2; i < 6; i++) - renderer.renderFace(i, blockAccess, block, x, y, z, icon); + for (int i = 2; i < 6; i++) renderer.renderFace(i, blockAccess, block, x, y, z, icon); renderer.setRenderBounds(xStart, unit2, 1 - unit2 - unit2, xStart + unit2, 1 - unit2, 1 - unit2); - for (int i = 2; i < 6; i++) - renderer.renderFace(i, blockAccess, block, x, y, z, icon); + for (int i = 2; i < 6; i++) renderer.renderFace(i, blockAccess, block, x, y, z, icon); - for (int i = 2; i < 6; i++) - renderer.state.clearUVRotation(i); + for (int i = 2; i < 6; i++) renderer.state.clearUVRotation(i); } - private void renderBraces (IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block, IIcon icon, boolean left) { + private void renderBraces( + IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block, IIcon icon, boolean left) { RenderHelper renderer = RenderHelper.instance; float oldColor = renderer.state.colorMultYPos; renderer.state.colorMultYPos = .85f; - for (int i = 0; i < 2; i++) - renderer.state.setUVRotation(i, renderer.state.rotateTransform); + for (int i = 0; i < 2; i++) renderer.state.setUVRotation(i, renderer.state.rotateTransform); double xStart = left ? unit2 + unit2 : 0; double xStop = left ? 1 : 1 - unit2 - unit2; renderer.setRenderBounds(xStart, unit4, unit2, xStop, unit4 + unit2, unit2 + unit2); - for (int i = 0; i < 4; i++) - renderer.renderFace(i, blockAccess, block, x, y, z, icon); + for (int i = 0; i < 4; i++) renderer.renderFace(i, blockAccess, block, x, y, z, icon); renderer.setRenderBounds(xStart, unit4, 1 - unit2 - unit2, xStop, unit4 + unit2, 1 - unit2); - for (int i = 0; i < 4; i++) - renderer.renderFace(i, blockAccess, block, x, y, z, icon); + for (int i = 0; i < 4; i++) renderer.renderFace(i, blockAccess, block, x, y, z, icon); - for (int i = 0; i < 2; i++) - renderer.state.clearUVRotation(i); + for (int i = 0; i < 2; i++) renderer.state.clearUVRotation(i); renderer.state.colorMultYPos = oldColor; } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonTrimRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonTrimRenderer.java index aa02137..420c28e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonTrimRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/common/CommonTrimRenderer.java @@ -7,13 +7,12 @@ import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -public class CommonTrimRenderer -{ +public class CommonTrimRenderer { private PanelBoxRenderer panelRenderer = new PanelBoxRenderer(); private double trimWidth; - private RenderHelper start (IBlockAccess world, int x, int y, int z, BlockTrimCustom block) { + private RenderHelper start(IBlockAccess world, int x, int y, int z, BlockTrimCustom block) { trimWidth = .0625f; panelRenderer.setTrimWidth(trimWidth); @@ -22,13 +21,12 @@ public class CommonTrimRenderer panelRenderer.setPanelColor(ModularBoxRenderer.COLOR_WHITE); RenderHelper renderHelper = RenderHelper.instance; - if (world != null) - renderHelper.setColorAndBrightness(world, block, x, y, z); + if (world != null) renderHelper.setColorAndBrightness(world, block, x, y, z); return renderHelper; } - public void render (IBlockAccess world, int x, int y, int z, BlockTrimCustom block, IIcon iconSide, IIcon iconTrim) { + public void render(IBlockAccess world, int x, int y, int z, BlockTrimCustom block, IIcon iconSide, IIcon iconTrim) { RenderHelper renderHelper = start(world, x, y, z, block); panelRenderer.setTrimIcon(iconTrim); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java index 43fa08e..8ab3ee1 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java @@ -1,15 +1,13 @@ package com.jaquadro.minecraft.storagedrawers.config; import cpw.mods.fml.common.Loader; +import java.util.ArrayList; +import java.util.List; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import java.util.ArrayList; -import java.util.List; - -public class CompTierRegistry -{ +public class CompTierRegistry { public class Record { public ItemStack upper; public ItemStack lower; @@ -18,7 +16,7 @@ public class CompTierRegistry private List records = new ArrayList(); - public CompTierRegistry () { + public CompTierRegistry() { register(new ItemStack(Blocks.clay), new ItemStack(Items.clay_ball), 4); register(new ItemStack(Blocks.snow), new ItemStack(Items.snowball), 4); register(new ItemStack(Blocks.glowstone), new ItemStack(Items.glowstone_dust), 4); @@ -31,9 +29,8 @@ public class CompTierRegistry register(new ItemStack(Blocks.sandstone), new ItemStack(Blocks.sand), 4); } - public boolean register (ItemStack upper, ItemStack lower, int convRate) { - if (upper == null || lower == null) - return false; + public boolean register(ItemStack upper, ItemStack lower, int convRate) { + if (upper == null || lower == null) return false; unregisterUpperTarget(upper); unregisterLowerTarget(lower); @@ -51,7 +48,7 @@ public class CompTierRegistry return true; } - public boolean unregisterUpperTarget (ItemStack stack) { + public boolean unregisterUpperTarget(ItemStack stack) { for (Record r : records) { if (ItemStack.areItemStacksEqual(stack, r.upper)) { records.remove(r); @@ -62,7 +59,7 @@ public class CompTierRegistry return false; } - public boolean unregisterLowerTarget (ItemStack stack) { + public boolean unregisterLowerTarget(ItemStack stack) { for (Record r : records) { if (ItemStack.areItemStacksEqual(stack, r.lower)) { records.remove(r); @@ -73,27 +70,23 @@ public class CompTierRegistry return false; } - public Record findHigherTier (ItemStack stack) { - if (stack == null || stack.getItem() == null) - return null; + public Record findHigherTier(ItemStack stack) { + if (stack == null || stack.getItem() == null) return null; for (int i = 0, n = records.size(); i < n; i++) { Record r = records.get(i); - if (stack.isItemEqual(r.lower) && ItemStack.areItemStackTagsEqual(stack, r.lower)) - return r; + if (stack.isItemEqual(r.lower) && ItemStack.areItemStackTagsEqual(stack, r.lower)) return r; } return null; } - public Record findLowerTier (ItemStack stack) { - if (stack == null || stack.getItem() == null) - return null; + public Record findLowerTier(ItemStack stack) { + if (stack == null || stack.getItem() == null) return null; for (int i = 0, n = records.size(); i < n; i++) { Record r = records.get(i); - if (stack.isItemEqual(r.upper) && ItemStack.areItemStackTagsEqual(stack, r.upper)) - return r; + if (stack.isItemEqual(r.upper) && ItemStack.areItemStackTagsEqual(stack, r.upper)) return r; } return null; 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 95cab2b..c5f20ac 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ConfigManager.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ConfigManager.java @@ -5,17 +5,15 @@ import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig; import com.jaquadro.minecraft.storagedrawers.api.config.IIntegrationConfig; import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig; import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; -import net.minecraftforge.common.config.ConfigCategory; -import net.minecraftforge.common.config.Configuration; - import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraftforge.common.config.ConfigCategory; +import net.minecraftforge.common.config.Configuration; -public class ConfigManager -{ +public class ConfigManager { public class ConfigSection { public final ConfigSection parent; public final String name; @@ -23,7 +21,7 @@ public class ConfigManager private ConfigCategory category; - public ConfigSection (List list, ConfigSection parent, String name, String lang) { + public ConfigSection(List list, ConfigSection parent, String name, String lang) { this.parent = parent; this.name = name; this.lang = lang; @@ -31,24 +29,22 @@ public class ConfigManager list.add(this); } - public ConfigSection (List list, String name, String lang) { + public ConfigSection(List list, String name, String lang) { this(list, null, name, lang); } - public ConfigCategory getCategory () { - if (category != null) - return category; + public ConfigCategory getCategory() { + if (category != null) return category; if (parent != null) category = config.getCategory(parent.getCategory().getQualifiedName() + "." + name.toLowerCase()); - else - category = config.getCategory(name.toLowerCase()); + else category = config.getCategory(name.toLowerCase()); category.setLanguageKey(LANG_PREFIX + lang); return category; } - public String getQualifiedName () { + public String getQualifiedName() { return getCategory().getQualifiedName(); } } @@ -99,24 +95,24 @@ public class ConfigManager private class AddonConfig implements IAddonConfig { @Override - public boolean showAddonItemsNEI () { + public boolean showAddonItemsNEI() { return cache.addonShowNEI; } @Override - public boolean showAddonItemsVanilla () { + public boolean showAddonItemsVanilla() { return cache.addonShowVanilla; } @Override - public boolean addonItemsUseSeparateTab () { + public boolean addonItemsUseSeparateTab() { return cache.addonSeparateVanilla; } } private class BlockConfig implements IBlockConfig { @Override - public String getBlockConfigName (BlockConfiguration blockConfig) { + public String getBlockConfigName(BlockConfiguration blockConfig) { switch (blockConfig) { case BasicFull1: case SortingFull1: @@ -142,52 +138,51 @@ public class ConfigManager } @Override - public boolean isBlockEnabled (String blockConfigName) { + public boolean isBlockEnabled(String blockConfigName) { return ConfigManager.this.isBlockEnabled(blockConfigName); } @Override - public int getBlockRecipeOutput (String blockConfigName) { + public int getBlockRecipeOutput(String blockConfigName) { return ConfigManager.this.getBlockRecipeOutput(blockConfigName); } @Override - public int getBaseCapacity (String blockConfigName) { + public int getBaseCapacity(String blockConfigName) { return ConfigManager.this.getBlockBaseStorage(blockConfigName); } } private class IntegrationConfig implements IIntegrationConfig { @Override - public boolean isRefinedRelocationEnabled () { + public boolean isRefinedRelocationEnabled() { return cache.enableRefinedRelocationIntegration; } @Override - public boolean isChiselEnabled () { + public boolean isChiselEnabled() { return cache.enableChiselIntegration; } @Override - public boolean isGTNHEnabled () { + public boolean isGTNHEnabled() { return cache.enableGTNHIntegration; } - } private class UserConfig implements IUserConfig { @Override - public IAddonConfig addonConfig () { + public IAddonConfig addonConfig() { return addonConfig; } @Override - public IBlockConfig blockConfig () { + public IBlockConfig blockConfig() { return blockConfig; } @Override - public IIntegrationConfig integrationConfig () { + public IIntegrationConfig integrationConfig() { return integrationConfig; } } @@ -205,15 +200,24 @@ public class ConfigManager public final ConfigSection sectionAddons = new ConfigSection(sections, "addons", "addons"); public final List blockSections = new ArrayList(); - public final ConfigSection sectionBlocksFullDrawers1x1 = new ConfigSection(blockSections, sectionBlocks, "fulldrawers1", "blocks.fullDrawers1"); - public final ConfigSection sectionBlocksFullDrawers1x2 = new ConfigSection(blockSections, sectionBlocks, "fulldrawers2", "blocks.fullDrawers2"); - public final ConfigSection sectionBlocksFullDrawers2x2 = new ConfigSection(blockSections, sectionBlocks, "fulldrawers4", "blocks.fullDrawers4"); - public final ConfigSection sectionBlocksHalfDrawers1x2 = new ConfigSection(blockSections, sectionBlocks, "halfdrawers2", "blocks.halfDrawers2"); - public final ConfigSection sectionBlocksHalfDrawers2x2 = new ConfigSection(blockSections, sectionBlocks, "halfdrawers4", "blocks.halfDrawers4"); - public final ConfigSection sectionBlocksCompDrawers = new ConfigSection(blockSections, sectionBlocks, "compdrawers", "blocks.compDrawers"); - public final ConfigSection sectionBlocksController = new ConfigSection(blockSections, sectionBlocks, "controller", "blocks.controller"); - public final ConfigSection sectionBlocksTrim = new ConfigSection(blockSections, sectionBlocks, "trim", "blocks.trim"); - public final ConfigSection sectionBlocksSlave = new ConfigSection(blockSections, sectionBlocks, "controllerSlave", "blocks.controllerSlave"); + public final ConfigSection sectionBlocksFullDrawers1x1 = + new ConfigSection(blockSections, sectionBlocks, "fulldrawers1", "blocks.fullDrawers1"); + public final ConfigSection sectionBlocksFullDrawers1x2 = + new ConfigSection(blockSections, sectionBlocks, "fulldrawers2", "blocks.fullDrawers2"); + public final ConfigSection sectionBlocksFullDrawers2x2 = + new ConfigSection(blockSections, sectionBlocks, "fulldrawers4", "blocks.fullDrawers4"); + public final ConfigSection sectionBlocksHalfDrawers1x2 = + new ConfigSection(blockSections, sectionBlocks, "halfdrawers2", "blocks.halfDrawers2"); + public final ConfigSection sectionBlocksHalfDrawers2x2 = + new ConfigSection(blockSections, sectionBlocks, "halfdrawers4", "blocks.halfDrawers4"); + public final ConfigSection sectionBlocksCompDrawers = + new ConfigSection(blockSections, sectionBlocks, "compdrawers", "blocks.compDrawers"); + public final ConfigSection sectionBlocksController = + new ConfigSection(blockSections, sectionBlocks, "controller", "blocks.controller"); + public final ConfigSection sectionBlocksTrim = + new ConfigSection(blockSections, sectionBlocks, "trim", "blocks.trim"); + public final ConfigSection sectionBlocksSlave = + new ConfigSection(blockSections, sectionBlocks, "controllerSlave", "blocks.controllerSlave"); public Map blockSectionsMap = new HashMap(); @@ -222,14 +226,13 @@ public class ConfigManager public IIntegrationConfig integrationConfig = new IntegrationConfig(); public IUserConfig userConfig = new UserConfig(); - //private Property itemRenderType; + // private Property itemRenderType; - public ConfigManager (File file) { + public ConfigManager(File file) { config = new Configuration(file); cache = new ConfigCache(); - for (ConfigSection section : sections) - section.getCategory(); + for (ConfigSection section : sections) section.getCategory(); for (ConfigSection section : blockSections) { section.getCategory(); @@ -239,144 +242,312 @@ public class ConfigManager syncConfig(); } - public void syncConfig () { - cache.enableIndicatorUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableIndicatorUpgrades", true).setLanguageKey(LANG_PREFIX + "prop.enableIndicatorUpgrades").setRequiresMcRestart(true).getBoolean(); - cache.enableStorageUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableStorageUpgrades", true).setLanguageKey(LANG_PREFIX + "prop.enableStorageUpgrades").setRequiresMcRestart(true).getBoolean(); - cache.enableLockUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableLockUpgrades", true).setLanguageKey(LANG_PREFIX + "prop.enableLockUpgrades").setRequiresMcRestart(true).getBoolean(); - cache.enableVoidUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableVoidUpgrades", true).setLanguageKey(LANG_PREFIX + "prop.enableVoidUpgrades").setRequiresMcRestart(true).getBoolean(); - cache.enableCreativeUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableCreativeUpgrades", true).setLanguageKey(LANG_PREFIX + "prop.enableCreativeUpgrades").setRequiresMcRestart(true).getBoolean(); - cache.enableShroudUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableShroudUpgrades", true).setLanguageKey(LANG_PREFIX + "prop.enableShroudUpgrades").setRequiresMcRestart(true).getBoolean(); - cache.enablePersonalUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enablePersonalUpgrades", true).setLanguageKey(LANG_PREFIX + "prop.enablePersonalUpgrades").setRequiresMcRestart(true).getBoolean(); - cache.enableSortingUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableSortingUpgrades", true).setLanguageKey(LANG_PREFIX + "prop.enableSortingUpgrades").setRequiresMcRestart(true).getBoolean(); - cache.enableRedstoneUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableRedstoneUpgrades", true).setLanguageKey(LANG_PREFIX + "prop.enableRedstoneUpgrades").setRequiresMcRestart(true).getBoolean(); - cache.enableTape = config.get(Configuration.CATEGORY_GENERAL, "enableTape", true).setLanguageKey(LANG_PREFIX + "prop.enableTape").setRequiresMcRestart(true).getBoolean(); - cache.itemRenderType = config.get(Configuration.CATEGORY_GENERAL, "itemRenderType", "fast", null, new String[]{"fancy", "fast"}).setLanguageKey(LANG_PREFIX + "prop.itemRenderType").getString(); - cache.renderStorageUpgrades = config.get(Configuration.CATEGORY_GENERAL, "renderStorageUpgrades", true).setLanguageKey(LANG_PREFIX + "prop.renderStorageUpgrades").getBoolean(); - cache.creativeTabVanillaWoods = config.get(Configuration.CATEGORY_GENERAL, "creativeTabVanillaWoods", true).setLanguageKey(LANG_PREFIX + "prop.creativeTabVanillaWoods").getBoolean(); - cache.enableDrawerUI = config.get(Configuration.CATEGORY_GENERAL, "enableDrawerUI", true).setLanguageKey(LANG_PREFIX + "prop.enableDrawerUI").getBoolean(); - cache.enableSidedInput = config.get(Configuration.CATEGORY_GENERAL, "enableSidedInput", true).setLanguageKey(LANG_PREFIX + "prop.enableSidedInput").getBoolean(); - cache.enableSidedOutput = config.get(Configuration.CATEGORY_GENERAL, "enableSidedOutput", true).setLanguageKey(LANG_PREFIX + "prop.enableSidedOutput").getBoolean(); - cache.enableItemConversion = config.get(Configuration.CATEGORY_GENERAL, "enableItemConversion", true).setLanguageKey(LANG_PREFIX + "prop.enableItemConversion").getBoolean(); - cache.enableFallbackRecipes = config.get(Configuration.CATEGORY_GENERAL, "enableFallbackRecipes", true).setLanguageKey(LANG_PREFIX + "prop.enableFallbackRecipes").setRequiresMcRestart(true).getBoolean(); - cache.enableFramedDrawers = config.get(Configuration.CATEGORY_GENERAL, "enableFramedDrawers", true).setLanguageKey(LANG_PREFIX + "prop.enableFramedDrawers").setRequiresMcRestart(true).getBoolean(); - cache.stackRemainderWaila = !config.get(Configuration.CATEGORY_GENERAL, "wailaStackRemainder", "stack + remainder", null, new String[]{"exact", "stack + remainder"}).setLanguageKey(LANG_PREFIX + "prop.wailaStackRemainder").getString().equals("exact"); - cache.invertShift = config.get(Configuration.CATEGORY_GENERAL, "invertShift", false, - "Inverts how shift works with drawers. If this is true, shifting will only give one item, where regular clicks will give a full stack. Leave false for default behavior.") - .setLanguageKey(LANG_PREFIX + "prop.invertShift").getBoolean(); - cache.debugTrace = config.get(Configuration.CATEGORY_GENERAL, "enableDebugLogging", false, - "Writes additional log messages while using the mod. Mainly for debug purposes. Should be kept disabled unless instructed otherwise.") - .setLanguageKey(LANG_PREFIX + "prop.enableDebugLogging").getBoolean(); + public void syncConfig() { + cache.enableIndicatorUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableIndicatorUpgrades", true) + .setLanguageKey(LANG_PREFIX + "prop.enableIndicatorUpgrades") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableStorageUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableStorageUpgrades", true) + .setLanguageKey(LANG_PREFIX + "prop.enableStorageUpgrades") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableLockUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableLockUpgrades", true) + .setLanguageKey(LANG_PREFIX + "prop.enableLockUpgrades") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableVoidUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableVoidUpgrades", true) + .setLanguageKey(LANG_PREFIX + "prop.enableVoidUpgrades") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableCreativeUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableCreativeUpgrades", true) + .setLanguageKey(LANG_PREFIX + "prop.enableCreativeUpgrades") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableShroudUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableShroudUpgrades", true) + .setLanguageKey(LANG_PREFIX + "prop.enableShroudUpgrades") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enablePersonalUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enablePersonalUpgrades", true) + .setLanguageKey(LANG_PREFIX + "prop.enablePersonalUpgrades") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableSortingUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableSortingUpgrades", true) + .setLanguageKey(LANG_PREFIX + "prop.enableSortingUpgrades") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableRedstoneUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableRedstoneUpgrades", true) + .setLanguageKey(LANG_PREFIX + "prop.enableRedstoneUpgrades") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableTape = config.get(Configuration.CATEGORY_GENERAL, "enableTape", true) + .setLanguageKey(LANG_PREFIX + "prop.enableTape") + .setRequiresMcRestart(true) + .getBoolean(); + cache.itemRenderType = config.get( + Configuration.CATEGORY_GENERAL, "itemRenderType", "fast", null, new String[] {"fancy", "fast"}) + .setLanguageKey(LANG_PREFIX + "prop.itemRenderType") + .getString(); + cache.renderStorageUpgrades = config.get(Configuration.CATEGORY_GENERAL, "renderStorageUpgrades", true) + .setLanguageKey(LANG_PREFIX + "prop.renderStorageUpgrades") + .getBoolean(); + cache.creativeTabVanillaWoods = config.get(Configuration.CATEGORY_GENERAL, "creativeTabVanillaWoods", true) + .setLanguageKey(LANG_PREFIX + "prop.creativeTabVanillaWoods") + .getBoolean(); + cache.enableDrawerUI = config.get(Configuration.CATEGORY_GENERAL, "enableDrawerUI", true) + .setLanguageKey(LANG_PREFIX + "prop.enableDrawerUI") + .getBoolean(); + cache.enableSidedInput = config.get(Configuration.CATEGORY_GENERAL, "enableSidedInput", true) + .setLanguageKey(LANG_PREFIX + "prop.enableSidedInput") + .getBoolean(); + cache.enableSidedOutput = config.get(Configuration.CATEGORY_GENERAL, "enableSidedOutput", true) + .setLanguageKey(LANG_PREFIX + "prop.enableSidedOutput") + .getBoolean(); + cache.enableItemConversion = config.get(Configuration.CATEGORY_GENERAL, "enableItemConversion", true) + .setLanguageKey(LANG_PREFIX + "prop.enableItemConversion") + .getBoolean(); + cache.enableFallbackRecipes = config.get(Configuration.CATEGORY_GENERAL, "enableFallbackRecipes", true) + .setLanguageKey(LANG_PREFIX + "prop.enableFallbackRecipes") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableFramedDrawers = config.get(Configuration.CATEGORY_GENERAL, "enableFramedDrawers", true) + .setLanguageKey(LANG_PREFIX + "prop.enableFramedDrawers") + .setRequiresMcRestart(true) + .getBoolean(); + cache.stackRemainderWaila = !config.get( + Configuration.CATEGORY_GENERAL, "wailaStackRemainder", "stack + remainder", null, new String[] { + "exact", "stack + remainder" + }) + .setLanguageKey(LANG_PREFIX + "prop.wailaStackRemainder") + .getString() + .equals("exact"); + cache.invertShift = config.get( + Configuration.CATEGORY_GENERAL, + "invertShift", + false, + "Inverts how shift works with drawers. If this is true, shifting will only give one item, where regular clicks will give a full stack. Leave false for default behavior.") + .setLanguageKey(LANG_PREFIX + "prop.invertShift") + .getBoolean(); + cache.debugTrace = config.get( + Configuration.CATEGORY_GENERAL, + "enableDebugLogging", + false, + "Writes additional log messages while using the mod. Mainly for debug purposes. Should be kept disabled unless instructed otherwise.") + .setLanguageKey(LANG_PREFIX + "prop.enableDebugLogging") + .getBoolean(); - cache.enableAE2Integration = config.get(sectionIntegration.getQualifiedName(), "enableAE2", true).setLanguageKey(LANG_PREFIX + "integration.enableAE2").setRequiresMcRestart(true).getBoolean(); - cache.enableWailaIntegration = config.get(sectionIntegration.getQualifiedName(), "enableWaila", true).setLanguageKey(LANG_PREFIX + "integration.enableWaila").setRequiresMcRestart(true).getBoolean(); - cache.enableThaumcraftIntegration = config.get(sectionIntegration.getQualifiedName(), "enableThaumcraft", true).setLanguageKey(LANG_PREFIX + "integration.enableThaumcraft").setRequiresMcRestart(true).getBoolean(); - cache.enableMineTweakerIntegration = config.get(sectionIntegration.getQualifiedName(), "enableMineTweaker", true).setLanguageKey(LANG_PREFIX + "integration.enableMineTweaker").setRequiresMcRestart(true).getBoolean(); - cache.enableRefinedRelocationIntegration = config.get(sectionIntegration.getQualifiedName(), "enableRefinedRelocation", true).setLanguageKey(LANG_PREFIX + "integration.enableRefinedRelocation").setRequiresMcRestart(true).getBoolean(); - cache.enableThermalExpansionIntegration = config.get(sectionIntegration.getQualifiedName(), "enableThermalExpansion", true).setLanguageKey(LANG_PREFIX + "integration.enableThermalExpansion").setRequiresMcRestart(true).getBoolean(); - cache.enableThermalFoundationIntegration = config.get(sectionIntegration.getQualifiedName(), "enableThermalFoundation", true).setLanguageKey(LANG_PREFIX + "integration.enableThermalFoundation").setRequiresMcRestart(true).getBoolean(); - cache.enableChiselIntegration = config.get(sectionIntegration.getQualifiedName(), "enableChisel", true).setLanguageKey(LANG_PREFIX + "integration.enableChisel").setRequiresMcRestart(true).getBoolean(); - cache.enableGTNHIntegration = config.get(sectionIntegration.getQualifiedName(), "enableGTNH", true).setLanguageKey(LANG_PREFIX + "integration.enableGTNH").setRequiresMcRestart(true).getBoolean(); + cache.enableAE2Integration = config.get(sectionIntegration.getQualifiedName(), "enableAE2", true) + .setLanguageKey(LANG_PREFIX + "integration.enableAE2") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableWailaIntegration = config.get(sectionIntegration.getQualifiedName(), "enableWaila", true) + .setLanguageKey(LANG_PREFIX + "integration.enableWaila") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableThaumcraftIntegration = config.get(sectionIntegration.getQualifiedName(), "enableThaumcraft", true) + .setLanguageKey(LANG_PREFIX + "integration.enableThaumcraft") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableMineTweakerIntegration = config.get( + sectionIntegration.getQualifiedName(), "enableMineTweaker", true) + .setLanguageKey(LANG_PREFIX + "integration.enableMineTweaker") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableRefinedRelocationIntegration = config.get( + sectionIntegration.getQualifiedName(), "enableRefinedRelocation", true) + .setLanguageKey(LANG_PREFIX + "integration.enableRefinedRelocation") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableThermalExpansionIntegration = config.get( + sectionIntegration.getQualifiedName(), "enableThermalExpansion", true) + .setLanguageKey(LANG_PREFIX + "integration.enableThermalExpansion") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableThermalFoundationIntegration = config.get( + sectionIntegration.getQualifiedName(), "enableThermalFoundation", true) + .setLanguageKey(LANG_PREFIX + "integration.enableThermalFoundation") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableChiselIntegration = config.get(sectionIntegration.getQualifiedName(), "enableChisel", true) + .setLanguageKey(LANG_PREFIX + "integration.enableChisel") + .setRequiresMcRestart(true) + .getBoolean(); + cache.enableGTNHIntegration = config.get(sectionIntegration.getQualifiedName(), "enableGTNH", true) + .setLanguageKey(LANG_PREFIX + "integration.enableGTNH") + .setRequiresMcRestart(true) + .getBoolean(); - config.get(sectionBlocksFullDrawers1x1.getQualifiedName(), "enabled", true).setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); - config.get(sectionBlocksFullDrawers1x1.getQualifiedName(), "baseStorage", 32).setLanguageKey(LANG_PREFIX + "prop.baseStorage").setRequiresWorldRestart(true); - config.get(sectionBlocksFullDrawers1x1.getQualifiedName(), "recipeOutput", 1).setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); + config.get(sectionBlocksFullDrawers1x1.getQualifiedName(), "enabled", true) + .setLanguageKey(LANG_PREFIX + "prop.enabled") + .setRequiresMcRestart(true); + config.get(sectionBlocksFullDrawers1x1.getQualifiedName(), "baseStorage", 32) + .setLanguageKey(LANG_PREFIX + "prop.baseStorage") + .setRequiresWorldRestart(true); + config.get(sectionBlocksFullDrawers1x1.getQualifiedName(), "recipeOutput", 1) + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput") + .setRequiresMcRestart(true); - config.get(sectionBlocksFullDrawers1x2.getQualifiedName(), "enabled", true).setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); - config.get(sectionBlocksFullDrawers1x2.getQualifiedName(), "baseStorage", 16).setLanguageKey(LANG_PREFIX + "prop.baseStorage").setRequiresWorldRestart(true); - config.get(sectionBlocksFullDrawers1x2.getQualifiedName(), "recipeOutput", 2).setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); + config.get(sectionBlocksFullDrawers1x2.getQualifiedName(), "enabled", true) + .setLanguageKey(LANG_PREFIX + "prop.enabled") + .setRequiresMcRestart(true); + config.get(sectionBlocksFullDrawers1x2.getQualifiedName(), "baseStorage", 16) + .setLanguageKey(LANG_PREFIX + "prop.baseStorage") + .setRequiresWorldRestart(true); + config.get(sectionBlocksFullDrawers1x2.getQualifiedName(), "recipeOutput", 2) + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput") + .setRequiresMcRestart(true); - config.get(sectionBlocksFullDrawers2x2.getQualifiedName(), "enabled", true).setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); - config.get(sectionBlocksFullDrawers2x2.getQualifiedName(), "baseStorage", 8).setLanguageKey(LANG_PREFIX + "prop.baseStorage").setRequiresWorldRestart(true); - config.get(sectionBlocksFullDrawers2x2.getQualifiedName(), "recipeOutput", 4).setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); + config.get(sectionBlocksFullDrawers2x2.getQualifiedName(), "enabled", true) + .setLanguageKey(LANG_PREFIX + "prop.enabled") + .setRequiresMcRestart(true); + config.get(sectionBlocksFullDrawers2x2.getQualifiedName(), "baseStorage", 8) + .setLanguageKey(LANG_PREFIX + "prop.baseStorage") + .setRequiresWorldRestart(true); + config.get(sectionBlocksFullDrawers2x2.getQualifiedName(), "recipeOutput", 4) + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput") + .setRequiresMcRestart(true); - config.get(sectionBlocksHalfDrawers1x2.getQualifiedName(), "enabled", true).setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); - config.get(sectionBlocksHalfDrawers1x2.getQualifiedName(), "baseStorage", 8).setLanguageKey(LANG_PREFIX + "prop.baseStorage").setRequiresWorldRestart(true); - config.get(sectionBlocksHalfDrawers1x2.getQualifiedName(), "recipeOutput", 2).setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); + config.get(sectionBlocksHalfDrawers1x2.getQualifiedName(), "enabled", true) + .setLanguageKey(LANG_PREFIX + "prop.enabled") + .setRequiresMcRestart(true); + config.get(sectionBlocksHalfDrawers1x2.getQualifiedName(), "baseStorage", 8) + .setLanguageKey(LANG_PREFIX + "prop.baseStorage") + .setRequiresWorldRestart(true); + config.get(sectionBlocksHalfDrawers1x2.getQualifiedName(), "recipeOutput", 2) + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput") + .setRequiresMcRestart(true); - config.get(sectionBlocksHalfDrawers2x2.getQualifiedName(), "enabled", true).setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); - config.get(sectionBlocksHalfDrawers2x2.getQualifiedName(), "baseStorage", 4).setLanguageKey(LANG_PREFIX + "prop.baseStorage").setRequiresWorldRestart(true); - config.get(sectionBlocksHalfDrawers2x2.getQualifiedName(), "recipeOutput", 4).setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); + config.get(sectionBlocksHalfDrawers2x2.getQualifiedName(), "enabled", true) + .setLanguageKey(LANG_PREFIX + "prop.enabled") + .setRequiresMcRestart(true); + config.get(sectionBlocksHalfDrawers2x2.getQualifiedName(), "baseStorage", 4) + .setLanguageKey(LANG_PREFIX + "prop.baseStorage") + .setRequiresWorldRestart(true); + config.get(sectionBlocksHalfDrawers2x2.getQualifiedName(), "recipeOutput", 4) + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput") + .setRequiresMcRestart(true); - config.get(sectionBlocksCompDrawers.getQualifiedName(), "enabled", true).setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); - config.get(sectionBlocksCompDrawers.getQualifiedName(), "baseStorage", 16).setLanguageKey(LANG_PREFIX + "prop.baseStorage").setRequiresWorldRestart(true); - config.get(sectionBlocksCompDrawers.getQualifiedName(), "recipeOutput", 1).setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); + config.get(sectionBlocksCompDrawers.getQualifiedName(), "enabled", true) + .setLanguageKey(LANG_PREFIX + "prop.enabled") + .setRequiresMcRestart(true); + config.get(sectionBlocksCompDrawers.getQualifiedName(), "baseStorage", 16) + .setLanguageKey(LANG_PREFIX + "prop.baseStorage") + .setRequiresWorldRestart(true); + config.get(sectionBlocksCompDrawers.getQualifiedName(), "recipeOutput", 1) + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput") + .setRequiresMcRestart(true); - config.get(sectionBlocksController.getQualifiedName(), "enabled", true).setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); - config.get(sectionBlocksController.getQualifiedName(), "range", 12).setLanguageKey(LANG_PREFIX + "prop.controllerRange"); - config.get(sectionBlocksController.getQualifiedName(), "maxDrawers", 2048).setLanguageKey(LANG_PREFIX + "prop.controllerMaxDrawers"); + config.get(sectionBlocksController.getQualifiedName(), "enabled", true) + .setLanguageKey(LANG_PREFIX + "prop.enabled") + .setRequiresMcRestart(true); + config.get(sectionBlocksController.getQualifiedName(), "range", 12) + .setLanguageKey(LANG_PREFIX + "prop.controllerRange"); + config.get(sectionBlocksController.getQualifiedName(), "maxDrawers", 2048) + .setLanguageKey(LANG_PREFIX + "prop.controllerMaxDrawers"); - config.get(sectionBlocksTrim.getQualifiedName(), "enabled", true).setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); - config.get(sectionBlocksTrim.getQualifiedName(), "recipeOutput", 4).setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); + config.get(sectionBlocksTrim.getQualifiedName(), "enabled", true) + .setLanguageKey(LANG_PREFIX + "prop.enabled") + .setRequiresMcRestart(true); + config.get(sectionBlocksTrim.getQualifiedName(), "recipeOutput", 4) + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput") + .setRequiresMcRestart(true); - config.get(sectionBlocksSlave.getQualifiedName(), "enabled", true).setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); + config.get(sectionBlocksSlave.getQualifiedName(), "enabled", true) + .setLanguageKey(LANG_PREFIX + "prop.enabled") + .setRequiresMcRestart(true); - cache.level2Mult = config.get(sectionUpgrades.getQualifiedName(), "level2Mult", 2).setLanguageKey(LANG_PREFIX + "upgrades.level2Mult").setRequiresWorldRestart(true).getInt(); - cache.level3Mult = config.get(sectionUpgrades.getQualifiedName(), "level3Mult", 3).setLanguageKey(LANG_PREFIX + "upgrades.level3Mult").setRequiresWorldRestart(true).getInt(); - cache.level4Mult = config.get(sectionUpgrades.getQualifiedName(), "level4Mult", 5).setLanguageKey(LANG_PREFIX + "upgrades.level4Mult").setRequiresWorldRestart(true).getInt(); - cache.level5Mult = config.get(sectionUpgrades.getQualifiedName(), "level5Mult", 8).setLanguageKey(LANG_PREFIX + "upgrades.level5Mult").setRequiresWorldRestart(true).getInt(); - cache.level6Mult = config.get(sectionUpgrades.getQualifiedName(), "level6Mult", 13).setLanguageKey(LANG_PREFIX + "upgrades.level6Mult").setRequiresWorldRestart(true).getInt(); + cache.level2Mult = config.get(sectionUpgrades.getQualifiedName(), "level2Mult", 2) + .setLanguageKey(LANG_PREFIX + "upgrades.level2Mult") + .setRequiresWorldRestart(true) + .getInt(); + cache.level3Mult = config.get(sectionUpgrades.getQualifiedName(), "level3Mult", 3) + .setLanguageKey(LANG_PREFIX + "upgrades.level3Mult") + .setRequiresWorldRestart(true) + .getInt(); + cache.level4Mult = config.get(sectionUpgrades.getQualifiedName(), "level4Mult", 5) + .setLanguageKey(LANG_PREFIX + "upgrades.level4Mult") + .setRequiresWorldRestart(true) + .getInt(); + cache.level5Mult = config.get(sectionUpgrades.getQualifiedName(), "level5Mult", 8) + .setLanguageKey(LANG_PREFIX + "upgrades.level5Mult") + .setRequiresWorldRestart(true) + .getInt(); + cache.level6Mult = config.get(sectionUpgrades.getQualifiedName(), "level6Mult", 13) + .setLanguageKey(LANG_PREFIX + "upgrades.level6Mult") + .setRequiresWorldRestart(true) + .getInt(); - cache.addonShowNEI = config.get(sectionAddons.getQualifiedName(), "showBlocksInNEI", true).setLanguageKey(LANG_PREFIX + "addons.showNEI").setRequiresWorldRestart(true).getBoolean(); - cache.addonShowVanilla = config.get(sectionAddons.getQualifiedName(), "showBlocksInCreative", true).setLanguageKey(LANG_PREFIX + "addons.showCreative").setRequiresWorldRestart(true).getBoolean(); - cache.addonSeparateVanilla = config.get(sectionAddons.getQualifiedName(), "useSeparateCreativeTabs", true).setLanguageKey(LANG_PREFIX + "addons.separateTabs").setRequiresMcRestart(true).getBoolean(); + cache.addonShowNEI = config.get(sectionAddons.getQualifiedName(), "showBlocksInNEI", true) + .setLanguageKey(LANG_PREFIX + "addons.showNEI") + .setRequiresWorldRestart(true) + .getBoolean(); + cache.addonShowVanilla = config.get(sectionAddons.getQualifiedName(), "showBlocksInCreative", true) + .setLanguageKey(LANG_PREFIX + "addons.showCreative") + .setRequiresWorldRestart(true) + .getBoolean(); + cache.addonSeparateVanilla = config.get(sectionAddons.getQualifiedName(), "useSeparateCreativeTabs", true) + .setLanguageKey(LANG_PREFIX + "addons.separateTabs") + .setRequiresMcRestart(true) + .getBoolean(); getControllerRange(); getControllerMaxDrawers(); - if (config.hasChanged()) - config.save(); + if (config.hasChanged()) config.save(); } - public boolean isFancyItemRenderEnabled () { + public boolean isFancyItemRenderEnabled() { return cache.itemRenderType.equals("fancy"); } - public String getPath () { + public String getPath() { return config.toString(); } - public boolean isBlockEnabled (String blockName) { - if (!blockSectionsMap.containsKey(blockName)) - return false; + public boolean isBlockEnabled(String blockName) { + if (!blockSectionsMap.containsKey(blockName)) return false; ConfigSection section = blockSectionsMap.get(blockName); return section.getCategory().get("enabled").getBoolean(); } - public int getBlockBaseStorage (String blockName) { - if (!blockSectionsMap.containsKey(blockName)) - return 0; + public int getBlockBaseStorage(String blockName) { + if (!blockSectionsMap.containsKey(blockName)) return 0; ConfigSection section = blockSectionsMap.get(blockName); return section.getCategory().get("baseStorage").getInt(); } - public int getBlockRecipeOutput (String blockName) { - if (!blockSectionsMap.containsKey(blockName)) - return 0; + public int getBlockRecipeOutput(String blockName) { + if (!blockSectionsMap.containsKey(blockName)) return 0; ConfigSection section = blockSectionsMap.get(blockName); return section.getCategory().get("recipeOutput").getInt(); } - public int getControllerRange () { + public int getControllerRange() { ConfigSection section = blockSectionsMap.get("controller"); return section.getCategory().get("range").getInt(); } - public int getControllerMaxDrawers () { + public int getControllerMaxDrawers() { ConfigSection section = blockSectionsMap.get("controller"); return section.getCategory().get("maxDrawers").getInt(); } - public int getStorageUpgradeMultiplier (int level) { + public int getStorageUpgradeMultiplier(int level) { switch (level) { - case 2: return cache.level2Mult; - case 3: return cache.level3Mult; - case 4: return cache.level4Mult; - case 5: return cache.level5Mult; - case 6: return cache.level6Mult; - default: return 1; + case 2: + return cache.level2Mult; + case 3: + return cache.level3Mult; + case 4: + return cache.level4Mult; + case 5: + return cache.level5Mult; + case 6: + return cache.level6Mult; + default: + return 1; } } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ModConfigGui.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ModConfigGui.java index 4c00976..98807df 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ModConfigGui.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ModConfigGui.java @@ -3,19 +3,17 @@ package com.jaquadro.minecraft.storagedrawers.config; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.IConfigElement; +import java.util.ArrayList; +import java.util.List; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; -import java.util.ArrayList; -import java.util.List; - -public class ModConfigGui extends GuiConfig -{ - public ModConfigGui (GuiScreen parent) { +public class ModConfigGui extends GuiConfig { + public ModConfigGui(GuiScreen parent) { super(parent, getConfigElements(), StorageDrawers.MOD_ID, false, false, "Storage Drawers Configuration"); } - private static List getConfigElements () { + private static List getConfigElements() { List list = new ArrayList(); for (ConfigManager.ConfigSection section : StorageDrawers.config.sections) @@ -23,5 +21,4 @@ public class ModConfigGui extends GuiConfig return list; } - } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/OreDictRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/OreDictRegistry.java index ae62733..88ef36b 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/OreDictRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/OreDictRegistry.java @@ -2,17 +2,15 @@ package com.jaquadro.minecraft.storagedrawers.config; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; -public class OreDictRegistry -{ +public class OreDictRegistry { private Set blacklist = new HashSet(); private Set whitelist = new HashSet(); private List blacklistPrefix = new ArrayList(); @@ -20,7 +18,7 @@ public class OreDictRegistry private Set blacklistCache = new HashSet(); private Set graylistCache = new HashSet(); - public OreDictRegistry () { + public OreDictRegistry() { addBlacklist("logWood"); addBlacklist("plankWood"); addBlacklist("slabWood"); @@ -55,19 +53,34 @@ public class OreDictRegistry addBlacklistPrefix("list"); addBlacklistPrefix("dye"); - String[] oreTypes = { "ore", "block", "ingot", "nugget" }; - String[] oreMaterials = { "Iron", "Gold", "Diamond", "Emerald", "Aluminum", "Aluminium", "Tin", "Copper", "Lead", - "Silver", "Platinum", "Nickel", "Osmium", "Invar", "Bronze", "Electrum", "Enderium" }; + String[] oreTypes = {"ore", "block", "ingot", "nugget"}; + String[] oreMaterials = { + "Iron", + "Gold", + "Diamond", + "Emerald", + "Aluminum", + "Aluminium", + "Tin", + "Copper", + "Lead", + "Silver", + "Platinum", + "Nickel", + "Osmium", + "Invar", + "Bronze", + "Electrum", + "Enderium" + }; for (String ore : oreMaterials) { - for (String type : oreTypes) - addWhitelist(type + ore); + for (String type : oreTypes) addWhitelist(type + ore); } } - public boolean addBlacklist (String entry) { - if (entry == null) - return false; + public boolean addBlacklist(String entry) { + if (entry == null) return false; blacklistCache.add(entry); graylistCache.remove(entry); @@ -75,42 +88,38 @@ public class OreDictRegistry return blacklist.add(entry); } - public boolean addBlacklistPrefix (String entry) { - if (entry == null) - return false; + public boolean addBlacklistPrefix(String entry) { + if (entry == null) return false; - if (blacklistPrefix.contains(entry)) - return false; + if (blacklistPrefix.contains(entry)) return false; graylistCache.clear(); return blacklistPrefix.add(entry); } - public boolean addWhitelist (String entry) { - if (entry == null) - return false; + public boolean addWhitelist(String entry) { + if (entry == null) return false; return whitelist.add(entry); } - public boolean removeBlacklist (String entry) { + public boolean removeBlacklist(String entry) { blacklistCache.remove(entry); return blacklist.remove(entry); } - public boolean removeBlacklistPrefix (String entry) { + public boolean removeBlacklistPrefix(String entry) { return blacklistPrefix.remove(entry); } - public boolean removeWhitelist (String entry) { + public boolean removeWhitelist(String entry) { return whitelist.remove(entry); } - public boolean isEntryBlacklisted (String entry) { - if (blacklistCache.contains(entry)) - return true; + public boolean isEntryBlacklisted(String entry) { + if (blacklistCache.contains(entry)) return true; for (int i = 0, n = blacklistPrefix.size(); i < n; i++) { if (entry.startsWith(blacklistPrefix.get(i))) { @@ -122,17 +131,15 @@ public class OreDictRegistry return false; } - public boolean isEntryWhitelisted (String entry) { + public boolean isEntryWhitelisted(String entry) { return whitelist.contains(entry); } - public boolean isEntryValid (String entry) { - if (graylistCache.contains(entry)) - return true; + public boolean isEntryValid(String entry) { + if (graylistCache.contains(entry)) return true; if (!whitelist.contains(entry)) { - if (isEntryBlacklisted(entry)) - return false; + if (isEntryBlacklisted(entry)) return false; if (!isValidForEquiv(entry)) { blacklistCache.add(entry); @@ -145,37 +152,32 @@ public class OreDictRegistry return true; } - private String getModId (Item item) { + private String getModId(Item item) { String itemId = GameData.getItemRegistry().getNameForObject(item); - if (itemId == null) - return null; + if (itemId == null) return null; GameRegistry.UniqueIdentifier uid = new GameRegistry.UniqueIdentifier(itemId); return uid.modId; } - private boolean isValidForEquiv (String oreName) { + private boolean isValidForEquiv(String oreName) { List oreList = OreDictionary.getOres(oreName); - if (oreList.size() == 0) - return false; + if (oreList.size() == 0) return false; // Fail entries that have any wildcard items registered to them. HashSet modIds = new HashSet(); for (int i = 0, n = oreList.size(); i < n; i++) { - if (oreList.get(i).getItemDamage() == OreDictionary.WILDCARD_VALUE) - return false; + if (oreList.get(i).getItemDamage() == OreDictionary.WILDCARD_VALUE) return false; String modId = getModId(oreList.get(i).getItem()); - if (modId != null) - modIds.add(modId); + if (modId != null) modIds.add(modId); } // Fail entries that have multiple instances of an item registered, differing by metadata or other // criteria. - if (modIds.size() < oreList.size()) - return false; + if (modIds.size() < oreList.size()) return false; // Fail entries where the keys in at least one stack are not the super-set of all other stacks. // Can be determined by merging all keys and testing cardinality. @@ -187,12 +189,10 @@ public class OreDictRegistry int[] ids = OreDictionary.getOreIDs(oreList.get(i)); maxKeyCount = Math.max(maxKeyCount, ids.length); - for (int id : ids) - mergedIds.add(id); + for (int id : ids) mergedIds.add(id); } - if (maxKeyCount < mergedIds.size()) - return false; + if (maxKeyCount < mergedIds.size()) return false; return true; } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/RecipeHandlerRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/RecipeHandlerRegistry.java index c85259e..22415e1 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/RecipeHandlerRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/RecipeHandlerRegistry.java @@ -3,22 +3,20 @@ package com.jaquadro.minecraft.storagedrawers.config; import com.jaquadro.minecraft.storagedrawers.api.registry.IIngredientHandler; import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandler; import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandlerRegistry; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class RecipeHandlerRegistry implements IRecipeHandlerRegistry -{ +public class RecipeHandlerRegistry implements IRecipeHandlerRegistry { private Map recipeRegistry = new HashMap(); private Map ingredientRegistry = new HashMap(); - public RecipeHandlerRegistry () { + public RecipeHandlerRegistry() { registerRecipeHandler(ShapedOreRecipe.class, new ShapedOreRecipeHandler()); registerRecipeHandler(ShapedRecipes.class, new ShapedRecipeHandler()); registerRecipeHandler(ShapelessOreRecipe.class, new ShapelessOreRecipeHandler()); @@ -26,22 +24,19 @@ public class RecipeHandlerRegistry implements IRecipeHandlerRegistry } @Override - public void registerRecipeHandler (Class clazz, IRecipeHandler handler) { - if (!recipeRegistry.containsKey(clazz)) - recipeRegistry.put(clazz, handler); + public void registerRecipeHandler(Class clazz, IRecipeHandler handler) { + if (!recipeRegistry.containsKey(clazz)) recipeRegistry.put(clazz, handler); } @Override - public void registerIngredientHandler (Class clazz, IIngredientHandler handler) { - if (!ingredientRegistry.containsKey(clazz)) - ingredientRegistry.put(clazz, handler); + public void registerIngredientHandler(Class clazz, IIngredientHandler handler) { + if (!ingredientRegistry.containsKey(clazz)) ingredientRegistry.put(clazz, handler); } @Override - public IRecipeHandler getRecipeHandler (Class clazz) { + public IRecipeHandler getRecipeHandler(Class clazz) { while (clazz != null) { - if (recipeRegistry.containsKey(clazz)) - return recipeRegistry.get(clazz); + if (recipeRegistry.containsKey(clazz)) return recipeRegistry.get(clazz); clazz = clazz.getSuperclass(); } @@ -50,14 +45,12 @@ public class RecipeHandlerRegistry implements IRecipeHandlerRegistry } @Override - public IIngredientHandler getIngredientHandler (Class clazz) { + public IIngredientHandler getIngredientHandler(Class clazz) { while (clazz != null) { - if (ingredientRegistry.containsKey(clazz)) - return ingredientRegistry.get(clazz); + if (ingredientRegistry.containsKey(clazz)) return ingredientRegistry.get(clazz); for (Class inter : clazz.getInterfaces()) { - if (ingredientRegistry.containsKey(inter)) - return ingredientRegistry.get(inter); + if (ingredientRegistry.containsKey(inter)) return ingredientRegistry.get(inter); } clazz = clazz.getSuperclass(); @@ -66,54 +59,50 @@ public class RecipeHandlerRegistry implements IRecipeHandlerRegistry return null; } - private static class ShapedOreRecipeHandler implements IRecipeHandler - { + private static class ShapedOreRecipeHandler implements IRecipeHandler { @Override - public Object[] getInputAsArray (IRecipe recipe) { + public Object[] getInputAsArray(IRecipe recipe) { return ((ShapedOreRecipe) recipe).getInput(); } @Override - public List getInputAsList (IRecipe recipe) { + public List getInputAsList(IRecipe recipe) { return null; } } - private static class ShapedRecipeHandler implements IRecipeHandler - { + private static class ShapedRecipeHandler implements IRecipeHandler { @Override - public Object[] getInputAsArray (IRecipe recipe) { + public Object[] getInputAsArray(IRecipe recipe) { return ((ShapedRecipes) recipe).recipeItems; } @Override - public List getInputAsList (IRecipe recipe) { + public List getInputAsList(IRecipe recipe) { return null; } } - private static class ShapelessOreRecipeHandler implements IRecipeHandler - { + private static class ShapelessOreRecipeHandler implements IRecipeHandler { @Override - public Object[] getInputAsArray (IRecipe recipe) { + public Object[] getInputAsArray(IRecipe recipe) { return null; } @Override - public List getInputAsList (IRecipe recipe) { + public List getInputAsList(IRecipe recipe) { return ((ShapelessOreRecipe) recipe).getInput(); } } - private static class ShapelessRecipeHandler implements IRecipeHandler - { + private static class ShapelessRecipeHandler implements IRecipeHandler { @Override - public Object[] getInputAsArray (IRecipe recipe) { + public Object[] getInputAsArray(IRecipe recipe) { return null; } @Override - public List getInputAsList (IRecipe recipe) { + public List getInputAsList(IRecipe recipe) { return ((ShapelessRecipes) recipe).recipeItems; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/RenderRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/RenderRegistry.java index 93055e5..d9e2312 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/RenderRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/RenderRegistry.java @@ -2,20 +2,18 @@ package com.jaquadro.minecraft.storagedrawers.config; import com.jaquadro.minecraft.storagedrawers.api.registry.IRenderRegistry; import com.jaquadro.minecraft.storagedrawers.api.render.IRenderLabel; - import java.util.ArrayList; import java.util.List; -public class RenderRegistry implements IRenderRegistry -{ +public class RenderRegistry implements IRenderRegistry { private List registry = new ArrayList(); @Override - public void registerPreLabelRenderHandler (IRenderLabel renderHandler) { + public void registerPreLabelRenderHandler(IRenderLabel renderHandler) { registry.add(renderHandler); } - public List getRenderHandlers () { + public List getRenderHandlers() { return registry; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/WailaRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/WailaRegistry.java index 9c17075..400f5a8 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/WailaRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/WailaRegistry.java @@ -2,20 +2,18 @@ package com.jaquadro.minecraft.storagedrawers.config; import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaRegistry; import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaTooltipHandler; - import java.util.ArrayList; import java.util.List; -public class WailaRegistry implements IWailaRegistry -{ +public class WailaRegistry implements IWailaRegistry { private List registry = new ArrayList(); @Override - public void registerTooltipHandler (IWailaTooltipHandler handler) { + public void registerTooltipHandler(IWailaTooltipHandler handler) { registry.add(handler); } - public List getTooltipHandlers () { + public List getTooltipHandlers() { return registry; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/Api.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/Api.java index 309586f..6c0fd27 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/Api.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/Api.java @@ -10,46 +10,44 @@ import com.jaquadro.minecraft.storagedrawers.api.registry.IRenderRegistry; import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaRegistry; import com.jaquadro.minecraft.storagedrawers.core.api.PackFactory; import com.jaquadro.minecraft.storagedrawers.core.api.PackRecipes; -import com.jaquadro.minecraft.storagedrawers.integration.ChiselIntegrationModule; import com.jaquadro.minecraft.storagedrawers.integration.ThermalExpansion; -public class Api implements IStorageDrawersApi -{ +public class Api implements IStorageDrawersApi { public static IStorageDrawersApi instance; private PackFactory packFactory = new PackFactory(); - public Api () { + public Api() { instance = this; } @Override - public IRecipeHandlerRegistry recipeHandlerRegistry () { + public IRecipeHandlerRegistry recipeHandlerRegistry() { return StorageDrawers.recipeHandlerRegistry; } @Override - public IRenderRegistry renderRegistry () { + public IRenderRegistry renderRegistry() { return StorageDrawers.renderRegistry; } @Override - public IWailaRegistry wailaRegistry () { + public IWailaRegistry wailaRegistry() { return StorageDrawers.wailaRegistry; } @Override - public IPackBlockFactory packFactory () { + public IPackBlockFactory packFactory() { return packFactory; } @Override - public IUserConfig userConfig () { + public IUserConfig userConfig() { return StorageDrawers.config.userConfig; } @Override - public void registerStandardPackRecipes (IExtendedDataResolver resolver) { + public void registerStandardPackRecipes(IExtendedDataResolver resolver) { PackRecipes.registerStandardRecipes(resolver); PackRecipes.registerSortingRecipes(resolver); ThermalExpansion.registerPackBlock(resolver); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ClientProxy.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ClientProxy.java index 38b4f5f..c9b6983 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ClientProxy.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ClientProxy.java @@ -10,14 +10,13 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.client.MinecraftForgeClient; -public class ClientProxy extends CommonProxy -{ +public class ClientProxy extends CommonProxy { public static int renderPass = 0; private DrawersItemRenderer itemRenderer = new DrawersItemRenderer(); private TrimItemRender trimItemRenderer = new TrimItemRender(); @Override - public void registerRenderers () { + public void registerRenderers() { drawersRenderID = RenderingRegistry.getNextAvailableRenderId(); controllerRenderID = RenderingRegistry.getNextAvailableRenderId(); drawersCustomRenderID = RenderingRegistry.getNextAvailableRenderId(); @@ -38,7 +37,7 @@ public class ClientProxy extends CommonProxy } @Override - public void registerDrawer (Block block) { + public void registerDrawer(Block block) { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(block), itemRenderer); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/CommonProxy.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/CommonProxy.java index 0ef2bed..ecee590 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/CommonProxy.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/CommonProxy.java @@ -4,21 +4,19 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -public class CommonProxy -{ +public class CommonProxy { public int drawersRenderID = -1; public int controllerRenderID = -1; public int drawersCustomRenderID = -1; public int framingTableRenderID = -1; public int trimCustomRenderID = -1; - public void registerRenderers () - { } + public void registerRenderers() {} - public void updatePlayerInventory (EntityPlayer player) { + public void updatePlayerInventory(EntityPlayer player) { if (player instanceof EntityPlayerMP) ((EntityPlayerMP) player).sendContainerToPlayer(player.inventoryContainer); } - public void registerDrawer (Block block) { } + public void registerDrawer(Block block) {} } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java index 1a6cc17..36eadd7 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java @@ -5,11 +5,11 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -public class ForgeEventHandler -{ +public class ForgeEventHandler { @SubscribeEvent - public void playerInteracts (PlayerInteractEvent event) { - if (event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK && event.entityPlayer.capabilities.isCreativeMode) { + public void playerInteracts(PlayerInteractEvent event) { + if (event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK + && event.entityPlayer.capabilities.isCreativeMode) { TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); if (tile instanceof TileEntityDrawers) { int dir = ((TileEntityDrawers) tile).getDirection(); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModBlocks.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModBlocks.java index e2bed3e..454045d 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModBlocks.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModBlocks.java @@ -11,8 +11,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -public class ModBlocks -{ +public class ModBlocks { public static DataResolver resolver; public static BlockDrawers fullDrawers1; @@ -33,7 +32,7 @@ public class ModBlocks public static BlockDrawersCustom halfCustom2; public static BlockDrawersCustom halfCustom4; - public void init () { + public void init() { resolver = new DataResolver(StorageDrawers.MOD_ID); fullDrawers1 = new BlockDrawers("fullDrawers1", 1, false); @@ -76,10 +75,8 @@ public class ModBlocks GameRegistry.registerBlock(compDrawers, ItemCompDrawers.class, "compDrawers"); if (config.isBlockEnabled("controller")) GameRegistry.registerBlock(controller, ItemController.class, "controller"); - if (config.isBlockEnabled("controllerSlave")) - GameRegistry.registerBlock(controllerSlave, "controllerSlave"); - if (config.isBlockEnabled("trim")) - GameRegistry.registerBlock(trim, ItemTrim.class, "trim"); + if (config.isBlockEnabled("controllerSlave")) GameRegistry.registerBlock(controllerSlave, "controllerSlave"); + if (config.isBlockEnabled("trim")) GameRegistry.registerBlock(trim, ItemTrim.class, "trim"); if (config.cache.enableFramedDrawers) { GameRegistry.registerBlock(framingTable, ItemFramingTable.class, "framingTable"); @@ -98,18 +95,23 @@ public class ModBlocks GameRegistry.registerBlock(trimCustom, ItemCustomTrim.class, "trimCustom"); } - GameRegistry.registerTileEntityWithAlternatives(TileEntityDrawersStandard.class, getQualifiedName("tileDrawersStandard"), - getQualifiedName(fullDrawers1), getQualifiedName(fullDrawers2), getQualifiedName(fullDrawers4), - getQualifiedName(halfDrawers2), getQualifiedName(halfDrawers4)); + GameRegistry.registerTileEntityWithAlternatives( + TileEntityDrawersStandard.class, + getQualifiedName("tileDrawersStandard"), + getQualifiedName(fullDrawers1), + getQualifiedName(fullDrawers2), + getQualifiedName(fullDrawers4), + getQualifiedName(halfDrawers2), + getQualifiedName(halfDrawers4)); - GameRegistry.registerTileEntityWithAlternatives(TileEntityDrawersComp.class, getQualifiedName("tileDrawersComp"), - getQualifiedName(compDrawers)); + GameRegistry.registerTileEntityWithAlternatives( + TileEntityDrawersComp.class, getQualifiedName("tileDrawersComp"), getQualifiedName(compDrawers)); - GameRegistry.registerTileEntityWithAlternatives(TileEntityController.class, getQualifiedName("tileController"), - getQualifiedName(controller)); + GameRegistry.registerTileEntityWithAlternatives( + TileEntityController.class, getQualifiedName("tileController"), getQualifiedName(controller)); - GameRegistry.registerTileEntityWithAlternatives(TileEntitySlave.class, getQualifiedName("tileControllerSlave"), - getQualifiedName(controllerSlave)); + GameRegistry.registerTileEntityWithAlternatives( + TileEntitySlave.class, getQualifiedName("tileControllerSlave"), getQualifiedName(controllerSlave)); GameRegistry.registerTileEntity(TileEntityFramingTable.class, getQualifiedName("framingTable")); @@ -128,25 +130,25 @@ public class ModBlocks StorageDrawers.proxy.registerDrawer(halfCustom2); StorageDrawers.proxy.registerDrawer(halfCustom4); - for (String key : new String[] { "drawerBasic" }) + for (String key : new String[] {"drawerBasic"}) OreDictionary.registerOre(key, new ItemStack(fullDrawers1, 1, OreDictionary.WILDCARD_VALUE)); - for (String key : new String[] { "drawerBasic" }) + for (String key : new String[] {"drawerBasic"}) OreDictionary.registerOre(key, new ItemStack(fullDrawers2, 1, OreDictionary.WILDCARD_VALUE)); - for (String key : new String[] { "drawerBasic" }) + for (String key : new String[] {"drawerBasic"}) OreDictionary.registerOre(key, new ItemStack(fullDrawers4, 1, OreDictionary.WILDCARD_VALUE)); - for (String key : new String[] { "drawerBasic" }) + for (String key : new String[] {"drawerBasic"}) OreDictionary.registerOre(key, new ItemStack(halfDrawers2, 1, OreDictionary.WILDCARD_VALUE)); - for (String key : new String[] { "drawerBasic" }) + for (String key : new String[] {"drawerBasic"}) OreDictionary.registerOre(key, new ItemStack(halfDrawers4, 1, OreDictionary.WILDCARD_VALUE)); resolver.init(); } - public static String getQualifiedName (String name) { + public static String getQualifiedName(String name) { return StorageDrawers.MOD_ID + ":" + name; } - public static String getQualifiedName (Block block) { + public static String getQualifiedName(Block block) { return GameData.getBlockRegistry().getNameForObject(block); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModCreativeTabs.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModCreativeTabs.java index aa76938..1f71a07 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModCreativeTabs.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModCreativeTabs.java @@ -8,31 +8,25 @@ 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() {} public static final CreativeTabs tabStorageDrawers = new CreativeTabs("storageDrawers") { @Override @SideOnly(Side.CLIENT) - public Item getTabIconItem () { + public Item getTabIconItem() { return getTabItem(); } }; - private static Item getTabItem () { + private static Item getTabItem() { ConfigManager config = StorageDrawers.config; - if (config.isBlockEnabled("fulldrawers2")) - return Item.getItemFromBlock(ModBlocks.fullDrawers2); - if (config.isBlockEnabled("fulldrawers4")) - return Item.getItemFromBlock(ModBlocks.fullDrawers4); - if (config.isBlockEnabled("fulldrawers1")) - return Item.getItemFromBlock(ModBlocks.fullDrawers1); - if (config.isBlockEnabled("halfdrawers2")) - return Item.getItemFromBlock(ModBlocks.halfDrawers2); - if (config.isBlockEnabled("halfdrawers4")) - return Item.getItemFromBlock(ModBlocks.halfDrawers4); + if (config.isBlockEnabled("fulldrawers2")) return Item.getItemFromBlock(ModBlocks.fullDrawers2); + if (config.isBlockEnabled("fulldrawers4")) return Item.getItemFromBlock(ModBlocks.fullDrawers4); + if (config.isBlockEnabled("fulldrawers1")) return Item.getItemFromBlock(ModBlocks.fullDrawers1); + if (config.isBlockEnabled("halfdrawers2")) return Item.getItemFromBlock(ModBlocks.halfDrawers2); + if (config.isBlockEnabled("halfdrawers4")) return Item.getItemFromBlock(ModBlocks.halfDrawers4); return Item.getItemFromBlock(Blocks.chest); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModGuiFactory.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModGuiFactory.java index 2153166..98489b5 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModGuiFactory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModGuiFactory.java @@ -2,28 +2,26 @@ package com.jaquadro.minecraft.storagedrawers.core; import com.jaquadro.minecraft.storagedrawers.config.ModConfigGui; import cpw.mods.fml.client.IModGuiFactory; +import java.util.Set; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import java.util.Set; - -public class ModGuiFactory implements IModGuiFactory -{ +public class ModGuiFactory implements IModGuiFactory { @Override - public void initialize (Minecraft minecraftInstance) { } + public void initialize(Minecraft minecraftInstance) {} @Override - public Class mainConfigGuiClass () { + public Class mainConfigGuiClass() { return ModConfigGui.class; } @Override - public Set runtimeGuiCategories () { + public Set runtimeGuiCategories() { return null; } @Override - public RuntimeOptionGuiHandler getHandlerFor (RuntimeOptionCategoryElement element) { + public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) { return null; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModItems.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModItems.java index 2465763..a2af9fe 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModItems.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModItems.java @@ -5,8 +5,7 @@ import com.jaquadro.minecraft.storagedrawers.item.*; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.Item; -public class ModItems -{ +public class ModItems { public static Item upgradeTemplate; public static ItemUpgrade upgrade; public static ItemUpgradeStatus upgradeStatus; @@ -19,8 +18,11 @@ public class ModItems public static ItemTape tape; public static ItemUpgradeDowngrade upgradeDowngrade; - public void init () { - upgradeTemplate = new Item().setUnlocalizedName(makeName("upgradeTemplate")).setTextureName(StorageDrawers.MOD_ID + ":upgrade_template").setCreativeTab(ModCreativeTabs.tabStorageDrawers); + public void init() { + upgradeTemplate = new Item() + .setUnlocalizedName(makeName("upgradeTemplate")) + .setTextureName(StorageDrawers.MOD_ID + ":upgrade_template") + .setCreativeTab(ModCreativeTabs.tabStorageDrawers); upgrade = new ItemUpgrade(makeName("upgrade")); upgradeStatus = new ItemUpgradeStatus(makeName("upgradeStatus")); upgradeLock = new ItemUpgradeLock(makeName("upgradeLock")); @@ -35,28 +37,22 @@ public class ModItems GameRegistry.registerItem(upgradeTemplate, "upgradeTemplate"); - if (StorageDrawers.config.cache.enableStorageUpgrades) - GameRegistry.registerItem(upgrade, "upgrade"); + if (StorageDrawers.config.cache.enableStorageUpgrades) GameRegistry.registerItem(upgrade, "upgrade"); if (StorageDrawers.config.cache.enableIndicatorUpgrades) GameRegistry.registerItem(upgradeStatus, "upgradeStatus"); - if (StorageDrawers.config.cache.enableVoidUpgrades) - GameRegistry.registerItem(upgradeVoid, "upgradeVoid"); + if (StorageDrawers.config.cache.enableVoidUpgrades) GameRegistry.registerItem(upgradeVoid, "upgradeVoid"); if (StorageDrawers.config.cache.enableCreativeUpgrades) GameRegistry.registerItem(upgradeCreative, "upgradeCreative"); if (StorageDrawers.config.cache.enableRedstoneUpgrades) GameRegistry.registerItem(upgradeRedstone, "upgradeRedstone"); - if (StorageDrawers.config.cache.enableLockUpgrades) - GameRegistry.registerItem(upgradeLock, "upgradeLock"); - if (StorageDrawers.config.cache.enableShroudUpgrades) - GameRegistry.registerItem(shroudKey, "shroudKey"); - if (StorageDrawers.config.cache.enablePersonalUpgrades) - GameRegistry.registerItem(personalKey, "personalKey"); - if (StorageDrawers.config.cache.enableTape) - GameRegistry.registerItem(tape, "tape"); + if (StorageDrawers.config.cache.enableLockUpgrades) GameRegistry.registerItem(upgradeLock, "upgradeLock"); + if (StorageDrawers.config.cache.enableShroudUpgrades) GameRegistry.registerItem(shroudKey, "shroudKey"); + if (StorageDrawers.config.cache.enablePersonalUpgrades) GameRegistry.registerItem(personalKey, "personalKey"); + if (StorageDrawers.config.cache.enableTape) GameRegistry.registerItem(tape, "tape"); GameRegistry.registerItem(upgradeDowngrade, "upgradeDowngrade"); } - public static String makeName (String name) { + public static String makeName(String name) { return StorageDrawers.MOD_ID.toLowerCase() + "." + name; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java index 0b290de..fa3a50c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java @@ -1,5 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.core; +import static com.jaquadro.minecraft.storagedrawers.StorageDrawers.config; + import com.jaquadro.minecraft.storagedrawers.core.recipe.FallbackShapedOreRecipe; import com.jaquadro.minecraft.storagedrawers.core.recipe.TemplateRecipe; import com.jaquadro.minecraft.storagedrawers.integration.ChiselIntegrationModule; @@ -14,115 +16,354 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.ShapedOreRecipe; -import static com.jaquadro.minecraft.storagedrawers.StorageDrawers.config; - public class ModRecipes { public void init() { OreDictionary.registerOre("chestWood", new ItemStack(Blocks.chest)); // Remove when porting to 1.8 if (GTNHIntegrationModule.isEnabled()) return; - RecipeSorter.register("StorageDrawers:FallbackShapedOreRecipe", FallbackShapedOreRecipe.class, RecipeSorter.Category.SHAPED, "after:forge:shapedore"); + RecipeSorter.register( + "StorageDrawers:FallbackShapedOreRecipe", + FallbackShapedOreRecipe.class, + RecipeSorter.Category.SHAPED, + "after:forge:shapedore"); if (!ChiselIntegrationModule.isEnabled()) { for (int i = 0; i < BlockWood.field_150096_a.length; i++) { if (config.isBlockEnabled("fulldrawers1")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fullDrawers1, config.getBlockRecipeOutput("fulldrawers1"), i), "xxx", " y ", "xxx", - 'x', new ItemStack(Blocks.planks, 1, i), 'y', "chestWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.fullDrawers1, config.getBlockRecipeOutput("fulldrawers1"), i), + "xxx", + " y ", + "xxx", + 'x', + new ItemStack(Blocks.planks, 1, i), + 'y', + "chestWood")); if (config.isBlockEnabled("fulldrawers2")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fullDrawers2, config.getBlockRecipeOutput("fulldrawers2"), i), "xyx", "xxx", "xyx", - 'x', new ItemStack(Blocks.planks, 1, i), 'y', "chestWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.fullDrawers2, config.getBlockRecipeOutput("fulldrawers2"), i), + "xyx", + "xxx", + "xyx", + 'x', + new ItemStack(Blocks.planks, 1, i), + 'y', + "chestWood")); if (config.isBlockEnabled("halfdrawers2")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.halfDrawers2, config.getBlockRecipeOutput("halfdrawers2"), i), "xyx", "xxx", "xyx", - 'x', new ItemStack(Blocks.wooden_slab, 1, i), 'y', "chestWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.halfDrawers2, config.getBlockRecipeOutput("halfdrawers2"), i), + "xyx", + "xxx", + "xyx", + 'x', + new ItemStack(Blocks.wooden_slab, 1, i), + 'y', + "chestWood")); if (config.isBlockEnabled("fulldrawers4")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fullDrawers4, config.getBlockRecipeOutput("fulldrawers4"), i), "yxy", "xxx", "yxy", - 'x', new ItemStack(Blocks.planks, 1, i), 'y', "chestWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.fullDrawers4, config.getBlockRecipeOutput("fulldrawers4"), i), + "yxy", + "xxx", + "yxy", + 'x', + new ItemStack(Blocks.planks, 1, i), + 'y', + "chestWood")); if (config.isBlockEnabled("halfdrawers4")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.halfDrawers4, config.getBlockRecipeOutput("halfdrawers4"), i), "yxy", "xxx", "yxy", - 'x', new ItemStack(Blocks.wooden_slab, 1, i), 'y', "chestWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.halfDrawers4, config.getBlockRecipeOutput("halfdrawers4"), i), + "yxy", + "xxx", + "yxy", + 'x', + new ItemStack(Blocks.wooden_slab, 1, i), + 'y', + "chestWood")); if (config.isBlockEnabled("trim")) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.trim, config.getBlockRecipeOutput("trim"), i), "xyx", "yyy", "xyx", - 'x', "stickWood", 'y', new ItemStack(Blocks.planks, 1, i))); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.trim, config.getBlockRecipeOutput("trim"), i), + "xyx", + "yyy", + "xyx", + 'x', + "stickWood", + 'y', + new ItemStack(Blocks.planks, 1, i))); } } } if (config.cache.enableFallbackRecipes || ChiselIntegrationModule.isEnabled()) { if (config.isBlockEnabled("fulldrawers1")) - GameRegistry.addRecipe(new FallbackShapedOreRecipe(new ItemStack(ModBlocks.fullDrawers1, config.getBlockRecipeOutput("fulldrawers1"), 0), "xxx", " y ", "xxx", - 'x', "plankWood", 'y', "chestWood")); + GameRegistry.addRecipe(new FallbackShapedOreRecipe( + new ItemStack(ModBlocks.fullDrawers1, config.getBlockRecipeOutput("fulldrawers1"), 0), + "xxx", + " y ", + "xxx", + 'x', + "plankWood", + 'y', + "chestWood")); if (config.isBlockEnabled("fulldrawers2")) - GameRegistry.addRecipe(new FallbackShapedOreRecipe(new ItemStack(ModBlocks.fullDrawers2, config.getBlockRecipeOutput("fulldrawers2"), 0), "xyx", "xxx", "xyx", - 'x', "plankWood", 'y', "chestWood")); + GameRegistry.addRecipe(new FallbackShapedOreRecipe( + new ItemStack(ModBlocks.fullDrawers2, config.getBlockRecipeOutput("fulldrawers2"), 0), + "xyx", + "xxx", + "xyx", + 'x', + "plankWood", + 'y', + "chestWood")); if (config.isBlockEnabled("halfdrawers2")) - GameRegistry.addRecipe(new FallbackShapedOreRecipe(new ItemStack(ModBlocks.halfDrawers2, config.getBlockRecipeOutput("halfdrawers2"), 0), "xyx", "xxx", "xyx", - 'x', "slabWood", 'y', "chestWood")); + GameRegistry.addRecipe(new FallbackShapedOreRecipe( + new ItemStack(ModBlocks.halfDrawers2, config.getBlockRecipeOutput("halfdrawers2"), 0), + "xyx", + "xxx", + "xyx", + 'x', + "slabWood", + 'y', + "chestWood")); if (config.isBlockEnabled("fulldrawers4")) - GameRegistry.addRecipe(new FallbackShapedOreRecipe(new ItemStack(ModBlocks.fullDrawers4, config.getBlockRecipeOutput("fulldrawers4"), 0), "yxy", "xxx", "yxy", - 'x', "plankWood", 'y', "chestWood")); + GameRegistry.addRecipe(new FallbackShapedOreRecipe( + new ItemStack(ModBlocks.fullDrawers4, config.getBlockRecipeOutput("fulldrawers4"), 0), + "yxy", + "xxx", + "yxy", + 'x', + "plankWood", + 'y', + "chestWood")); if (config.isBlockEnabled("halfdrawers4")) - GameRegistry.addRecipe(new FallbackShapedOreRecipe(new ItemStack(ModBlocks.halfDrawers4, config.getBlockRecipeOutput("halfdrawers4"), 0), "yxy", "xxx", "yxy", - 'x', "slabWood", 'y', "chestWood")); + GameRegistry.addRecipe(new FallbackShapedOreRecipe( + new ItemStack(ModBlocks.halfDrawers4, config.getBlockRecipeOutput("halfdrawers4"), 0), + "yxy", + "xxx", + "yxy", + 'x', + "slabWood", + 'y', + "chestWood")); if (config.isBlockEnabled("trim")) - GameRegistry.addRecipe(new FallbackShapedOreRecipe(new ItemStack(ModBlocks.trim, config.getBlockRecipeOutput("trim"), 0), "xyx", "yyy", "xyx", - 'x', "stickWood", 'y', "plankWood")); + GameRegistry.addRecipe(new FallbackShapedOreRecipe( + new ItemStack(ModBlocks.trim, config.getBlockRecipeOutput("trim"), 0), + "xyx", + "yyy", + "xyx", + 'x', + "stickWood", + 'y', + "plankWood")); } if (config.isBlockEnabled("compdrawers")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.compDrawers, config.getBlockRecipeOutput("compdrawers")), "xxx", "zwz", "xyx", - 'x', new ItemStack(Blocks.stone), 'y', "ingotIron", 'z', new ItemStack(Blocks.piston), 'w', "drawerBasic")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.compDrawers, config.getBlockRecipeOutput("compdrawers")), + "xxx", + "zwz", + "xyx", + 'x', + new ItemStack(Blocks.stone), + 'y', + "ingotIron", + 'z', + new ItemStack(Blocks.piston), + 'w', + "drawerBasic")); if (config.isBlockEnabled("controller")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.controller), "xxx", "yzy", "xwx", - 'x', new ItemStack(Blocks.stone), 'y', Items.comparator, 'z', "drawerBasic", 'w', "gemDiamond")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.controller), + "xxx", + "yzy", + "xwx", + 'x', + new ItemStack(Blocks.stone), + 'y', + Items.comparator, + 'z', + "drawerBasic", + 'w', + "gemDiamond")); if (config.isBlockEnabled("controllerSlave")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.controllerSlave), "xxx", "yzy", "xwx", - 'x', new ItemStack(Blocks.stone), 'y', Items.comparator, 'z', "drawerBasic", 'w', "ingotGold")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.controllerSlave), + "xxx", + "yzy", + "xwx", + 'x', + new ItemStack(Blocks.stone), + 'y', + Items.comparator, + 'z', + "drawerBasic", + 'w', + "ingotGold")); - //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx", + // GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx", // 'x', "stickWood", 'y', "drawerBasic")); if (config.cache.enableStorageUpgrades) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 2), "xyx", "yzy", "xyx", - 'x', "ingotIron", 'y', "stickWood", 'z', ModItems.upgradeTemplate)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 3), "xyx", "yzy", "xyx", - 'x', "ingotGold", 'y', "stickWood", 'z', ModItems.upgradeTemplate)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 4), "xyx", "yzy", "xyx", - 'x', Blocks.obsidian, 'y', "stickWood", 'z', ModItems.upgradeTemplate)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 5), "xyx", "yzy", "xyx", - 'x', "gemDiamond", 'y', "stickWood", 'z', ModItems.upgradeTemplate)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 6), "xyx", "yzy", "xyx", - 'x', "gemEmerald", 'y', "stickWood", 'z', ModItems.upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgrade, 1, 2), + "xyx", + "yzy", + "xyx", + 'x', + "ingotIron", + 'y', + "stickWood", + 'z', + ModItems.upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgrade, 1, 3), + "xyx", + "yzy", + "xyx", + 'x', + "ingotGold", + 'y', + "stickWood", + 'z', + ModItems.upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgrade, 1, 4), + "xyx", + "yzy", + "xyx", + 'x', + Blocks.obsidian, + 'y', + "stickWood", + 'z', + ModItems.upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgrade, 1, 5), + "xyx", + "yzy", + "xyx", + 'x', + "gemDiamond", + 'y', + "stickWood", + 'z', + ModItems.upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgrade, 1, 6), + "xyx", + "yzy", + "xyx", + 'x', + "gemEmerald", + 'y', + "stickWood", + 'z', + ModItems.upgradeTemplate)); - - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeDowngrade, 1, 0), "xyx", "yzy", "xyx", - 'x', Items.flint, 'y', "stickWood", 'z', ModItems.upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeDowngrade, 1, 0), + "xyx", + "yzy", + "xyx", + 'x', + Items.flint, + 'y', + "stickWood", + 'z', + ModItems.upgradeTemplate)); } if (config.cache.enableIndicatorUpgrades) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeStatus, 1, 1), "wyw", "yzy", "xyx", - 'w', new ItemStack(Blocks.redstone_torch), 'x', "dustRedstone", 'y', "stickWood", 'z', ModItems.upgradeTemplate)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeStatus, 1, 2), "wyw", "yzy", "xyx", - 'w', Items.comparator, 'x', "dustRedstone", 'y', "stickWood", 'z', ModItems.upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeStatus, 1, 1), + "wyw", + "yzy", + "xyx", + 'w', + new ItemStack(Blocks.redstone_torch), + 'x', + "dustRedstone", + 'y', + "stickWood", + 'z', + ModItems.upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeStatus, 1, 2), + "wyw", + "yzy", + "xyx", + 'w', + Items.comparator, + 'x', + "dustRedstone", + 'y', + "stickWood", + 'z', + ModItems.upgradeTemplate)); } if (config.cache.enableLockUpgrades) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeLock), "xy ", " y ", " z ", - 'x', "nuggetGold", 'y', "ingotGold", 'z', ModItems.upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeLock), + "xy ", + " y ", + " z ", + 'x', + "nuggetGold", + 'y', + "ingotGold", + 'z', + ModItems.upgradeTemplate)); } if (config.cache.enableVoidUpgrades) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeVoid), "yyy", "xzx", "yyy", - 'x', Blocks.obsidian, 'y', "stickWood", 'z', ModItems.upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeVoid), + "yyy", + "xzx", + "yyy", + 'x', + Blocks.obsidian, + 'y', + "stickWood", + 'z', + ModItems.upgradeTemplate)); } if (config.cache.enableRedstoneUpgrades) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeRedstone, 1, 0), "xyx", "yzy", "xyx", - 'x', "dustRedstone", 'y', "stickWood", 'z', ModItems.upgradeTemplate)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeRedstone, 1, 1), "xxx", "yzy", "yyy", - 'x', "dustRedstone", 'y', "stickWood", 'z', ModItems.upgradeTemplate)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeRedstone, 1, 2), "yyy", "yzy", "xxx", - 'x', "dustRedstone", 'y', "stickWood", 'z', ModItems.upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeRedstone, 1, 0), + "xyx", + "yzy", + "xyx", + 'x', + "dustRedstone", + 'y', + "stickWood", + 'z', + ModItems.upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeRedstone, 1, 1), + "xxx", + "yzy", + "yyy", + 'x', + "dustRedstone", + 'y', + "stickWood", + 'z', + ModItems.upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeRedstone, 1, 2), + "yyy", + "yzy", + "xxx", + 'x', + "dustRedstone", + 'y', + "stickWood", + 'z', + ModItems.upgradeTemplate)); } if (config.cache.enableShroudUpgrades) { @@ -134,35 +375,88 @@ public class ModRecipes { } if (config.cache.enableTape) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.tape), " x ", "yyy", - 'x', "slimeball", 'y', Items.paper)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.tape), " x ", "yyy", 'x', "slimeball", 'y', Items.paper)); } if (config.cache.enableFramedDrawers) { - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.framingTable), "xxx", "x x", - 'x', ModBlocks.trim); + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.framingTable), "xxx", "x x", 'x', ModBlocks.trim); if (config.isBlockEnabled("fulldrawers1")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fullCustom1, config.getBlockRecipeOutput("fulldrawers1"), 0), "xxx", " y ", "xxx", - 'x', "stickWood", 'y', "chestWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.fullCustom1, config.getBlockRecipeOutput("fulldrawers1"), 0), + "xxx", + " y ", + "xxx", + 'x', + "stickWood", + 'y', + "chestWood")); if (config.isBlockEnabled("fulldrawers2")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fullCustom2, config.getBlockRecipeOutput("fulldrawers2"), 0), "xyx", "xzx", "xyx", - 'x', "stickWood", 'y', "chestWood", 'z', "plankWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.fullCustom2, config.getBlockRecipeOutput("fulldrawers2"), 0), + "xyx", + "xzx", + "xyx", + 'x', + "stickWood", + 'y', + "chestWood", + 'z', + "plankWood")); if (config.isBlockEnabled("halfdrawers2")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.halfCustom2, config.getBlockRecipeOutput("halfdrawers2"), 0), "xyx", "xzx", "xyx", - 'x', "stickWood", 'y', "chestWood", 'z', "slabWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.halfCustom2, config.getBlockRecipeOutput("halfdrawers2"), 0), + "xyx", + "xzx", + "xyx", + 'x', + "stickWood", + 'y', + "chestWood", + 'z', + "slabWood")); if (config.isBlockEnabled("fulldrawers4")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fullCustom4, config.getBlockRecipeOutput("fulldrawers4"), 0), "yxy", "xzx", "yxy", - 'x', "stickWood", 'y', "chestWood", 'z', "plankWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.fullCustom4, config.getBlockRecipeOutput("fulldrawers4"), 0), + "yxy", + "xzx", + "yxy", + 'x', + "stickWood", + 'y', + "chestWood", + 'z', + "plankWood")); if (config.isBlockEnabled("halfdrawers4")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.halfCustom4, config.getBlockRecipeOutput("halfdrawers4"), 0), "yxy", "xzx", "yxy", - 'x', "stickWood", 'y', "chestWood", 'z', "slabWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.halfCustom4, config.getBlockRecipeOutput("halfdrawers4"), 0), + "yxy", + "xzx", + "yxy", + 'x', + "stickWood", + 'y', + "chestWood", + 'z', + "slabWood")); if (config.isBlockEnabled("trim")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.trimCustom, config.getBlockRecipeOutput("trim"), 0), "yxy", "xyx", "yxy", - 'x', "stickWood", 'y', "plankWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.trimCustom, config.getBlockRecipeOutput("trim"), 0), + "yxy", + "xyx", + "yxy", + 'x', + "stickWood", + 'y', + "plankWood")); } - RecipeSorter.register("StorageDrawers:UpgradeTemplate", TemplateRecipe.class, RecipeSorter.Category.SHAPED, "after:minecraft:shaped"); + RecipeSorter.register( + "StorageDrawers:UpgradeTemplate", + TemplateRecipe.class, + RecipeSorter.Category.SHAPED, + "after:minecraft:shaped"); CraftingManager.getInstance().getRecipeList().add(new TemplateRecipe()); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/api/BlockRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/api/BlockRegistry.java index bf83f55..dbbb6cd 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/api/BlockRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/api/BlockRegistry.java @@ -4,31 +4,32 @@ import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; import com.jaquadro.minecraft.storagedrawers.api.pack.IExtendedDataResolver; import com.jaquadro.minecraft.storagedrawers.util.UniqueMetaIdentifier; import com.jaquadro.minecraft.storagedrawers.util.UniqueMetaRegistry; -import net.minecraft.block.Block; - import java.util.HashMap; import java.util.Map; +import net.minecraft.block.Block; -public class BlockRegistry -{ - private Map> registry = new HashMap>(); - private Map> invertRegistry = new HashMap>(); +public class BlockRegistry { + private Map> registry = + new HashMap>(); + private Map> invertRegistry = + new HashMap>(); - public void register (BlockConfiguration config, IExtendedDataResolver resolver) { + public void register(BlockConfiguration config, IExtendedDataResolver resolver) { for (int i = 0; i < 16; i++) { if (resolver.isValidMetaValue(i)) register(config, resolver.getBlock(config), i, resolver.getPlankBlock(i), resolver.getPlankMeta(i)); } } - public void register (BlockConfiguration config, Block block, int meta, Block plankBlock, int plankMeta) { + public void register(BlockConfiguration config, Block block, int meta, Block plankBlock, int plankMeta) { UniqueMetaRegistry uniq = registry.get(config); if (uniq == null) { uniq = new UniqueMetaRegistry(); registry.put(config, uniq); } - uniq.register(UniqueMetaIdentifier.createFor(plankBlock, plankMeta), UniqueMetaIdentifier.createFor(block, meta)); + uniq.register( + UniqueMetaIdentifier.createFor(plankBlock, plankMeta), UniqueMetaIdentifier.createFor(block, meta)); UniqueMetaRegistry blockReg = invertRegistry.get(config); if (blockReg == null) { @@ -36,45 +37,50 @@ public class BlockRegistry invertRegistry.put(config, blockReg); } - blockReg.register(UniqueMetaIdentifier.createFor(block, meta), UniqueMetaIdentifier.createFor(plankBlock, plankMeta)); + blockReg.register( + UniqueMetaIdentifier.createFor(block, meta), UniqueMetaIdentifier.createFor(plankBlock, plankMeta)); } - public Block getBlock (BlockConfiguration config, Block plankBlock, int plankMeta) { + public Block getBlock(BlockConfiguration config, Block plankBlock, int plankMeta) { return blockLookup(registry, config, plankBlock, plankMeta); } - public int getMeta (BlockConfiguration config, Block plankBlock, int plankMeta) { + public int getMeta(BlockConfiguration config, Block plankBlock, int plankMeta) { return metaLookup(registry, config, plankBlock, plankMeta); } - public Block getPlankBlock (BlockConfiguration config, Block block, int meta) { + public Block getPlankBlock(BlockConfiguration config, Block block, int meta) { return blockLookup(invertRegistry, config, block, meta); } - public int getPlankMeta (BlockConfiguration config, Block block, int meta) { + public int getPlankMeta(BlockConfiguration config, Block block, int meta) { return metaLookup(invertRegistry, config, block, meta); } - private Block blockLookup (Map> reg, BlockConfiguration config, Block block, int meta) { + private Block blockLookup( + Map> reg, + BlockConfiguration config, + Block block, + int meta) { UniqueMetaRegistry uniq = reg.get(config); - if (uniq == null) - return null; + if (uniq == null) return null; UniqueMetaIdentifier id = uniq.getEntry(UniqueMetaIdentifier.createFor(block, meta)); - if (id == null) - return null; + if (id == null) return null; return id.getBlock(); } - private int metaLookup (Map> reg, BlockConfiguration config, Block block, int meta) { + private int metaLookup( + Map> reg, + BlockConfiguration config, + Block block, + int meta) { UniqueMetaRegistry uniq = reg.get(config); - if (uniq == null) - return 0; + if (uniq == null) return 0; UniqueMetaIdentifier id = uniq.getEntry(UniqueMetaIdentifier.createFor(block, meta)); - if (id == null) - return 0; + if (id == null) return 0; return id.meta; } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/api/PackFactory.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/api/PackFactory.java index 6fd1a2e..31af821 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/api/PackFactory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/api/PackFactory.java @@ -29,10 +29,13 @@ public class PackFactory implements IPackBlockFactory { public Block createBlock(BlockConfiguration blockConfig, IPackDataResolver dataResolver) { switch (blockConfig.getBlockType()) { case Drawers: - return new BlockDrawersPack(dataResolver, blockConfig.getDrawerCount(), blockConfig.isHalfDepth()).setConfigName(getConfigName(blockConfig)); + return new BlockDrawersPack(dataResolver, blockConfig.getDrawerCount(), blockConfig.isHalfDepth()) + .setConfigName(getConfigName(blockConfig)); case DrawersSorting: if (IntegrationRegistry.instance().isModLoaded("RefinedRelocation")) - return new BlockSortingDrawersPack(dataResolver, blockConfig.getDrawerCount(), blockConfig.isHalfDepth()).setConfigName(getConfigName(blockConfig)); + return new BlockSortingDrawersPack( + dataResolver, blockConfig.getDrawerCount(), blockConfig.isHalfDepth()) + .setConfigName(getConfigName(blockConfig)); return null; case Trim: return new BlockTrimPack(dataResolver); @@ -60,8 +63,7 @@ public class PackFactory implements IPackBlockFactory { StorageDrawers.proxy.registerDrawer(block); } else if (block instanceof BlockSortingTrimPack) GameRegistry.registerBlock(block, ItemSortingTrimPack.class, name); - else if (block instanceof BlockTrimPack) - GameRegistry.registerBlock(block, ItemTrimPack.class, name); + else if (block instanceof BlockTrimPack) GameRegistry.registerBlock(block, ItemTrimPack.class, name); ChiselIntegrationModule.registerPackBlock(block); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/api/PackRecipes.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/api/PackRecipes.java index d2fc7d8..b28c90d 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/api/PackRecipes.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/api/PackRecipes.java @@ -1,5 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.core.api; +import static com.jaquadro.minecraft.storagedrawers.StorageDrawers.*; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; @@ -13,13 +15,10 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; -import static com.jaquadro.minecraft.storagedrawers.StorageDrawers.*; - public class PackRecipes { public static void registerStandardRecipes(IExtendedDataResolver resolver) { IStorageDrawersApi api = StorageDrawersApi.instance(); - if (api == null) - return; + if (api == null) return; IBlockConfig blockConfig = api.userConfig().blockConfig(); @@ -38,8 +37,7 @@ public class PackRecipes { Block basicTrim = resolver.getBlock(BlockConfiguration.Trim); for (int i = 0; i < 16; i++) { - if (!resolver.isValidMetaValue(i)) - continue; + if (!resolver.isValidMetaValue(i)) continue; if (!config.cache.enableChiselIntegration && Loader.isModLoaded("chisel")) { @@ -50,52 +48,92 @@ public class PackRecipes { if (blockConfig.isBlockEnabled(nameFull1) && basicFull1 != null) { if (plank != null) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(basicFull1, blockConfig.getBlockRecipeOutput(nameFull1), i), "xxx", " y ", "xxx", - 'x', new ItemStack(plank, 1, plankMeta), 'y', "chestWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(basicFull1, blockConfig.getBlockRecipeOutput(nameFull1), i), + "xxx", + " y ", + "xxx", + 'x', + new ItemStack(plank, 1, plankMeta), + 'y', + "chestWood")); if (slab != null) { if (StorageDrawers.config.cache.enableGTNHIntegration) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(basicFull1, blockConfig.getBlockRecipeOutput(nameFull1), i), - new String[]{ - "xxx", - "xyx", - "xxx"}, - 'x', new ItemStack(slab, 1, slabMeta), - 'y', "chestWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(basicFull1, blockConfig.getBlockRecipeOutput(nameFull1), i), + new String[] {"xxx", "xyx", "xxx"}, + 'x', + new ItemStack(slab, 1, slabMeta), + 'y', + "chestWood")); } } } if (blockConfig.isBlockEnabled(nameFull2) && basicFull2 != null) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(basicFull2, blockConfig.getBlockRecipeOutput(nameFull2), i), "xyx", "xxx", "xyx", - 'x', new ItemStack(plank, 1, plankMeta), 'y', "chestWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(basicFull2, blockConfig.getBlockRecipeOutput(nameFull2), i), + "xyx", + "xxx", + "xyx", + 'x', + new ItemStack(plank, 1, plankMeta), + 'y', + "chestWood")); if (blockConfig.isBlockEnabled(nameFull4) && basicFull4 != null) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(basicFull4, blockConfig.getBlockRecipeOutput(nameFull4), i), "yxy", "xxx", "yxy", - 'x', new ItemStack(plank, 1, plankMeta), 'y', "chestWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(basicFull4, blockConfig.getBlockRecipeOutput(nameFull4), i), + "yxy", + "xxx", + "yxy", + 'x', + new ItemStack(plank, 1, plankMeta), + 'y', + "chestWood")); if (blockConfig.isBlockEnabled(nameTrim) && basicTrim != null) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(basicTrim, blockConfig.getBlockRecipeOutput(nameTrim), i), "xyx", "yyy", "xyx", - 'x', "stickWood", 'y', new ItemStack(plank, 1, plankMeta))); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(basicTrim, blockConfig.getBlockRecipeOutput(nameTrim), i), + "xyx", + "yyy", + "xyx", + 'x', + "stickWood", + 'y', + new ItemStack(plank, 1, plankMeta))); } if (slab != null) { if (blockConfig.isBlockEnabled(nameHalf2) && basicHalf2 != null) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(basicHalf2, blockConfig.getBlockRecipeOutput(nameHalf2), i), "xyx", "xxx", "xyx", - 'x', new ItemStack(slab, 1, slabMeta), 'y', "chestWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(basicHalf2, blockConfig.getBlockRecipeOutput(nameHalf2), i), + "xyx", + "xxx", + "xyx", + 'x', + new ItemStack(slab, 1, slabMeta), + 'y', + "chestWood")); if (blockConfig.isBlockEnabled(nameHalf4) && basicHalf4 != null) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(basicHalf4, blockConfig.getBlockRecipeOutput(nameHalf4), i), "yxy", "xxx", "yxy", - 'x', new ItemStack(slab, 1, slabMeta), 'y', "chestWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(basicHalf4, blockConfig.getBlockRecipeOutput(nameHalf4), i), + "yxy", + "xxx", + "yxy", + 'x', + new ItemStack(slab, 1, slabMeta), + 'y', + "chestWood")); } } } } - public static void registerSortingRecipes(IExtendedDataResolver resolver) { IStorageDrawersApi api = StorageDrawersApi.instance(); - if (api == null) - return; + if (api == null) return; - if (!Loader.isModLoaded("RefinedRelocation") || !api.userConfig().integrationConfig().isRefinedRelocationEnabled()) - return; + if (!Loader.isModLoaded("RefinedRelocation") + || !api.userConfig().integrationConfig().isRefinedRelocationEnabled()) return; IBlockConfig blockConfig = api.userConfig().blockConfig(); @@ -121,27 +159,68 @@ public class PackRecipes { Block sortingTrim = resolver.getBlock(BlockConfiguration.TrimSorting); for (int i = 0; i < 16; i++) { - if (!resolver.isValidMetaValue(i)) - continue; + if (!resolver.isValidMetaValue(i)) continue; if (blockConfig.isBlockEnabled(nameFull1) && sortingFull1 != null && basicFull1 != null) - GameRegistry.addRecipe(new ItemStack(sortingFull1, 1, i), "x x", " y ", "x x", - 'x', Items.gold_nugget, 'y', new ItemStack(basicFull1, 1, i)); + GameRegistry.addRecipe( + new ItemStack(sortingFull1, 1, i), + "x x", + " y ", + "x x", + 'x', + Items.gold_nugget, + 'y', + new ItemStack(basicFull1, 1, i)); if (blockConfig.isBlockEnabled(nameFull2) && sortingFull2 != null && basicFull2 != null) - GameRegistry.addRecipe(new ItemStack(sortingFull2, 1, i), "x x", " y ", "x x", - 'x', Items.gold_nugget, 'y', new ItemStack(basicFull2, 1, i)); + GameRegistry.addRecipe( + new ItemStack(sortingFull2, 1, i), + "x x", + " y ", + "x x", + 'x', + Items.gold_nugget, + 'y', + new ItemStack(basicFull2, 1, i)); if (blockConfig.isBlockEnabled(nameFull4) && sortingFull4 != null && basicFull4 != null) - GameRegistry.addRecipe(new ItemStack(sortingFull4, 1, i), "x x", " y ", "x x", - 'x', Items.gold_nugget, 'y', new ItemStack(basicFull4, 1, i)); + GameRegistry.addRecipe( + new ItemStack(sortingFull4, 1, i), + "x x", + " y ", + "x x", + 'x', + Items.gold_nugget, + 'y', + new ItemStack(basicFull4, 1, i)); if (blockConfig.isBlockEnabled(nameHalf2) && sortingHalf2 != null && basicHalf2 != null) - GameRegistry.addRecipe(new ItemStack(sortingHalf2, 1, i), "x x", " y ", "x x", - 'x', Items.gold_nugget, 'y', new ItemStack(basicHalf2, 1, i)); + GameRegistry.addRecipe( + new ItemStack(sortingHalf2, 1, i), + "x x", + " y ", + "x x", + 'x', + Items.gold_nugget, + 'y', + new ItemStack(basicHalf2, 1, i)); if (blockConfig.isBlockEnabled(nameHalf4) && sortingHalf4 != null && basicHalf4 != null) - GameRegistry.addRecipe(new ItemStack(sortingHalf4, 1, i), "x x", " y ", "x x", - 'x', Items.gold_nugget, 'y', new ItemStack(basicHalf4, 1, i)); + GameRegistry.addRecipe( + new ItemStack(sortingHalf4, 1, i), + "x x", + " y ", + "x x", + 'x', + Items.gold_nugget, + 'y', + new ItemStack(basicHalf4, 1, i)); if (blockConfig.isBlockEnabled(nameTrim) && sortingTrim != null && basicTrim != null) - GameRegistry.addRecipe(new ItemStack(sortingTrim, 1, i), "x x", " y ", "x x", - 'x', Items.gold_nugget, 'y', new ItemStack(basicTrim, 1, i)); + GameRegistry.addRecipe( + new ItemStack(sortingTrim, 1, i), + "x x", + " y ", + "x x", + 'x', + Items.gold_nugget, + 'y', + new ItemStack(basicTrim, 1, i)); } } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/handlers/GuiHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/handlers/GuiHandler.java index 20e6e0f..a054917 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/handlers/GuiHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/handlers/GuiHandler.java @@ -11,16 +11,14 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public class GuiHandler implements IGuiHandler -{ +public class GuiHandler implements IGuiHandler { public static int drawersGuiID = 0; public static int framingGuiID = 1; @Override - public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileEntityDrawers) - return new ContainerDrawers(player.inventory, (TileEntityDrawers) tile); + if (tile instanceof TileEntityDrawers) return new ContainerDrawers(player.inventory, (TileEntityDrawers) tile); if (tile instanceof TileEntityFramingTable) return new ContainerFramingTable(player.inventory, (TileEntityFramingTable) tile); @@ -28,17 +26,16 @@ public class GuiHandler implements IGuiHandler } @Override - public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileEntityDrawers) - return new GuiDrawers(player.inventory, (TileEntityDrawers) tile); + if (tile instanceof TileEntityDrawers) return new GuiDrawers(player.inventory, (TileEntityDrawers) tile); if (tile instanceof TileEntityFramingTable) return new GuiFraming(player.inventory, (TileEntityFramingTable) tile); return null; } - private ContainerDrawers getContainer (TileEntityDrawers tile, InventoryPlayer playerInventory) { + private ContainerDrawers getContainer(TileEntityDrawers tile, InventoryPlayer playerInventory) { switch (tile.getDrawerCount()) { case 1: return new ContainerDrawers1(playerInventory, tile); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/recipe/FallbackShapedOreRecipe.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/recipe/FallbackShapedOreRecipe.java index 5694ffe..ac80d78 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/recipe/FallbackShapedOreRecipe.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/recipe/FallbackShapedOreRecipe.java @@ -5,17 +5,16 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; -public class FallbackShapedOreRecipe extends ShapedOreRecipe -{ - public FallbackShapedOreRecipe (Block result, Object... recipe) { +public class FallbackShapedOreRecipe extends ShapedOreRecipe { + public FallbackShapedOreRecipe(Block result, Object... recipe) { super(result, recipe); } - public FallbackShapedOreRecipe (Item result, Object... recipe) { + public FallbackShapedOreRecipe(Item result, Object... recipe) { super(result, recipe); } - public FallbackShapedOreRecipe (ItemStack result, Object... recipe) { + public FallbackShapedOreRecipe(ItemStack result, Object... recipe) { super(result, recipe); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/recipe/TemplateRecipe.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/recipe/TemplateRecipe.java index 4a189d0..eadef77 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/recipe/TemplateRecipe.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/recipe/TemplateRecipe.java @@ -2,61 +2,53 @@ package com.jaquadro.minecraft.storagedrawers.core.recipe; import com.jaquadro.minecraft.storagedrawers.core.ModItems; import com.jaquadro.minecraft.storagedrawers.item.ItemDrawers; +import java.util.List; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; -import java.util.List; - -public class TemplateRecipe implements IRecipe -{ +public class TemplateRecipe implements IRecipe { @Override - public boolean matches (InventoryCrafting inventory, World world) { + public boolean matches(InventoryCrafting inventory, World world) { return getCraftingResult(inventory) != null; } @Override - public ItemStack getCraftingResult (InventoryCrafting inventory) { + public ItemStack getCraftingResult(InventoryCrafting inventory) { List sticks = OreDictionary.getOres("stickWood"); for (int row = 0; row < 3; row++) { for (int col = 0; col < 3; col++) { - if (row == 1 && col == 1) - continue; + if (row == 1 && col == 1) continue; ItemStack stack = inventory.getStackInRowAndColumn(col, row); - if (stack == null) - return null; + if (stack == null) return null; boolean match = false; for (ItemStack comp : sticks) { - if (comp != null && comp.isItemEqual(stack)) - match = true; + if (comp != null && comp.isItemEqual(stack)) match = true; } - if (!match) - return null; + if (!match) return null; } } ItemStack center = inventory.getStackInRowAndColumn(1, 1); - if (center == null || !(center.getItem() instanceof ItemDrawers)) - return null; + if (center == null || !(center.getItem() instanceof ItemDrawers)) return null; - if (center.getTagCompound() != null && center.getTagCompound().hasKey("tile")) - return null; + if (center.getTagCompound() != null && center.getTagCompound().hasKey("tile")) return null; return getRecipeOutput(); } @Override - public int getRecipeSize () { + public int getRecipeSize() { return 9; } @Override - public ItemStack getRecipeOutput () { + public ItemStack getRecipeOutput() { return new ItemStack(ModItems.upgradeTemplate, 1); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java index ca92f18..0c78c7b 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java @@ -8,13 +8,10 @@ import appeng.api.storage.IMEMonitor; import appeng.api.storage.data.IAEItemStack; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.integration.ae2.*; - import java.lang.reflect.Constructor; -public class AppliedEnergistics extends IntegrationModule -{ - private static class ReflectionFactory implements IStorageBusMonitorFactory - { +public class AppliedEnergistics extends IntegrationModule { + private static class ReflectionFactory implements IStorageBusMonitorFactory { private Class classInventoryAdaptor; private Class classMEAdaptor; private Class classMonitor; @@ -22,7 +19,7 @@ public class AppliedEnergistics extends IntegrationModule private Constructor constMEAdaptor; private Constructor constMonitor; - public boolean init () { + public boolean init() { try { classInventoryAdaptor = Class.forName("appeng.util.InventoryAdaptor"); classMEAdaptor = Class.forName("appeng.util.inv.IMEAdaptor"); @@ -32,21 +29,20 @@ public class AppliedEnergistics extends IntegrationModule constMonitor = classMonitor.getConstructor(classInventoryAdaptor); return true; - } - catch (Throwable t) { + } catch (Throwable t) { return false; } } @Override - public IMEMonitor createStorageBusMonitor (IMEInventory inventory, BaseActionSource src) { + public IMEMonitor createStorageBusMonitor( + IMEInventory inventory, BaseActionSource src) { try { Object adaptor = constMEAdaptor.newInstance(inventory, src); Object monitor = constMonitor.newInstance(adaptor); return (IMEMonitor) monitor; - } - catch (Throwable t) { + } catch (Throwable t) { return null; } } @@ -55,7 +51,8 @@ public class AppliedEnergistics extends IntegrationModule private static class APIFactory implements IStorageBusMonitorFactory { @Override - public IMEMonitor createStorageBusMonitor (IMEInventory inventory, BaseActionSource src) { + public IMEMonitor createStorageBusMonitor( + IMEInventory inventory, BaseActionSource src) { return null; } } @@ -63,31 +60,34 @@ public class AppliedEnergistics extends IntegrationModule private IStorageBusMonitorFactory factory; @Override - public String getModID () { + public String getModID() { return "appliedenergistics2"; } @Override - public void init () throws Throwable { + public void init() throws Throwable { ShapedRecipeHandler shapedHandler = new ShapedRecipeHandler(); if (shapedHandler.isValid()) StorageDrawers.recipeHandlerRegistry.registerRecipeHandler(shapedHandler.getRecipeClass(), shapedHandler); ShapelessRecipeHandler shapelessHandler = new ShapelessRecipeHandler(); if (shapelessHandler.isValid()) - StorageDrawers.recipeHandlerRegistry.registerRecipeHandler(shapelessHandler.getRecipeClass(), shapelessHandler); + StorageDrawers.recipeHandlerRegistry.registerRecipeHandler( + shapelessHandler.getRecipeClass(), shapelessHandler); StorageDrawers.recipeHandlerRegistry.registerIngredientHandler(IIngredient.class, new IngredientHandler()); ReflectionFactory rfactory = new ReflectionFactory(); - if (!rfactory.init()) - throw new Exception("No valid Storage Bus Monitor factory"); + if (!rfactory.init()) throw new Exception("No valid Storage Bus Monitor factory"); factory = rfactory; } @Override - public void postInit () { - AEApi.instance().registries().externalStorage().addExternalStorageInterface(new DrawerExternalStorageHandler(factory)); + public void postInit() { + AEApi.instance() + .registries() + .externalStorage() + .addExternalStorageInterface(new DrawerExternalStorageHandler(factory)); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ChiselIntegrationModule.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ChiselIntegrationModule.java index 4db8e97..2ca797e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ChiselIntegrationModule.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ChiselIntegrationModule.java @@ -19,7 +19,8 @@ public class ChiselIntegrationModule extends IntegrationModule { private static final String chiselModID = "chisel"; private static final String addVariation = "variation:add"; - private static final boolean chiselEnabled = (Loader.isModLoaded(chiselModID) && StorageDrawers.config.integrationConfig.isChiselEnabled()); + private static final boolean chiselEnabled = + (Loader.isModLoaded(chiselModID) && StorageDrawers.config.integrationConfig.isChiselEnabled()); public static boolean isEnabled() { return chiselEnabled; @@ -67,10 +68,14 @@ public class ChiselIntegrationModule extends IntegrationModule { } public static void registerBlock(final Block block, final int meta, final String blockGroupName) { - FMLInterModComms.sendMessage(chiselModID, addVariation, String.join("|", - "StorageDrawers_" + blockGroupName, - GameRegistry.findUniqueIdentifierFor(block).toString(), - Integer.toString(meta))); + FMLInterModComms.sendMessage( + chiselModID, + addVariation, + String.join( + "|", + "StorageDrawers_" + blockGroupName, + GameRegistry.findUniqueIdentifierFor(block).toString(), + Integer.toString(meta))); } @Override @@ -83,18 +88,12 @@ public class ChiselIntegrationModule extends IntegrationModule { final ConfigManager config = StorageDrawers.config; for (int meta = 0; meta < BlockWood.field_150096_a.length; meta++) { - if (config.isBlockEnabled("fulldrawers1")) - registerBlock(ModBlocks.fullDrawers1, meta, "basicFull1"); - if (config.isBlockEnabled("fulldrawers2")) - registerBlock(ModBlocks.fullDrawers2, meta, "basicFull2"); - if (config.isBlockEnabled("fulldrawers4")) - registerBlock(ModBlocks.fullDrawers4, meta, "basicFull4"); - if (config.isBlockEnabled("halfdrawers2")) - registerBlock(ModBlocks.halfDrawers2, meta, "basicHalf2"); - if (config.isBlockEnabled("halfdrawers4")) - registerBlock(ModBlocks.halfDrawers4, meta, "basicHalf4"); - if (config.isBlockEnabled("trim")) - registerBlock(ModBlocks.trim, meta, "trim"); + if (config.isBlockEnabled("fulldrawers1")) registerBlock(ModBlocks.fullDrawers1, meta, "basicFull1"); + if (config.isBlockEnabled("fulldrawers2")) registerBlock(ModBlocks.fullDrawers2, meta, "basicFull2"); + if (config.isBlockEnabled("fulldrawers4")) registerBlock(ModBlocks.fullDrawers4, meta, "basicFull4"); + if (config.isBlockEnabled("halfdrawers2")) registerBlock(ModBlocks.halfDrawers2, meta, "basicHalf2"); + if (config.isBlockEnabled("halfdrawers4")) registerBlock(ModBlocks.halfDrawers4, meta, "basicHalf4"); + if (config.isBlockEnabled("trim")) registerBlock(ModBlocks.trim, meta, "trim"); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/GTNHIntegrationModule.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/GTNHIntegrationModule.java index 7c97f94..85644ba 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/GTNHIntegrationModule.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/GTNHIntegrationModule.java @@ -6,7 +6,8 @@ import cpw.mods.fml.common.Loader; public class GTNHIntegrationModule extends IntegrationModule { - private static final boolean GTNHEnabled = (Loader.isModLoaded("gregtech") && StorageDrawers.config.integrationConfig.isGTNHEnabled()); + private static final boolean GTNHEnabled = + (Loader.isModLoaded("gregtech") && StorageDrawers.config.integrationConfig.isGTNHEnabled()); public static boolean isEnabled() { return GTNHEnabled; @@ -23,7 +24,5 @@ public class GTNHIntegrationModule extends IntegrationModule { } @Override - public void postInit() { - - } + public void postInit() {} } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java index 523c09d..49725b1 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java @@ -6,17 +6,14 @@ import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import cpw.mods.fml.common.versioning.InvalidVersionSpecificationException; import cpw.mods.fml.common.versioning.VersionRange; - import java.util.List; -public abstract class IntegrationModule -{ - public abstract String getModID (); +public abstract class IntegrationModule { + public abstract String getModID(); - public boolean versionCheck () { + public boolean versionCheck() { String pattern = versionPattern(); - if (pattern == null) - return true; + if (pattern == null) return true; List modList = Loader.instance().getModList(); for (int i = 0, n = modList.size(); i < n; i++) { @@ -26,8 +23,7 @@ public abstract class IntegrationModule VersionRange validVersions = VersionRange.createFromVersionSpec(pattern); ArtifactVersion version = new DefaultArtifactVersion(mod.getVersion()); return validVersions.containsVersion(version); - } - catch (InvalidVersionSpecificationException e) { + } catch (InvalidVersionSpecificationException e) { return false; } } @@ -36,11 +32,11 @@ public abstract class IntegrationModule return false; } - protected String versionPattern () { + protected String versionPattern() { return null; } - public abstract void init () throws Throwable; + public abstract void init() throws Throwable; - public abstract void postInit (); + public abstract void postInit(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java index 045fff4..1c255e5 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java @@ -3,13 +3,11 @@ package com.jaquadro.minecraft.storagedrawers.integration; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; -import org.apache.logging.log4j.Level; - import java.util.ArrayList; import java.util.List; +import org.apache.logging.log4j.Level; -public class IntegrationRegistry -{ +public class IntegrationRegistry { private static IntegrationRegistry instance; private List registry; @@ -18,43 +16,37 @@ public class IntegrationRegistry IntegrationRegistry reg = instance(); if (Loader.isModLoaded("appliedenergistics2") && StorageDrawers.config.cache.enableAE2Integration) reg.add(new AppliedEnergistics()); - if (Loader.isModLoaded("Waila") && StorageDrawers.config.cache.enableWailaIntegration) - reg.add(new Waila()); + if (Loader.isModLoaded("Waila") && StorageDrawers.config.cache.enableWailaIntegration) reg.add(new Waila()); if (Loader.isModLoaded("Thaumcraft") && StorageDrawers.config.cache.enableThaumcraftIntegration) reg.add(new Thaumcraft()); if (Loader.isModLoaded("MineTweaker3") && StorageDrawers.config.cache.enableMineTweakerIntegration) reg.add(new MineTweaker()); if (Loader.isModLoaded("RefinedRelocation") && StorageDrawers.config.cache.enableRefinedRelocationIntegration) reg.add(new RefinedRelocation()); - if (Loader.isModLoaded("NotEnoughItems")) - reg.add(new NotEnoughItems()); + if (Loader.isModLoaded("NotEnoughItems")) reg.add(new NotEnoughItems()); if (Loader.isModLoaded("ThermalExpansion") && StorageDrawers.config.cache.enableThermalExpansionIntegration) reg.add(new ThermalExpansion()); if (Loader.isModLoaded("ThermalFoundation") && StorageDrawers.config.cache.enableThermalFoundationIntegration) reg.add(new ThermalFoundation()); - if (ChiselIntegrationModule.isEnabled()) - reg.add(new ChiselIntegrationModule()); - if (GTNHIntegrationModule.isEnabled()) - reg.add(new GTNHIntegrationModule()); + if (ChiselIntegrationModule.isEnabled()) reg.add(new ChiselIntegrationModule()); + if (GTNHIntegrationModule.isEnabled()) reg.add(new GTNHIntegrationModule()); } - private IntegrationRegistry () { + private IntegrationRegistry() { registry = new ArrayList(); } - public static IntegrationRegistry instance () { - if (instance == null) - instance = new IntegrationRegistry(); + public static IntegrationRegistry instance() { + if (instance == null) instance = new IntegrationRegistry(); return instance; } - public void add (IntegrationModule module) { - if (module.versionCheck()) - registry.add(module); + public void add(IntegrationModule module) { + if (module.versionCheck()) registry.add(module); } - public void init () { + public void init() { for (int i = 0; i < registry.size(); i++) { IntegrationModule module = registry.get(i); if (module.getModID() != null && !Loader.isModLoaded(module.getModID())) { @@ -64,23 +56,24 @@ public class IntegrationRegistry try { module.init(); - } - catch (Throwable t) { + } catch (Throwable t) { registry.remove(i--); - FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "Could not load integration module: " + module.getClass().getName()); + FMLLog.log( + StorageDrawers.MOD_ID, + Level.INFO, + "Could not load integration module: " + + module.getClass().getName()); } } } - public void postInit () { - for (IntegrationModule module : registry) - module.postInit(); + public void postInit() { + for (IntegrationModule module : registry) module.postInit(); } - public boolean isModLoaded (String mod_id) { + public boolean isModLoaded(String mod_id) { for (IntegrationModule module : registry) { - if (module.getModID().equals(mod_id)) - return true; + if (module.getModID().equals(mod_id)) return true; } return false; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java index 4beaf1d..8e64703 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java @@ -5,22 +5,19 @@ import com.jaquadro.minecraft.storagedrawers.integration.minetweaker.OreDictiona import com.jaquadro.minecraft.storagedrawers.integration.minetweaker.OreDictionaryWhitelist; import minetweaker.MineTweakerAPI; -public class MineTweaker extends IntegrationModule -{ +public class MineTweaker extends IntegrationModule { @Override - public String getModID () { + public String getModID() { return "MineTweaker3"; } @Override - public void init () throws Throwable { + public void init() throws Throwable { MineTweakerAPI.registerClass(OreDictionaryBlacklist.class); MineTweakerAPI.registerClass(OreDictionaryWhitelist.class); MineTweakerAPI.registerClass(Compaction.class); } @Override - public void postInit () { - - } + public void postInit() {} } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/NotEnoughItems.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/NotEnoughItems.java index dde6b69..3cf8fa1 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/NotEnoughItems.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/NotEnoughItems.java @@ -1,12 +1,9 @@ package com.jaquadro.minecraft.storagedrawers.integration; -import cpw.mods.fml.common.Loader; +import java.lang.reflect.Field; import net.minecraft.client.renderer.entity.RenderItem; -import java.lang.reflect.Field; - -public class NotEnoughItems extends IntegrationModule -{ +public class NotEnoughItems extends IntegrationModule { private static final String MOD_ID = "NotEnoughItems"; boolean loaded; @@ -15,12 +12,12 @@ public class NotEnoughItems extends IntegrationModule static Field fdDrawItems; @Override - public String getModID () { + public String getModID() { return MOD_ID; } @Override - public void init () throws Throwable { + public void init() throws Throwable { clGuiContainerManager = Class.forName("codechicken.nei.guihook.GuiContainerManager"); fdDrawItems = clGuiContainerManager.getDeclaredField("drawItems"); @@ -28,18 +25,16 @@ public class NotEnoughItems extends IntegrationModule } @Override - public void postInit () { } + public void postInit() {} - public static RenderItem setItemRender (RenderItem itemRender) { - if (fdDrawItems == null) - return null; + public static RenderItem setItemRender(RenderItem itemRender) { + if (fdDrawItems == null) return null; try { RenderItem prev = (RenderItem) fdDrawItems.get(null); fdDrawItems.set(null, itemRender); return prev; - } - catch (IllegalAccessException e) { + } catch (IllegalAccessException e) { return null; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/RefinedRelocation.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/RefinedRelocation.java index 33c3bbf..553da55 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/RefinedRelocation.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/RefinedRelocation.java @@ -16,8 +16,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class RefinedRelocation extends IntegrationModule -{ +public class RefinedRelocation extends IntegrationModule { public static BlockSortingDrawers fullDrawers1; public static BlockSortingDrawers fullDrawers2; public static BlockSortingDrawers fullDrawers4; @@ -31,23 +30,23 @@ public class RefinedRelocation extends IntegrationModule public static final CreativeTabs tabStorageDrawers = new CreativeTabs("storageDrawersSorting") { @Override @SideOnly(Side.CLIENT) - public Item getTabIconItem () { + public Item getTabIconItem() { return getTabItem(); } }; @Override - public String getModID () { + public String getModID() { return "RefinedRelocation"; } @Override - protected String versionPattern () { + protected String versionPattern() { return "[1.0.8b,)"; } @Override - public void init () throws Throwable { + public void init() throws Throwable { fullDrawers1 = new BlockSortingDrawers("fullDrawers1", 1, false); fullDrawers2 = new BlockSortingDrawers("fullDrawers2", 2, false); fullDrawers4 = new BlockSortingDrawers("fullDrawers4", 4, false); @@ -80,11 +79,9 @@ public class RefinedRelocation extends IntegrationModule GameRegistry.registerBlock(halfDrawers4, ItemSortingDrawers.class, "halfDrawersSort4"); if (config.isBlockEnabled("compdrawers")) GameRegistry.registerBlock(compDrawers, ItemSortingCompDrawers.class, "compDrawersSort"); - if (config.isBlockEnabled("trim")) - GameRegistry.registerBlock(trim, ItemSortingTrim.class, "trimSort"); + if (config.isBlockEnabled("trim")) GameRegistry.registerBlock(trim, ItemSortingTrim.class, "trimSort"); - if (config.cache.enableSortingUpgrades) - GameRegistry.registerItem(upgradeSorting, "upgradeSorting"); + if (config.cache.enableSortingUpgrades) GameRegistry.registerItem(upgradeSorting, "upgradeSorting"); StorageDrawers.proxy.registerDrawer(fullDrawers1); StorageDrawers.proxy.registerDrawer(fullDrawers2); @@ -93,64 +90,123 @@ public class RefinedRelocation extends IntegrationModule StorageDrawers.proxy.registerDrawer(halfDrawers4); StorageDrawers.proxy.registerDrawer(compDrawers); - GameRegistry.registerTileEntityWithAlternatives(TileSortingDrawersStandard.class, ModBlocks.getQualifiedName("tileSortingDrawersStandard"), - ModBlocks.getQualifiedName(fullDrawers1), ModBlocks.getQualifiedName(fullDrawers2), ModBlocks.getQualifiedName(fullDrawers4), - ModBlocks.getQualifiedName(halfDrawers2), ModBlocks.getQualifiedName(halfDrawers4)); + GameRegistry.registerTileEntityWithAlternatives( + TileSortingDrawersStandard.class, + ModBlocks.getQualifiedName("tileSortingDrawersStandard"), + ModBlocks.getQualifiedName(fullDrawers1), + ModBlocks.getQualifiedName(fullDrawers2), + ModBlocks.getQualifiedName(fullDrawers4), + ModBlocks.getQualifiedName(halfDrawers2), + ModBlocks.getQualifiedName(halfDrawers4)); - GameRegistry.registerTileEntityWithAlternatives(TileSortingDrawersComp.class, ModBlocks.getQualifiedName("tileSortingDrawersComp"), - ModBlocks.getQualifiedName(compDrawers)); + GameRegistry.registerTileEntityWithAlternatives( + TileSortingDrawersComp.class, + ModBlocks.getQualifiedName("tileSortingDrawersComp"), + ModBlocks.getQualifiedName(compDrawers)); - GameRegistry.registerTileEntityWithAlternatives(TileSortingTrim.class, ModBlocks.getQualifiedName("tileSortingTrim"), ModBlocks.getQualifiedName(trim)); + GameRegistry.registerTileEntityWithAlternatives( + TileSortingTrim.class, ModBlocks.getQualifiedName("tileSortingTrim"), ModBlocks.getQualifiedName(trim)); } @Override - public void postInit () { + public void postInit() { ConfigManager config = StorageDrawers.config; for (int i = 0; i < BlockWood.field_150096_a.length; i++) { if (config.isBlockEnabled("fulldrawers1")) - GameRegistry.addRecipe(new ItemStack(fullDrawers1, 1, i), "x x", " y ", "x x", - 'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers1, 1, i)); + GameRegistry.addRecipe( + new ItemStack(fullDrawers1, 1, i), + "x x", + " y ", + "x x", + 'x', + Items.gold_nugget, + 'y', + new ItemStack(ModBlocks.fullDrawers1, 1, i)); if (config.isBlockEnabled("fulldrawers2")) - GameRegistry.addRecipe(new ItemStack(fullDrawers2, 1, i), "x x", " y ", "x x", - 'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers2, 1, i)); + GameRegistry.addRecipe( + new ItemStack(fullDrawers2, 1, i), + "x x", + " y ", + "x x", + 'x', + Items.gold_nugget, + 'y', + new ItemStack(ModBlocks.fullDrawers2, 1, i)); if (config.isBlockEnabled("halfdrawers2")) - GameRegistry.addRecipe(new ItemStack(halfDrawers2, 1, i), "x x", " y ", "x x", - 'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.halfDrawers2, 1, i)); + GameRegistry.addRecipe( + new ItemStack(halfDrawers2, 1, i), + "x x", + " y ", + "x x", + 'x', + Items.gold_nugget, + 'y', + new ItemStack(ModBlocks.halfDrawers2, 1, i)); if (config.isBlockEnabled("fulldrawers4")) - GameRegistry.addRecipe(new ItemStack(fullDrawers4, 1, i), "x x", " y ", "x x", - 'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers4, 1, i)); + GameRegistry.addRecipe( + new ItemStack(fullDrawers4, 1, i), + "x x", + " y ", + "x x", + 'x', + Items.gold_nugget, + 'y', + new ItemStack(ModBlocks.fullDrawers4, 1, i)); if (config.isBlockEnabled("halfdrawers4")) - GameRegistry.addRecipe(new ItemStack(halfDrawers4, 1, i), "x x", " y ", "x x", - 'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.halfDrawers4, 1, i)); + GameRegistry.addRecipe( + new ItemStack(halfDrawers4, 1, i), + "x x", + " y ", + "x x", + 'x', + Items.gold_nugget, + 'y', + new ItemStack(ModBlocks.halfDrawers4, 1, i)); if (config.isBlockEnabled("trim")) - GameRegistry.addRecipe(new ItemStack(trim, 1, i), "x x", " y ", "x x", 'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.trim, 1, i)); + GameRegistry.addRecipe( + new ItemStack(trim, 1, i), + "x x", + " y ", + "x x", + 'x', + Items.gold_nugget, + 'y', + new ItemStack(ModBlocks.trim, 1, i)); } if (config.isBlockEnabled("compdrawers")) - GameRegistry.addRecipe(new ItemStack(compDrawers, 1), "x x", " y ", "x x", - 'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.compDrawers, 1)); + GameRegistry.addRecipe( + new ItemStack(compDrawers, 1), + "x x", + " y ", + "x x", + 'x', + Items.gold_nugget, + 'y', + new ItemStack(ModBlocks.compDrawers, 1)); if (config.cache.enableSortingUpgrades) - GameRegistry.addRecipe(new ItemStack(upgradeSorting), "y y", " z ", "y y", - 'y', Items.gold_nugget, 'z', ModItems.upgradeTemplate); + GameRegistry.addRecipe( + new ItemStack(upgradeSorting), + "y y", + " z ", + "y y", + 'y', + Items.gold_nugget, + 'z', + ModItems.upgradeTemplate); } - private static Item getTabItem () { + private static Item getTabItem() { ConfigManager config = StorageDrawers.config; - if (config.isBlockEnabled("fulldrawers2") && fullDrawers1 != null) - return Item.getItemFromBlock(fullDrawers2); - if (config.isBlockEnabled("fulldrawers4") && fullDrawers2 != null) - return Item.getItemFromBlock(fullDrawers4); - if (config.isBlockEnabled("fulldrawers1") && fullDrawers4 != null) - return Item.getItemFromBlock(fullDrawers1); - if (config.isBlockEnabled("halfdrawers2") && halfDrawers2 != null) - return Item.getItemFromBlock(halfDrawers2); - if (config.isBlockEnabled("halfdrawers4") && halfDrawers4 != null) - return Item.getItemFromBlock(halfDrawers4); - if (config.isBlockEnabled("trim") && trim != null) - return Item.getItemFromBlock(trim); + if (config.isBlockEnabled("fulldrawers2") && fullDrawers1 != null) return Item.getItemFromBlock(fullDrawers2); + if (config.isBlockEnabled("fulldrawers4") && fullDrawers2 != null) return Item.getItemFromBlock(fullDrawers4); + if (config.isBlockEnabled("fulldrawers1") && fullDrawers4 != null) return Item.getItemFromBlock(fullDrawers1); + if (config.isBlockEnabled("halfdrawers2") && halfDrawers2 != null) return Item.getItemFromBlock(halfDrawers2); + if (config.isBlockEnabled("halfdrawers4") && halfDrawers4 != null) return Item.getItemFromBlock(halfDrawers4); + if (config.isBlockEnabled("trim") && trim != null) return Item.getItemFromBlock(trim); return Item.getItemFromBlock(Blocks.chest); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java index 7d8c2a2..5f0829c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java @@ -26,17 +26,16 @@ import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -public class Thaumcraft extends IntegrationModule -{ +public class Thaumcraft extends IntegrationModule { private Item[] aspectItems; @Override - public String getModID () { + public String getModID() { return "Thaumcraft"; } @Override - public void init () throws Throwable { + public void init() throws Throwable { MinecraftForge.EVENT_BUS.register(this); aspectItems = new Item[] { @@ -53,12 +52,10 @@ public class Thaumcraft extends IntegrationModule } @Override - public void postInit () { - - } + public void postInit() {} @SubscribeEvent - public void onDrawerPopulated (DrawerPopulatedEvent event) { + public void onDrawerPopulated(DrawerPopulatedEvent event) { IDrawer drawer = event.drawer; if (drawer.isEmpty()) { drawer.setExtendedData("aspect", null); @@ -74,28 +71,25 @@ public class Thaumcraft extends IntegrationModule } } - private void setDrawerAspect (IDrawer drawer, ItemStack itemStack) { + private void setDrawerAspect(IDrawer drawer, ItemStack itemStack) { NBTTagCompound tag = itemStack.getTagCompound(); - if (tag == null) - return; - + if (tag == null) return; + if (tag.hasKey("AspectFilter")) { - setDrawerAspectName(drawer, tag.getString("AspectFilter")); - return; - } - - NBTTagList tagAspects = tag.getTagList("Aspects", Constants.NBT.TAG_COMPOUND); - if (tagAspects == null || tagAspects.tagCount() == 0) + setDrawerAspectName(drawer, tag.getString("AspectFilter")); return; + } + + NBTTagList tagAspects = tag.getTagList("Aspects", Constants.NBT.TAG_COMPOUND); + if (tagAspects == null || tagAspects.tagCount() == 0) return; NBTTagCompound tagAspect = tagAspects.getCompoundTagAt(0); - if (tagAspect == null || !tagAspect.hasKey("key")) - return; + if (tagAspect == null || !tagAspect.hasKey("key")) return; setDrawerAspectName(drawer, tagAspect.getString("key")); } - - private void setDrawerAspectName (IDrawer drawer, String aspectName) { + + private void setDrawerAspectName(IDrawer drawer, String aspectName) { AspectList allAspects = ThaumcraftApiHelper.getAllAspects(1); for (Aspect a : allAspects.aspects.keySet()) { if (a.getTag().equals(aspectName)) { @@ -108,12 +102,11 @@ public class Thaumcraft extends IntegrationModule private class WailaTooltipHandler implements IWailaTooltipHandler { @Override - public String transformItemName (IDrawer drawer, String defaultName) { + public String transformItemName(IDrawer drawer, String defaultName) { Object aspectObj = drawer.getExtendedData("aspect"); - if (!(aspectObj instanceof Aspect)) - return defaultName; + if (!(aspectObj instanceof Aspect)) return defaultName; - Aspect aspect = (Aspect)aspectObj; + Aspect aspect = (Aspect) aspectObj; EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; if (!ThaumcraftApiHelper.hasDiscoveredAspect(player.getDisplayName(), aspect)) @@ -126,25 +119,23 @@ public class Thaumcraft extends IntegrationModule private class LabelRenderHandler implements IRenderLabel { @Override - public void render (TileEntity tileEntity, IDrawerGroup drawerGroup, int slot, float brightness, float partialTickTime) { + public void render( + TileEntity tileEntity, IDrawerGroup drawerGroup, int slot, float brightness, float partialTickTime) { IDrawer drawer = drawerGroup.getDrawer(slot); - if (drawer == null) - return; + if (drawer == null) return; Object aspectObj = drawer.getExtendedData("aspect"); - if (!(aspectObj instanceof Aspect)) - return; + if (!(aspectObj instanceof Aspect)) return; EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - Vec3 blockPos = Vec3.createVectorHelper(tileEntity.xCoord + .5, tileEntity.yCoord + .5, tileEntity.zCoord + .5); + Vec3 blockPos = + Vec3.createVectorHelper(tileEntity.xCoord + .5, tileEntity.yCoord + .5, tileEntity.zCoord + .5); double distance = blockPos.distanceTo(player.getPosition(partialTickTime)); - if (distance > 10) - return; + if (distance > 10) return; - Aspect aspect = (Aspect)aspectObj; - if (!ThaumcraftApiHelper.hasDiscoveredAspect(player.getDisplayName(), aspect)) - return; + Aspect aspect = (Aspect) aspectObj; + if (!ThaumcraftApiHelper.hasDiscoveredAspect(player.getDisplayName(), aspect)) return; int x = -4; int y = -4; @@ -159,13 +150,12 @@ public class Thaumcraft extends IntegrationModule } float alpha = 1; - if (distance > 3) - alpha = 1f - (float)((distance - 3) / 7); + if (distance > 3) alpha = 1f - (float) ((distance - 3) / 7); int color = aspect.getColor(); - float r = (float)(color >> 16 & 255) / 255.0F; - float g = (float)(color >> 8 & 255) / 255.0F; - float b = (float)(color & 255) / 255.0F; + float r = (float) (color >> 16 & 255) / 255.0F; + float g = (float) (color >> 8 & 255) / 255.0F; + float b = (float) (color & 255) / 255.0F; GL11.glColor4f(r * brightness, g * brightness, b * brightness, alpha); OpenGlHelper.glBlendFunc(770, 771, 1, 0); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalExpansion.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalExpansion.java index 3bc8c78..3b43a07 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalExpansion.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalExpansion.java @@ -7,6 +7,7 @@ import com.jaquadro.minecraft.storagedrawers.core.ModBlocks; import com.jaquadro.minecraft.storagedrawers.core.ModItems; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameData; +import java.lang.reflect.Method; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -14,10 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import org.apache.logging.log4j.Level; -import java.lang.reflect.Method; - -public class ThermalExpansion extends IntegrationModule -{ +public class ThermalExpansion extends IntegrationModule { private static final String MOD_ID = "ThermalExpansion"; static Class clSawmillManager; @@ -30,78 +28,197 @@ public class ThermalExpansion extends IntegrationModule static boolean initialized; @Override - public String getModID () { + public String getModID() { return MOD_ID; } @Override - public void init () throws Throwable { + public void init() throws Throwable { clSawmillManager = Class.forName("cofh.thermalexpansion.util.crafting.SawmillManager"); clPulverizerManager = Class.forName("cofh.thermalexpansion.util.crafting.PulverizerManager"); - mtSawmillAddRecipe = clSawmillManager.getMethod("addRecipe", int.class, ItemStack.class, ItemStack.class, ItemStack.class, int.class); - mtPulverizerAddRecipe = clSawmillManager.getMethod("addRecipe", int.class, ItemStack.class, ItemStack.class, ItemStack.class, int.class); + mtSawmillAddRecipe = clSawmillManager.getMethod( + "addRecipe", int.class, ItemStack.class, ItemStack.class, ItemStack.class, int.class); + mtPulverizerAddRecipe = clSawmillManager.getMethod( + "addRecipe", int.class, ItemStack.class, ItemStack.class, ItemStack.class, int.class); Item itemMaterial = GameData.getItemRegistry().getObject(MOD_ID + ":material"); itemSawdust = new ItemStack(itemMaterial, 1, 512); for (int i = 0; i < 6; i++) { if (ModBlocks.fullDrawers1 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(ModBlocks.fullDrawers1, 1, i), new ItemStack(Blocks.planks, 6, i), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(ModBlocks.fullDrawers1, 1, i), + new ItemStack(Blocks.planks, 6, i), + new ItemStack(Blocks.planks, 8, 0), + 100); if (ModBlocks.fullDrawers2 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(ModBlocks.fullDrawers2, 1, i), new ItemStack(Blocks.planks, 7, i), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(ModBlocks.fullDrawers2, 1, i), + new ItemStack(Blocks.planks, 7, i), + new ItemStack(Blocks.planks, 8, 0), + 100); if (ModBlocks.fullDrawers4 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(ModBlocks.fullDrawers4, 1, i), new ItemStack(Blocks.planks, 5, i), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(ModBlocks.fullDrawers4, 1, i), + new ItemStack(Blocks.planks, 5, i), + new ItemStack(Blocks.planks, 8, 0), + 100); if (ModBlocks.halfDrawers2 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(ModBlocks.halfDrawers2, 1, i), new ItemStack(Blocks.planks, 3, i), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(ModBlocks.halfDrawers2, 1, i), + new ItemStack(Blocks.planks, 3, i), + new ItemStack(Blocks.planks, 8, 0), + 100); if (ModBlocks.halfDrawers4 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(ModBlocks.halfDrawers4, 1, i), new ItemStack(Blocks.planks, 2, i), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(ModBlocks.halfDrawers4, 1, i), + new ItemStack(Blocks.planks, 2, i), + new ItemStack(Blocks.planks, 8, 0), + 100); if (ModBlocks.trim != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(ModBlocks.trim, 1, i), new ItemStack(Blocks.planks, 5, i), itemSawdust, 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(ModBlocks.trim, 1, i), + new ItemStack(Blocks.planks, 5, i), + itemSawdust, + 100); if (RefinedRelocation.fullDrawers1 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(RefinedRelocation.fullDrawers1, 1, i), new ItemStack(Blocks.planks, 6, i), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(RefinedRelocation.fullDrawers1, 1, i), + new ItemStack(Blocks.planks, 6, i), + new ItemStack(Blocks.planks, 8, 0), + 100); if (RefinedRelocation.fullDrawers2 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(RefinedRelocation.fullDrawers2, 1, i), new ItemStack(Blocks.planks, 7, i), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(RefinedRelocation.fullDrawers2, 1, i), + new ItemStack(Blocks.planks, 7, i), + new ItemStack(Blocks.planks, 8, 0), + 100); if (RefinedRelocation.fullDrawers4 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(RefinedRelocation.fullDrawers4, 1, i), new ItemStack(Blocks.planks, 5, i), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(RefinedRelocation.fullDrawers4, 1, i), + new ItemStack(Blocks.planks, 5, i), + new ItemStack(Blocks.planks, 8, 0), + 100); if (RefinedRelocation.halfDrawers2 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(RefinedRelocation.halfDrawers2, 1, i), new ItemStack(Blocks.planks, 3, i), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(RefinedRelocation.halfDrawers2, 1, i), + new ItemStack(Blocks.planks, 3, i), + new ItemStack(Blocks.planks, 8, 0), + 100); if (RefinedRelocation.halfDrawers4 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(RefinedRelocation.halfDrawers4, 1, i), new ItemStack(Blocks.planks, 2, i), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(RefinedRelocation.halfDrawers4, 1, i), + new ItemStack(Blocks.planks, 2, i), + new ItemStack(Blocks.planks, 8, 0), + 100); if (RefinedRelocation.trim != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(RefinedRelocation.trim, 1, i), new ItemStack(Blocks.planks, 5, i), itemSawdust, 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(RefinedRelocation.trim, 1, i), + new ItemStack(Blocks.planks, 5, i), + itemSawdust, + 100); } itemMaterial = GameData.getItemRegistry().getObject("ThermalFoundation:material"); if (StorageDrawers.config.cache.enableStorageUpgrades) { - mtPulverizerAddRecipe.invoke(null, 2400, new ItemStack(ModItems.upgrade, 1, 2), new ItemStack(itemMaterial, 2, 0), itemSawdust, 100); - mtPulverizerAddRecipe.invoke(null, 2400, new ItemStack(ModItems.upgrade, 1, 3), new ItemStack(itemMaterial, 2, 1), itemSawdust, 100); - mtPulverizerAddRecipe.invoke(null, 2400, new ItemStack(ModItems.upgrade, 1, 4), new ItemStack(itemMaterial, 2, 4), itemSawdust, 100); - mtPulverizerAddRecipe.invoke(null, 2400, new ItemStack(ModItems.upgrade, 1, 5), new ItemStack(Items.diamond, 2), itemSawdust, 100); - mtPulverizerAddRecipe.invoke(null, 2400, new ItemStack(ModItems.upgrade, 1, 6), new ItemStack(Items.emerald, 2), itemSawdust, 100); + mtPulverizerAddRecipe.invoke( + null, + 2400, + new ItemStack(ModItems.upgrade, 1, 2), + new ItemStack(itemMaterial, 2, 0), + itemSawdust, + 100); + mtPulverizerAddRecipe.invoke( + null, + 2400, + new ItemStack(ModItems.upgrade, 1, 3), + new ItemStack(itemMaterial, 2, 1), + itemSawdust, + 100); + mtPulverizerAddRecipe.invoke( + null, + 2400, + new ItemStack(ModItems.upgrade, 1, 4), + new ItemStack(itemMaterial, 2, 4), + itemSawdust, + 100); + mtPulverizerAddRecipe.invoke( + null, + 2400, + new ItemStack(ModItems.upgrade, 1, 5), + new ItemStack(Items.diamond, 2), + itemSawdust, + 100); + mtPulverizerAddRecipe.invoke( + null, + 2400, + new ItemStack(ModItems.upgrade, 1, 6), + new ItemStack(Items.emerald, 2), + itemSawdust, + 100); } if (StorageDrawers.config.cache.enableIndicatorUpgrades) { - mtPulverizerAddRecipe.invoke(null, 2400, new ItemStack(ModItems.upgradeStatus, 1, 1), new ItemStack(Items.redstone, 2), itemSawdust, 100); - mtPulverizerAddRecipe.invoke(null, 2400, new ItemStack(ModItems.upgradeStatus, 1, 2), new ItemStack(Items.quartz, 2), itemSawdust, 100); + mtPulverizerAddRecipe.invoke( + null, + 2400, + new ItemStack(ModItems.upgradeStatus, 1, 1), + new ItemStack(Items.redstone, 2), + itemSawdust, + 100); + mtPulverizerAddRecipe.invoke( + null, + 2400, + new ItemStack(ModItems.upgradeStatus, 1, 2), + new ItemStack(Items.quartz, 2), + itemSawdust, + 100); } if (StorageDrawers.config.cache.enableVoidUpgrades) - mtPulverizerAddRecipe.invoke(null, 2400, new ItemStack(ModItems.upgradeVoid, 1, 1), new ItemStack(itemMaterial, 2, 4), itemSawdust, 100); + mtPulverizerAddRecipe.invoke( + null, + 2400, + new ItemStack(ModItems.upgradeVoid, 1, 1), + new ItemStack(itemMaterial, 2, 4), + itemSawdust, + 100); initialized = true; } @Override - public void postInit () { + public void postInit() {} - } - - public static void registerPackBlock (IExtendedDataResolver resolver) { - if (!initialized || resolver == null) - return; + public static void registerPackBlock(IExtendedDataResolver resolver) { + if (!initialized || resolver == null) return; Item itemMaterial = GameData.getItemRegistry().getObject(MOD_ID + ":material"); itemSawdust = new ItemStack(itemMaterial, 1, 512); @@ -122,30 +239,77 @@ public class ThermalExpansion extends IntegrationModule Block sortingTrim = resolver.getBlock(BlockConfiguration.TrimSorting); for (int i = 0; i < 16; i++) { - if (!resolver.isValidMetaValue(i)) - continue; + if (!resolver.isValidMetaValue(i)) continue; Block plank = resolver.getPlankBlock(i); int plankMeta = resolver.getPlankMeta(i); if (plank != null) { if (basicFull1 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(basicFull1, 1, i), new ItemStack(plank, 6, plankMeta), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(basicFull1, 1, i), + new ItemStack(plank, 6, plankMeta), + new ItemStack(Blocks.planks, 8, 0), + 100); if (basicFull2 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(basicFull2, 1, i), new ItemStack(plank, 7, plankMeta), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(basicFull2, 1, i), + new ItemStack(plank, 7, plankMeta), + new ItemStack(Blocks.planks, 8, 0), + 100); if (basicFull4 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(basicFull4, 1, i), new ItemStack(plank, 5, plankMeta), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(basicFull4, 1, i), + new ItemStack(plank, 5, plankMeta), + new ItemStack(Blocks.planks, 8, 0), + 100); if (basicTrim != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(basicTrim, 1, i), new ItemStack(plank, 5, plankMeta), itemSawdust, 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(basicTrim, 1, i), + new ItemStack(plank, 5, plankMeta), + itemSawdust, + 100); if (sortingFull1 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(sortingFull1, 1, i), new ItemStack(plank, 6, plankMeta), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(sortingFull1, 1, i), + new ItemStack(plank, 6, plankMeta), + new ItemStack(Blocks.planks, 8, 0), + 100); if (sortingFull2 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(sortingFull2, 1, i), new ItemStack(plank, 7, plankMeta), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(sortingFull2, 1, i), + new ItemStack(plank, 7, plankMeta), + new ItemStack(Blocks.planks, 8, 0), + 100); if (sortingFull4 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(sortingFull4, 1, i), new ItemStack(plank, 5, plankMeta), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(sortingFull4, 1, i), + new ItemStack(plank, 5, plankMeta), + new ItemStack(Blocks.planks, 8, 0), + 100); if (sortingTrim != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(sortingTrim, 1, i), new ItemStack(plank, 5, plankMeta), itemSawdust, 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(sortingTrim, 1, i), + new ItemStack(plank, 5, plankMeta), + itemSawdust, + 100); } Block slab = resolver.getSlabBlock(i); @@ -153,19 +317,46 @@ public class ThermalExpansion extends IntegrationModule if (slab != null) { if (basicHalf2 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(basicHalf2, 1, i), new ItemStack(slab, 7, slabMeta), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(basicHalf2, 1, i), + new ItemStack(slab, 7, slabMeta), + new ItemStack(Blocks.planks, 8, 0), + 100); if (basicHalf4 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(basicHalf4, 1, i), new ItemStack(slab, 5, slabMeta), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(basicHalf4, 1, i), + new ItemStack(slab, 5, slabMeta), + new ItemStack(Blocks.planks, 8, 0), + 100); if (sortingHalf2 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(sortingHalf2, 1, i), new ItemStack(slab, 7, slabMeta), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(sortingHalf2, 1, i), + new ItemStack(slab, 7, slabMeta), + new ItemStack(Blocks.planks, 8, 0), + 100); if (sortingHalf4 != null) - mtSawmillAddRecipe.invoke(null, 2400, new ItemStack(sortingHalf4, 1, i), new ItemStack(slab, 5, slabMeta), new ItemStack(Blocks.planks, 8, 0), 100); + mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(sortingHalf4, 1, i), + new ItemStack(slab, 5, slabMeta), + new ItemStack(Blocks.planks, 8, 0), + 100); } } - } - catch (Throwable t) { - FMLLog.log(StorageDrawers.MOD_ID, Level.WARN, t, "Error registering pack block in module: " + ThermalExpansion.class.getName()); + } catch (Throwable t) { + FMLLog.log( + StorageDrawers.MOD_ID, + Level.WARN, + t, + "Error registering pack block in module: " + ThermalExpansion.class.getName()); } } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalFoundation.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalFoundation.java index 5ddc957..954cef7 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalFoundation.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalFoundation.java @@ -5,50 +5,53 @@ import com.jaquadro.minecraft.storagedrawers.core.ModItems; import com.jaquadro.minecraft.storagedrawers.integration.thermalfoundation.CoFHSecurityProvider; import com.mojang.authlib.GameProfile; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.init.Items; +import java.lang.reflect.Method; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; -import java.lang.reflect.Method; - -public class ThermalFoundation extends IntegrationModule -{ +public class ThermalFoundation extends IntegrationModule { private Class classRegistrySocial; private Method methodPlayerHasAccess; @Override - public String getModID () { + public String getModID() { return "ThermalFoundation"; } @Override - public void init () throws Throwable { + public void init() throws Throwable { try { classRegistrySocial = Class.forName("cofh.core.RegistrySocial"); - } - catch (ClassNotFoundException e) { + } catch (ClassNotFoundException e) { classRegistrySocial = Class.forName("cofh.core.util.SocialRegistry"); } - methodPlayerHasAccess = classRegistrySocial.getDeclaredMethod("playerHasAccess", String.class, GameProfile.class); + methodPlayerHasAccess = + classRegistrySocial.getDeclaredMethod("playerHasAccess", String.class, GameProfile.class); } @Override - public void postInit () { + public void postInit() { StorageDrawers.securityRegistry.registerProvider(new CoFHSecurityProvider(this)); if (StorageDrawers.config.cache.enablePersonalUpgrades) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.personalKey, 1, 1), "xxx", "xyx", "xxx", - 'x', "nuggetSignalum", 'y', ModItems.personalKey)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.personalKey, 1, 1), + "xxx", + "xyx", + "xxx", + 'x', + "nuggetSignalum", + 'y', + ModItems.personalKey)); } } - public boolean playerHasAccess (String playerName, GameProfile owner) { + public boolean playerHasAccess(String playerName, GameProfile owner) { try { return (Boolean) methodPlayerHasAccess.invoke(null, playerName, owner); - } - catch (Throwable t) { + } catch (Throwable t) { return false; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Waila.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Waila.java index f1782ba..0755b28 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Waila.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Waila.java @@ -3,13 +3,13 @@ package com.jaquadro.minecraft.storagedrawers.integration; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaTooltipHandler; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import com.jaquadro.minecraft.storagedrawers.api.storage.IFractionalDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.security.SecurityManager; import cpw.mods.fml.common.event.FMLInterModComms; +import java.util.List; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; @@ -22,51 +22,49 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import java.util.List; - /** * @author dmillerw * @author jaquadro */ -public class Waila extends IntegrationModule -{ +public class Waila extends IntegrationModule { @Override - public String getModID () { + public String getModID() { return "Waila"; } @Override - public void init () throws Throwable { - FMLInterModComms.sendMessage("Waila", "register", StorageDrawers.SOURCE_PATH + "integration.Waila.registerProvider"); + public void init() throws Throwable { + FMLInterModComms.sendMessage( + "Waila", "register", StorageDrawers.SOURCE_PATH + "integration.Waila.registerProvider"); } @Override - public void postInit () { } + public void postInit() {} public static void registerProvider(IWailaRegistrar registrar) { registrar.registerBodyProvider(new WailaDrawer(), BlockDrawers.class); } - public static class WailaDrawer implements IWailaDataProvider - { + public static class WailaDrawer implements IWailaDataProvider { @Override - public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config) { + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { return null; } @Override - public List getWailaHead (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaHead( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; } @Override - public List getWailaBody (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaBody( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { TileEntityDrawers tile = (TileEntityDrawers) accessor.getTileEntity(); if (SecurityManager.hasAccess(Minecraft.getMinecraft().thePlayer.getGameProfile(), tile)) { for (int i = 0; i < tile.getDrawerCount(); i++) { - if (!tile.isDrawerEnabled(i)) - continue; + if (!tile.isDrawerEnabled(i)) continue; String name = StatCollector.translateToLocal("storageDrawers.waila.empty"); @@ -78,21 +76,21 @@ public class Waila extends IntegrationModule for (int j = 0, n = handlers.size(); j < n; j++) stackName = handlers.get(j).transformItemName(drawer, stackName); - if (drawer.getStoredItemCount() == Integer.MAX_VALUE) - name = stackName + " [\u221E]"; - else if (drawer instanceof IFractionalDrawer && ((IFractionalDrawer) drawer).getConversionRate() > 1) - name = stackName + ((i == 0) ? " [" : " [+") + ((IFractionalDrawer) drawer).getStoredItemRemainder() + "]"; + if (drawer.getStoredItemCount() == Integer.MAX_VALUE) name = stackName + " [\u221E]"; + else if (drawer instanceof IFractionalDrawer + && ((IFractionalDrawer) drawer).getConversionRate() > 1) + name = stackName + ((i == 0) ? " [" : " [+") + + ((IFractionalDrawer) drawer).getStoredItemRemainder() + "]"; else if (StorageDrawers.config.cache.stackRemainderWaila) { int stacks = drawer.getStoredItemCount() / drawer.getStoredItemStackSize(); int remainder = drawer.getStoredItemCount() - (stacks * drawer.getStoredItemStackSize()); if (stacks > 0 && remainder > 0) - name = stackName + " [" + stacks + "x" + drawer.getStoredItemStackSize() + " + " + remainder + "]"; + name = stackName + " [" + stacks + "x" + drawer.getStoredItemStackSize() + " + " + + remainder + "]"; else if (stacks > 0) name = stackName + " [" + stacks + "x" + drawer.getStoredItemStackSize() + "]"; - else - name = stackName + " [" + remainder + "]"; - } else - name = stackName + " [" + drawer.getStoredItemCount() + "]"; + else name = stackName + " [" + remainder + "]"; + } else name = stackName + " [" + drawer.getStoredItemCount() + "]"; } currenttip.add(StatCollector.translateToLocalFormatted("storageDrawers.waila.drawer", i + 1, name)); } @@ -101,33 +99,38 @@ public class Waila extends IntegrationModule currenttip.add(StatCollector.translateToLocalFormatted("storageDrawers.waila.nolimit")); else { int limit = tile.getDrawerCapacity() * tile.getEffectiveStorageMultiplier(); - currenttip.add(StatCollector.translateToLocalFormatted("storageDrawers.waila.limit", limit, tile.getEffectiveStorageMultiplier())); + currenttip.add(StatCollector.translateToLocalFormatted( + "storageDrawers.waila.limit", limit, tile.getEffectiveStorageMultiplier())); } } String attrib = ""; if (tile.isLocked(LockAttribute.LOCK_POPULATED)) - attrib += (attrib.isEmpty() ? "" : ", ") + StatCollector.translateToLocal("storageDrawers.waila.locked"); + attrib += + (attrib.isEmpty() ? "" : ", ") + StatCollector.translateToLocal("storageDrawers.waila.locked"); if (tile.isVoid()) attrib += (attrib.isEmpty() ? "" : ", ") + StatCollector.translateToLocal("storageDrawers.waila.void"); if (tile.isSorting()) - attrib += (attrib.isEmpty() ? "" : ", ") + StatCollector.translateToLocal("storageDrawers.waila.sorting"); + attrib += + (attrib.isEmpty() ? "" : ", ") + StatCollector.translateToLocal("storageDrawers.waila.sorting"); if (tile.getOwner() != null) - attrib += (attrib.isEmpty() ? "" : ", ") + StatCollector.translateToLocal("storageDrawers.waila.protected"); + attrib += (attrib.isEmpty() ? "" : ", ") + + StatCollector.translateToLocal("storageDrawers.waila.protected"); - if (!attrib.isEmpty()) - currenttip.add(attrib); + if (!attrib.isEmpty()) currenttip.add(attrib); return currenttip; } @Override - public List getWailaTail (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaTail( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; } @Override - public NBTTagCompound getNBTData (EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData( + EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { return null; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java index a58755a..65817f2 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java @@ -8,21 +8,20 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -public class DrawerExternalStorageHandler implements IExternalStorageHandler -{ +public class DrawerExternalStorageHandler implements IExternalStorageHandler { private IStorageBusMonitorFactory sbmFactory; - public DrawerExternalStorageHandler (IStorageBusMonitorFactory factory) { + public DrawerExternalStorageHandler(IStorageBusMonitorFactory factory) { sbmFactory = factory; } @Override - public boolean canHandle (TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource mySrc) { + public boolean canHandle(TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource mySrc) { return channel == StorageChannel.ITEMS && te instanceof IDrawerGroup; } @Override - public IMEInventory getInventory (TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource src) { + public IMEInventory getInventory(TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource src) { if (sbmFactory != null && channel == StorageChannel.ITEMS) return sbmFactory.createStorageBusMonitor(new DrawerMEInventory((IDrawerGroup) te), src); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java index af27f27..d655362 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java @@ -11,28 +11,24 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.*; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ILockable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; +import java.util.ArrayList; +import java.util.List; import net.minecraft.item.ItemStack; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -public class DrawerMEInventory implements IMEInventory -{ +public class DrawerMEInventory implements IMEInventory { final IDrawerGroup group; - public DrawerMEInventory (IDrawerGroup drawerGroup) { + public DrawerMEInventory(IDrawerGroup drawerGroup) { group = drawerGroup; } @Override - public IAEItemStack injectItems (IAEItemStack input, Actionable type, BaseActionSource src) { + public IAEItemStack injectItems(IAEItemStack input, Actionable type, BaseActionSource src) { long itemsLeft = input.getStackSize(); if (group instanceof ISmartGroup) { List clearSet = null; - if (type == Actionable.SIMULATE) - clearSet = new ArrayList(); + if (type == Actionable.SIMULATE) clearSet = new ArrayList(); try { for (int slot : ((ISmartGroup) group).enumerateDrawersForInsertion(input.getItemStack(), false)) { @@ -40,73 +36,59 @@ public class DrawerMEInventory implements IMEInventory ItemStack itemProto = drawer.getStoredItemPrototype(); if (itemProto == null) { drawer = drawer.setStoredItemRedir(input.getItemStack(), 0); - if (clearSet != null) - clearSet.add(drawer); + if (clearSet != null) clearSet.add(drawer); } if (drawer.canItemBeStored(input.getItemStack())) itemsLeft = injectItemsIntoDrawer(drawer, itemsLeft, type); - if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) - itemsLeft = 0; - if (itemsLeft == 0) - return null; + if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) itemsLeft = 0; + if (itemsLeft == 0) return null; } - } - finally { + } finally { if (clearSet != null) { - for (IDrawer drawer : clearSet) - drawer.setStoredItemRedir(null, 0); + for (IDrawer drawer : clearSet) drawer.setStoredItemRedir(null, 0); } } - } - else { + } else { int[] order = null; - if (group instanceof IPriorityGroup) - order = ((IPriorityGroup) group).getAccessibleDrawerSlots(); - + if (group instanceof IPriorityGroup) order = ((IPriorityGroup) group).getAccessibleDrawerSlots(); for (int i = 0, n = group.getDrawerCount(); i < n; i++) { int slot = (order != null) ? order[i] : i; - if (!group.isDrawerEnabled(slot)) - continue; + if (!group.isDrawerEnabled(slot)) continue; IDrawer drawer = group.getDrawer(slot); ItemStack itemProto = drawer.getStoredItemPrototype(); if (itemProto != null) { if (drawer.canItemBeStored(input.getItemStack())) { itemsLeft = injectItemsIntoDrawer(drawer, itemsLeft, type); - if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) - itemsLeft = 0; - if (itemsLeft == 0) - return null; + if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) itemsLeft = 0; + if (itemsLeft == 0) return null; } } } for (int i = 0, n = group.getDrawerCount(); i < n; i++) { int slot = (order != null) ? order[i] : i; - if (!group.isDrawerEnabled(slot)) - continue; + if (!group.isDrawerEnabled(slot)) continue; - if (group instanceof ILockable && ((ILockable) group).isLocked(LockAttribute.LOCK_EMPTY)) - continue; + if (group instanceof ILockable && ((ILockable) group).isLocked(LockAttribute.LOCK_EMPTY)) continue; IDrawer drawer = group.getDrawer(slot); ItemStack itemProto = drawer.getStoredItemPrototype(); - if (itemProto == null && drawer instanceof ILockable && ((ILockable) drawer).isLocked(LockAttribute.LOCK_EMPTY)) - continue; + if (itemProto == null + && drawer instanceof ILockable + && ((ILockable) drawer).isLocked(LockAttribute.LOCK_EMPTY)) continue; if (itemProto == null) { itemProto = input.getItemStack(); if (drawer.canItemBeStored(itemProto)) { drawer = drawer.setStoredItemRedir(itemProto, 0); itemsLeft = injectItemsIntoDrawer(drawer, itemsLeft, type); - if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) - itemsLeft = 0; - if (itemsLeft == 0) - return null; + if (drawer instanceof IVoidable && ((IVoidable) drawer).isVoid()) itemsLeft = 0; + if (itemsLeft == 0) return null; } } } @@ -121,73 +103,60 @@ public class DrawerMEInventory implements IMEInventory return input; } - private long injectItemsIntoDrawer (IDrawer drawer, long itemCount, Actionable type) { + private long injectItemsIntoDrawer(IDrawer drawer, long itemCount, Actionable type) { int capacity = drawer.getMaxCapacity(); int storedItems = drawer.getStoredItemCount(); int storableItems = capacity - storedItems; if (drawer instanceof IFractionalDrawer) { - IFractionalDrawer fracDrawer = (IFractionalDrawer)drawer; - if (!fracDrawer.isSmallestUnit() && fracDrawer.getStoredItemRemainder() > 0) - storableItems--; + IFractionalDrawer fracDrawer = (IFractionalDrawer) drawer; + if (!fracDrawer.isSmallestUnit() && fracDrawer.getStoredItemRemainder() > 0) storableItems--; } - if (storableItems == 0) - return itemCount; + if (storableItems == 0) return itemCount; long remainder = Math.max(itemCount - storableItems, 0); storedItems += Math.min(itemCount, storableItems); - if (type == Actionable.MODULATE) - drawer.setStoredItemCount(storedItems); + if (type == Actionable.MODULATE) drawer.setStoredItemCount(storedItems); return remainder; } @Override - public IAEItemStack extractItems (IAEItemStack request, Actionable mode, BaseActionSource src) { + public IAEItemStack extractItems(IAEItemStack request, Actionable mode, BaseActionSource src) { long itemsLeft = request.getStackSize(); if (group instanceof ISmartGroup) { for (int slot : ((ISmartGroup) group).enumerateDrawersForExtraction(request.getItemStack(), true)) { - if (itemsLeft == 0) - break; + if (itemsLeft == 0) break; IDrawer drawer = group.getDrawer(slot); int itemCount = drawer.getStoredItemCount(); if (itemsLeft > itemCount) { - if (mode == Actionable.MODULATE) - drawer.setStoredItemCount(0); + if (mode == Actionable.MODULATE) drawer.setStoredItemCount(0); itemsLeft -= itemCount; - } - else { - if (mode == Actionable.MODULATE) - drawer.setStoredItemCount(itemCount - (int)itemsLeft); + } else { + if (mode == Actionable.MODULATE) drawer.setStoredItemCount(itemCount - (int) itemsLeft); itemsLeft = 0; break; } } - } - else { + } else { int[] order = null; - if (group instanceof IPriorityGroup) - order = ((IPriorityGroup) group).getAccessibleDrawerSlots(); - + if (group instanceof IPriorityGroup) order = ((IPriorityGroup) group).getAccessibleDrawerSlots(); for (int i = 0, n = group.getDrawerCount(); i < n; i++) { int slot = (order != null) ? order[i] : i; - if (!group.isDrawerEnabled(slot)) - continue; + if (!group.isDrawerEnabled(slot)) continue; IDrawer drawer = group.getDrawer(slot); if (drawer.canItemBeExtracted(request.getItemStack())) { int itemCount = drawer.getStoredItemCount(); if (itemsLeft > itemCount) { - if (mode == Actionable.MODULATE) - drawer.setStoredItemCount(0); + if (mode == Actionable.MODULATE) drawer.setStoredItemCount(0); itemsLeft -= itemCount; } else { - if (mode == Actionable.MODULATE) - drawer.setStoredItemCount(itemCount - (int) itemsLeft); + if (mode == Actionable.MODULATE) drawer.setStoredItemCount(itemCount - (int) itemsLeft); itemsLeft = 0; break; } @@ -205,26 +174,23 @@ public class DrawerMEInventory implements IMEInventory } @Override - public IItemList getAvailableItems (IItemList out) { + public IItemList getAvailableItems(IItemList out) { int[] order = null; - if (group instanceof IPriorityGroup) - order = ((IPriorityGroup) group).getAccessibleDrawerSlots(); + if (group instanceof IPriorityGroup) order = ((IPriorityGroup) group).getAccessibleDrawerSlots(); for (int i = 0, n = group.getDrawerCount(); i < n; i++) { int slot = (order != null) ? order[i] : i; - if (!group.isDrawerEnabled(slot)) - continue; + if (!group.isDrawerEnabled(slot)) continue; IDrawer drawer = group.getDrawer(slot); - if (!drawer.isEmpty()) - out.add(AEApi.instance().storage().createItemStack(drawer.getStoredItemCopy())); + if (!drawer.isEmpty()) out.add(AEApi.instance().storage().createItemStack(drawer.getStoredItemCopy())); } return out; } @Override - public StorageChannel getChannel () { + public StorageChannel getChannel() { return StorageChannel.ITEMS; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/IStorageBusMonitorFactory.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/IStorageBusMonitorFactory.java index 19214fd..7e96b1e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/IStorageBusMonitorFactory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/IStorageBusMonitorFactory.java @@ -5,7 +5,6 @@ import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEMonitor; import appeng.api.storage.data.IAEItemStack; -public interface IStorageBusMonitorFactory -{ - public IMEMonitor createStorageBusMonitor (IMEInventory inventory, BaseActionSource src); +public interface IStorageBusMonitorFactory { + public IMEMonitor createStorageBusMonitor(IMEInventory inventory, BaseActionSource src); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/IngredientHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/IngredientHandler.java index 267416e..6049174 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/IngredientHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/IngredientHandler.java @@ -4,22 +4,18 @@ import appeng.api.recipes.IIngredient; import com.jaquadro.minecraft.storagedrawers.api.registry.IIngredientHandler; import net.minecraft.item.ItemStack; -public class IngredientHandler implements IIngredientHandler -{ +public class IngredientHandler implements IIngredientHandler { @Override - public ItemStack getItemStack (Object object) { - if (!(object instanceof IIngredient)) - return null; + public ItemStack getItemStack(Object object) { + if (!(object instanceof IIngredient)) return null; try { IIngredient ingredient = (IIngredient) object; ItemStack[] set = ingredient.getItemStackSet(); - if (set == null || set.length == 0) - return null; + if (set == null || set.length == 0) return null; return set[0]; - } - catch (Throwable t) { + } catch (Throwable t) { return null; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/ShapedRecipeHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/ShapedRecipeHandler.java index 791f278..5045e4c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/ShapedRecipeHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/ShapedRecipeHandler.java @@ -1,51 +1,46 @@ package com.jaquadro.minecraft.storagedrawers.integration.ae2; import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandler; -import net.minecraft.item.crafting.IRecipe; - import java.lang.reflect.Method; import java.util.List; +import net.minecraft.item.crafting.IRecipe; -public class ShapedRecipeHandler implements IRecipeHandler -{ +public class ShapedRecipeHandler implements IRecipeHandler { private Class classShapedRecipe; private Method methodGetInput; private boolean valid = true; - public ShapedRecipeHandler () { + public ShapedRecipeHandler() { try { classShapedRecipe = Class.forName("appeng.recipes.game.ShapedRecipe"); methodGetInput = classShapedRecipe.getMethod("getInput"); - if (!methodGetInput.getReturnType().isArray()) - valid = false; - } - catch (Throwable t) { + if (!methodGetInput.getReturnType().isArray()) valid = false; + } catch (Throwable t) { valid = false; } } - public Class getRecipeClass () { + public Class getRecipeClass() { return classShapedRecipe; } - public boolean isValid () { + public boolean isValid() { return valid; } @Override - public Object[] getInputAsArray (IRecipe recipe) { + public Object[] getInputAsArray(IRecipe recipe) { try { return (Object[]) methodGetInput.invoke(recipe); - } - catch (Throwable t) { + } catch (Throwable t) { return null; } } @Override - public List getInputAsList (IRecipe recipe) { + public List getInputAsList(IRecipe recipe) { return null; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/ShapelessRecipeHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/ShapelessRecipeHandler.java index 8270dda..2f8a19b 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/ShapelessRecipeHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/ShapelessRecipeHandler.java @@ -1,50 +1,45 @@ package com.jaquadro.minecraft.storagedrawers.integration.ae2; import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandler; -import net.minecraft.item.crafting.IRecipe; - import java.lang.reflect.Method; import java.util.List; +import net.minecraft.item.crafting.IRecipe; -public class ShapelessRecipeHandler implements IRecipeHandler -{ +public class ShapelessRecipeHandler implements IRecipeHandler { private Class classShapelessRecipe; private Method methodGetInput; private boolean valid = true; - public ShapelessRecipeHandler () { + public ShapelessRecipeHandler() { try { classShapelessRecipe = Class.forName("appeng.recipes.game.ShapelessRecipe"); methodGetInput = classShapelessRecipe.getMethod("getInput"); - if (!List.class.isAssignableFrom(methodGetInput.getReturnType())) - valid = false; - } - catch (Throwable t) { + if (!List.class.isAssignableFrom(methodGetInput.getReturnType())) valid = false; + } catch (Throwable t) { valid = false; } } - public Class getRecipeClass () { + public Class getRecipeClass() { return classShapelessRecipe; } - public boolean isValid () { + public boolean isValid() { return valid; } @Override - public Object[] getInputAsArray (IRecipe recipe) { + public Object[] getInputAsArray(IRecipe recipe) { return null; } @Override - public List getInputAsList (IRecipe recipe) { + public List getInputAsList(IRecipe recipe) { try { return (List) methodGetInput.invoke(recipe); - } - catch (Throwable t) { + } catch (Throwable t) { return null; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/gtnh/ModRecipes.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/gtnh/ModRecipes.java index bc5bd68..e48d8f8 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/gtnh/ModRecipes.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/gtnh/ModRecipes.java @@ -1,5 +1,9 @@ package com.jaquadro.minecraft.storagedrawers.integration.gtnh; +import static com.jaquadro.minecraft.storagedrawers.StorageDrawers.config; +import static gregtech.api.enums.GT_Values.NF; +import static gregtech.api.enums.GT_Values.RA; + import com.google.common.collect.ImmutableList; import com.jaquadro.minecraft.storagedrawers.core.ModBlocks; import com.jaquadro.minecraft.storagedrawers.core.ModItems; @@ -15,10 +19,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; -import static com.jaquadro.minecraft.storagedrawers.StorageDrawers.config; -import static gregtech.api.enums.GT_Values.NF; -import static gregtech.api.enums.GT_Values.RA; - public class ModRecipes { private static final String MOD_ID_CB = "CarpentersBlocks"; @@ -53,7 +53,8 @@ public class ModRecipes { private static final String ORE_stoneConcrete = "stoneConcrete"; private static final String NAME_blockCarpentersBlock = "blockCarpentersBlock"; - // Lists of Wildcard Meta slabWood ItemStacks suitable to optimize the number of Gregtech Assembler recipes registered + // Lists of Wildcard Meta slabWood ItemStacks suitable to optimize the number of Gregtech Assembler recipes + // registered private static final ImmutableList slabWood8WList; private static final ImmutableList slabWood7WList; private static final ImmutableList slabWood5WList; @@ -71,20 +72,27 @@ public class ModRecipes { private static final ItemStack integratedCircuit14 = GT_Utility.getIntegratedCircuit(14); // Ingredients for Framed Drawers recipes - private static final ItemStack carpentersBlock8 = GameRegistry.findItemStack(MOD_ID_CB, NAME_blockCarpentersBlock, 8); - private static final ItemStack carpentersBlock7 = GameRegistry.findItemStack(MOD_ID_CB, NAME_blockCarpentersBlock, 7); - private static final ItemStack carpentersBlock5 = GameRegistry.findItemStack(MOD_ID_CB, NAME_blockCarpentersBlock, 5); - private static final ItemStack carpentersBlock4 = GameRegistry.findItemStack(MOD_ID_CB, NAME_blockCarpentersBlock, 4); - private static final ItemStack carpentersBlock1 = GameRegistry.findItemStack(MOD_ID_CB, NAME_blockCarpentersBlock, 1); + private static final ItemStack carpentersBlock8 = + GameRegistry.findItemStack(MOD_ID_CB, NAME_blockCarpentersBlock, 8); + private static final ItemStack carpentersBlock7 = + GameRegistry.findItemStack(MOD_ID_CB, NAME_blockCarpentersBlock, 7); + private static final ItemStack carpentersBlock5 = + GameRegistry.findItemStack(MOD_ID_CB, NAME_blockCarpentersBlock, 5); + private static final ItemStack carpentersBlock4 = + GameRegistry.findItemStack(MOD_ID_CB, NAME_blockCarpentersBlock, 4); + private static final ItemStack carpentersBlock1 = + GameRegistry.findItemStack(MOD_ID_CB, NAME_blockCarpentersBlock, 1); // Ingredients for Trims private static final ItemStack stick4 = new ItemStack(Items.stick, 4); // Ingredients for Controller - private static final ItemStack comparatorGate = makeItemStack("ProjRed|Integration:projectred.integration.gate", 26, 1, null); + private static final ItemStack comparatorGate = + makeItemStack("ProjRed|Integration:projectred.integration.gate", 26, 1, null); // Ingredients for Upgrades recipes - private static final ItemStack redAlloyWire = makeItemStack("ProjRed|Transmission:projectred.transmission.wire", 0, 1, null); + private static final ItemStack redAlloyWire = + makeItemStack("ProjRed|Transmission:projectred.transmission.wire", 0, 1, null); private static final ItemStack upgradeLock = new ItemStack(ModItems.upgradeLock); private static final ItemStack piston = new ItemStack(Blocks.piston, 1); private static final ItemStack upgradeTemplate = new ItemStack(ModItems.upgradeTemplate); @@ -99,10 +107,12 @@ public class ModRecipes { // Build a list of unique slabWood Items's Registry Names ("MOD_ID:ItemName") for (ItemStack slabWood : OreDictionary.getOres(ORE_slabWood)) { - slabWoodRegistryNameListBuilder.add(GameRegistry.findUniqueIdentifierFor(slabWood.getItem()).toString()); + slabWoodRegistryNameListBuilder.add( + GameRegistry.findUniqueIdentifierFor(slabWood.getItem()).toString()); } - // Build lists of unique slabWood ItemStacks of different size with Wildcard Meta from the RegistryNames list above + // Build lists of unique slabWood ItemStacks of different size with Wildcard Meta from the RegistryNames list + // above for (String slabName : slabWoodRegistryNameListBuilder.build()) { slabWood8WListBuilder.add(makeItemStack(slabName, OreDictionary.WILDCARD_VALUE, 8, null)); slabWood7WListBuilder.add(makeItemStack(slabName, OreDictionary.WILDCARD_VALUE, 7, null)); @@ -122,8 +132,7 @@ public class ModRecipes { for (ItemStack drawerBasicStack : OreDictionary.getOres(ORE_drawerBasic)) { UniqueIdentifier drawerID = GameRegistry.findUniqueIdentifierFor(drawerBasicStack.getItem()); // Keeps only fullDrawer1 to limit the amount of distinct items - if (drawerID.name.matches("fullDrawers1.*")) - drawerBasicRefs.add(drawerID.toString()); + if (drawerID.name.matches("fullDrawers1.*")) drawerBasicRefs.add(drawerID.toString()); } // Build the list of unique drawerBasic ItemStacks with Wildcard Meta from the RegistryNames list above @@ -159,23 +168,23 @@ public class ModRecipes { trimRecipes(); // Drawer trim // Drawer Machines Recipes - compDrawersRecipes(); // Compacting Drawer - controllerRecipes(); // Parent Controller recipe - controllerSlaveRecipes(); // Child Controller recipe - framingTableRecipes(); // Framing Table recipe + compDrawersRecipes(); // Compacting Drawer + controllerRecipes(); // Parent Controller recipe + controllerSlaveRecipes(); // Child Controller recipe + framingTableRecipes(); // Framing Table recipe // Upgrades recipes - upgradeTemplateRecipes(); // Upgrade Template - storageUpgradeRecipes(); // Iron, Gold, Obsidian, Diamond, Emerald Storage Upgrades - statusUpgradeRecipes(); // Status Upgrade I & II - redstoneUpgradeRecipes(); // Redstone, Max, Min Upgrades - voidUpgradeRecipes(); // Void Upgrade - lockUpgradeRecipes(); // Drawer key - shroudKeyUpgradeRecipes(); // Concealment Key - personalKeyUpgradeRecipes(); // Personal Key + upgradeTemplateRecipes(); // Upgrade Template + storageUpgradeRecipes(); // Iron, Gold, Obsidian, Diamond, Emerald Storage Upgrades + statusUpgradeRecipes(); // Status Upgrade I & II + redstoneUpgradeRecipes(); // Redstone, Max, Min Upgrades + voidUpgradeRecipes(); // Void Upgrade + lockUpgradeRecipes(); // Drawer key + shroudKeyUpgradeRecipes(); // Concealment Key + personalKeyUpgradeRecipes(); // Personal Key // Packing Tape - packingTapeRecipes(); // Packing Tape + packingTapeRecipes(); // Packing Tape } private static void fullDrawers1Recipes() { @@ -187,11 +196,12 @@ public class ModRecipes { // Oak Drawer Full 1x1 Workbench recipe final ItemStack fullDrawer1 = new ItemStack(ModBlocks.fullDrawers1, recipeOutput, 0); - GameRegistry.addRecipe(new ShapedOreRecipe(fullDrawer1, "sss", "scs", "sss", 's', ORE_slabWood, 'c', ORE_chestWood)); + GameRegistry.addRecipe( + new ShapedOreRecipe(fullDrawer1, "sss", "scs", "sss", 's', ORE_slabWood, 'c', ORE_chestWood)); // Oak Drawer Full 1x1 Gregtech Assembler recipes for (ItemStack slabWood8W : slabWood8WList) - RA.addAssemblerRecipe(new ItemStack[]{slabWood8W, chest1, integratedCircuit1}, NF, fullDrawer1, 200, 16); + RA.addAssemblerRecipe(new ItemStack[] {slabWood8W, chest1, integratedCircuit1}, NF, fullDrawer1, 200, 16); // Framed Drawer Full 1x1 @@ -199,10 +209,11 @@ public class ModRecipes { // Framed Drawer Full 1x1 Workbench recipe final ItemStack fullCustom1 = new ItemStack(ModBlocks.fullCustom1, recipeOutput, 0); - GameRegistry.addRecipe(new ShapedOreRecipe(fullCustom1, "bbb", "bcb", "bbb", 'b', carpentersBlock1, 'c', ORE_chestWood)); + GameRegistry.addRecipe( + new ShapedOreRecipe(fullCustom1, "bbb", "bcb", "bbb", 'b', carpentersBlock1, 'c', ORE_chestWood)); // Framed Drawer Full 1x1 Gregtech Assembler recipe - RA.addAssemblerRecipe(new ItemStack[]{carpentersBlock8, chest1, integratedCircuit1}, NF, fullCustom1, 200, 16); + RA.addAssemblerRecipe(new ItemStack[] {carpentersBlock8, chest1, integratedCircuit1}, NF, fullCustom1, 200, 16); } private static void fullDrawers2Recipes() { @@ -214,11 +225,12 @@ public class ModRecipes { // Oak Drawer Full 1x2 Workbench recipe final ItemStack fullDrawers2 = new ItemStack(ModBlocks.fullDrawers2, recipeOutput, 0); - GameRegistry.addRecipe(new ShapedOreRecipe(fullDrawers2, "scs", "sss", "scs", 's', ORE_slabWood, 'c', ORE_chestWood)); + GameRegistry.addRecipe( + new ShapedOreRecipe(fullDrawers2, "scs", "sss", "scs", 's', ORE_slabWood, 'c', ORE_chestWood)); // Oak Drawer Full 1x2 Gregtech Assembler recipes for (ItemStack slabWood7W : slabWood7WList) - RA.addAssemblerRecipe(new ItemStack[]{slabWood7W, chest2, integratedCircuit2}, NF, fullDrawers2, 200, 16); + RA.addAssemblerRecipe(new ItemStack[] {slabWood7W, chest2, integratedCircuit2}, NF, fullDrawers2, 200, 16); // Framed Drawer Full 1x2 @@ -226,10 +238,11 @@ public class ModRecipes { // Framed Drawer Full 1x2 Workbench recipe final ItemStack fullCustom2 = new ItemStack(ModBlocks.fullCustom2, recipeOutput, 0); - GameRegistry.addRecipe(new ShapedOreRecipe(fullCustom2, "bcb", "bbb", "bcb", 'b', carpentersBlock1, 'c', ORE_chestWood)); + GameRegistry.addRecipe( + new ShapedOreRecipe(fullCustom2, "bcb", "bbb", "bcb", 'b', carpentersBlock1, 'c', ORE_chestWood)); // Framed Drawer Full 1x2 Gregtech Assembler recipe - RA.addAssemblerRecipe(new ItemStack[]{carpentersBlock7, chest2, integratedCircuit2}, NF, fullCustom2, 200, 16); + RA.addAssemblerRecipe(new ItemStack[] {carpentersBlock7, chest2, integratedCircuit2}, NF, fullCustom2, 200, 16); } private static void fullDrawers4Recipes() { @@ -241,11 +254,12 @@ public class ModRecipes { // Oak Drawer Full 2x2 Workbench recipe final ItemStack fullDrawers4 = new ItemStack(ModBlocks.fullDrawers4, recipeOutput, 0); - GameRegistry.addRecipe(new ShapedOreRecipe(fullDrawers4, "csc", "sss", "csc", 's', ORE_slabWood, 'c', ORE_chestWood)); + GameRegistry.addRecipe( + new ShapedOreRecipe(fullDrawers4, "csc", "sss", "csc", 's', ORE_slabWood, 'c', ORE_chestWood)); // Oak Drawer Full 2x2 Gregtech Assembler recipes for (ItemStack slabWood5W : slabWood5WList) - RA.addAssemblerRecipe(new ItemStack[]{slabWood5W, chest4, integratedCircuit4}, NF, fullDrawers4, 200, 16); + RA.addAssemblerRecipe(new ItemStack[] {slabWood5W, chest4, integratedCircuit4}, NF, fullDrawers4, 200, 16); // Framed Drawer Full 2x2 @@ -253,10 +267,11 @@ public class ModRecipes { // Framed Drawer Full 2x2 Workbench recipe final ItemStack fullCustom4 = new ItemStack(ModBlocks.fullCustom4, recipeOutput, 0); - GameRegistry.addRecipe(new ShapedOreRecipe(fullCustom4, "cbc", "bbb", "cbc", 'b', carpentersBlock1, 'c', ORE_chestWood)); + GameRegistry.addRecipe( + new ShapedOreRecipe(fullCustom4, "cbc", "bbb", "cbc", 'b', carpentersBlock1, 'c', ORE_chestWood)); // Framed Drawer Full 2x2 Gregtech Assembler recipe - RA.addAssemblerRecipe(new ItemStack[]{carpentersBlock5, chest4, integratedCircuit4}, NF, fullCustom4, 200, 16); + RA.addAssemblerRecipe(new ItemStack[] {carpentersBlock5, chest4, integratedCircuit4}, NF, fullCustom4, 200, 16); } private static void halfDrawers2Recipes() { @@ -268,11 +283,12 @@ public class ModRecipes { // Oak Drawer Half 1x2 Workbench recipe final ItemStack halfDrawers2 = new ItemStack(ModBlocks.halfDrawers2, recipeOutput, 0); - GameRegistry.addRecipe(new ShapedOreRecipe(halfDrawers2, "sss", "csc", "sss", 's', ORE_slabWood, 'c', ORE_chestWood)); + GameRegistry.addRecipe( + new ShapedOreRecipe(halfDrawers2, "sss", "csc", "sss", 's', ORE_slabWood, 'c', ORE_chestWood)); // Oak Drawer Half 1x2 Gregtech Assembler recipes for (ItemStack slabWood7W : slabWood7WList) - RA.addAssemblerRecipe(new ItemStack[]{slabWood7W, chest2, integratedCircuit12}, NF, halfDrawers2, 200, 16); + RA.addAssemblerRecipe(new ItemStack[] {slabWood7W, chest2, integratedCircuit12}, NF, halfDrawers2, 200, 16); // Framed Drawer Half 1x2 @@ -280,10 +296,12 @@ public class ModRecipes { // Framed Drawer Half 1x2 Workbench recipe final ItemStack halfCustom2 = new ItemStack(ModBlocks.halfCustom2, recipeOutput, 0); - GameRegistry.addRecipe(new ShapedOreRecipe(halfCustom2, "bbb", "cbc", "bbb", 'b', carpentersBlock1, 'c', ORE_chestWood)); + GameRegistry.addRecipe( + new ShapedOreRecipe(halfCustom2, "bbb", "cbc", "bbb", 'b', carpentersBlock1, 'c', ORE_chestWood)); // Framed Drawer Half 1x2 Gregtech Assembler recipe - RA.addAssemblerRecipe(new ItemStack[]{carpentersBlock7, chest2, integratedCircuit12}, NF, halfCustom2, 200, 16); + RA.addAssemblerRecipe( + new ItemStack[] {carpentersBlock7, chest2, integratedCircuit12}, NF, halfCustom2, 200, 16); } private static void halfDrawers4Recipes() { @@ -295,10 +313,11 @@ public class ModRecipes { // Oak Drawer Half 2x2 Workbench recipe final ItemStack halfDrawers4 = new ItemStack(ModBlocks.halfDrawers4, recipeOutput, 0); - GameRegistry.addRecipe(new ShapedOreRecipe(halfDrawers4, "csc", "scs", "csc", 's', ORE_slabWood, 'c', ORE_chestWood)); + GameRegistry.addRecipe( + new ShapedOreRecipe(halfDrawers4, "csc", "scs", "csc", 's', ORE_slabWood, 'c', ORE_chestWood)); for (ItemStack slabWood4W : slabWood4WList) - RA.addAssemblerRecipe(new ItemStack[]{slabWood4W, chest5, integratedCircuit14}, NF, halfDrawers4, 200, 16); + RA.addAssemblerRecipe(new ItemStack[] {slabWood4W, chest5, integratedCircuit14}, NF, halfDrawers4, 200, 16); // Framed Drawer Half 2x2 @@ -306,10 +325,12 @@ public class ModRecipes { // Framed Drawer Half 2x2 Workbench recipe final ItemStack halfCustom4 = new ItemStack(ModBlocks.halfCustom4, recipeOutput, 0); - GameRegistry.addRecipe(new ShapedOreRecipe(halfCustom4, "cbc", "bcb", "cbc", 'b', carpentersBlock1, 'c', ORE_chestWood)); + GameRegistry.addRecipe( + new ShapedOreRecipe(halfCustom4, "cbc", "bcb", "cbc", 'b', carpentersBlock1, 'c', ORE_chestWood)); // Framed Drawer Half 2x2 Gregtech Assembler recipe - RA.addAssemblerRecipe(new ItemStack[]{carpentersBlock4, chest5, integratedCircuit14}, NF, halfCustom4, 200, 16); + RA.addAssemblerRecipe( + new ItemStack[] {carpentersBlock4, chest5, integratedCircuit14}, NF, halfCustom4, 200, 16); } private static void trimRecipes() { @@ -325,7 +346,7 @@ public class ModRecipes { // Oak Trim Gregtech Assembler recipe for (ItemStack slabWood5W : slabWood5WList) - RA.addAssemblerRecipe(new ItemStack[]{slabWood5W, stick4, integratedCircuit1}, NF, trim, 200, 16); + RA.addAssemblerRecipe(new ItemStack[] {slabWood5W, stick4, integratedCircuit1}, NF, trim, 200, 16); // Framed Trim @@ -333,59 +354,85 @@ public class ModRecipes { // Framed Trim Workbench recipe final ItemStack trimCustom = new ItemStack(ModBlocks.trimCustom, recipeOutput, 0); - GameRegistry.addRecipe(new ShapedOreRecipe(trimCustom, "tbt", "bbb", "tbt", 'b', carpentersBlock1, 't', ORE_stickWood)); + GameRegistry.addRecipe( + new ShapedOreRecipe(trimCustom, "tbt", "bbb", "tbt", 'b', carpentersBlock1, 't', ORE_stickWood)); // Framed Trim Gregtech Assembler recipe - RA.addAssemblerRecipe(new ItemStack[]{carpentersBlock5, stick4, integratedCircuit1}, NF, trimCustom, 200, 16); + RA.addAssemblerRecipe(new ItemStack[] {carpentersBlock5, stick4, integratedCircuit1}, NF, trimCustom, 200, 16); } private static void compDrawersRecipes() { if (!config.isBlockEnabled("compdrawers")) return; - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.compDrawers, 1), - new String[]{ - "sss", - "pdp", - "oio"}, - 's', ORE_stoneConcrete, - 'p', piston, - 'd', ORE_drawerBasic, - 'o', ORE_plateObsidian, - 'i', ORE_plateIron)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.compDrawers, 1), + new String[] {"sss", "pdp", "oio"}, + 's', + ORE_stoneConcrete, + 'p', + piston, + 'd', + ORE_drawerBasic, + 'o', + ORE_plateObsidian, + 'i', + ORE_plateIron)); } private static void controllerRecipes() { if (!config.isBlockEnabled("controller")) return; - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.controller), - new String[]{ - "scs", - "gbg", - "odo"}, - 's', ORE_plateStainlessSteel, - 'c', ORE_circuitGood, - 'g', comparatorGate, - 'b', ORE_drawerBasic, - 'o', ORE_plateObsidian, - 'd', ORE_plateDiamond)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.controller), + new String[] {"scs", "gbg", "odo"}, + 's', + ORE_plateStainlessSteel, + 'c', + ORE_circuitGood, + 'g', + comparatorGate, + 'b', + ORE_drawerBasic, + 'o', + ORE_plateObsidian, + 'd', + ORE_plateDiamond)); } private static void controllerSlaveRecipes() { if (!config.isBlockEnabled("controllerSlave")) return; - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.controllerSlave), "scs", "gbg", "oeo", - 's', ORE_plateStainlessSteel, - 'c', ORE_circuitGood, - 'g', comparatorGate, - 'b', ORE_drawerBasic, - 'o', ORE_plateObsidian, - 'e', ORE_plateEnderEye)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.controllerSlave), + "scs", + "gbg", + "oeo", + 's', + ORE_plateStainlessSteel, + 'c', + ORE_circuitGood, + 'g', + comparatorGate, + 'b', + ORE_drawerBasic, + 'o', + ORE_plateObsidian, + 'e', + ORE_plateEnderEye)); } private static void framingTableRecipes() { if (!config.cache.enableFramedDrawers) return; - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.framingTable), "ttt", "fsf", "fdf", - 't', ModBlocks.trim, - 'f', ORE_fenceWood, - 's', ORE_stickWood, - 'd', ORE_craftingToolScrewdriver)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModBlocks.framingTable), + "ttt", + "fsf", + "fdf", + 't', + ModBlocks.trim, + 'f', + ORE_fenceWood, + 's', + ORE_stickWood, + 'd', + ORE_craftingToolScrewdriver)); } private static void upgradeTemplateRecipes() { @@ -398,173 +445,252 @@ public class ModRecipes { || config.cache.enableStorageUpgrades || config.cache.enableVoidUpgrades)) return; - GameRegistry.addRecipe(new ShapedOreRecipe(upgradeTemplate, - new String[]{ - "sps", - "sds", - " t " - }, - 's', ORE_screwSteel, - 'p', piston, - 'd', ORE_drawerBasic, - 't', ORE_craftingToolScrewdriver)); + GameRegistry.addRecipe(new ShapedOreRecipe( + upgradeTemplate, + new String[] {"sps", "sds", " t "}, + 's', + ORE_screwSteel, + 'p', + piston, + 'd', + ORE_drawerBasic, + 't', + ORE_craftingToolScrewdriver)); for (ItemStack drawer : drawerBasicW) - RA.addAssemblerRecipe(new ItemStack[]{drawer, piston}, NF, upgradeTemplate, 1200, 16); + RA.addAssemblerRecipe(new ItemStack[] {drawer, piston}, NF, upgradeTemplate, 1200, 16); } private static void storageUpgradeRecipes() { if (!config.cache.enableStorageUpgrades) return; // Upgarde Iron - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 2), - new String[]{ - "pup", - "upu", - "psp"}, - 'p', ORE_plateIron, - 's', ORE_stickIron, - 'u', upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgrade, 1, 2), + new String[] {"pup", "upu", "psp"}, + 'p', + ORE_plateIron, + 's', + ORE_stickIron, + 'u', + upgradeTemplate)); // Upgarde Gold - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 3), - new String[]{ - "pup", - "utu", - "psp"}, - 'p', ORE_plateGold, - 's', ORE_stickGold, - 'u', upgradeTemplate, - 't', ORE_plateSteel)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgrade, 1, 3), + new String[] {"pup", "utu", "psp"}, + 'p', + ORE_plateGold, + 's', + ORE_stickGold, + 'u', + upgradeTemplate, + 't', + ORE_plateSteel)); // Upgarde Obsidian - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 4), - new String[]{ - "pup", - "utu", - "psp"}, - 'p', ORE_plateObsidian, - 's', ORE_stickObsidian, - 'u', upgradeTemplate, - 't', ORE_plateAluminium)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgrade, 1, 4), + new String[] {"pup", "utu", "psp"}, + 'p', + ORE_plateObsidian, + 's', + ORE_stickObsidian, + 'u', + upgradeTemplate, + 't', + ORE_plateAluminium)); // Upgarde Diamond - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 5), - new String[]{ - "pup", - "utu", - "psp"}, - 'p', ORE_plateDiamond, - 's', ORE_stickDiamond, - 'u', upgradeTemplate, - 't', ORE_plateStainlessSteel)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgrade, 1, 5), + new String[] {"pup", "utu", "psp"}, + 'p', + ORE_plateDiamond, + 's', + ORE_stickDiamond, + 'u', + upgradeTemplate, + 't', + ORE_plateStainlessSteel)); // Upgarde Emerald - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade, 1, 6), - new String[]{ - "pup", - "utu", - "psp"}, - 'p', ORE_plateEmerald, - 's', ORE_stickEmerald, - 'u', upgradeTemplate, - 't', ORE_plateTitanium)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgrade, 1, 6), + new String[] {"pup", "utu", "psp"}, + 'p', + ORE_plateEmerald, + 's', + ORE_stickEmerald, + 'u', + upgradeTemplate, + 't', + ORE_plateTitanium)); } private static void statusUpgradeRecipes() { if (!config.cache.enableIndicatorUpgrades) return; // Status Upgrade I recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeStatus, 1, 1), "twt", "wuw", "rwr", - 't', new ItemStack(Blocks.redstone_torch), - 'w', redAlloyWire, - 'u', upgradeTemplate, - 'r', ORE_plateRedstone)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeStatus, 1, 1), + "twt", + "wuw", + "rwr", + 't', + new ItemStack(Blocks.redstone_torch), + 'w', + redAlloyWire, + 'u', + upgradeTemplate, + 'r', + ORE_plateRedstone)); // Status Upgrade II recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeStatus, 1, 2), "gwg", "wuw", "rwr", - 'g', comparatorGate, - 'w', redAlloyWire, - 'u', upgradeTemplate, - 'r', ORE_plateRedstone)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeStatus, 1, 2), + "gwg", + "wuw", + "rwr", + 'g', + comparatorGate, + 'w', + redAlloyWire, + 'u', + upgradeTemplate, + 'r', + ORE_plateRedstone)); } private static void redstoneUpgradeRecipes() { if (!config.cache.enableRedstoneUpgrades) return; // Redstone Upgrade recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeRedstone, 1, 0), "rsr", "sus", "rwr", - 'r', ORE_plateRedstone, - 's', ORE_stickWood, - 'u', upgradeTemplate, - 'w', redAlloyWire)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeRedstone, 1, 0), + "rsr", + "sus", + "rwr", + 'r', + ORE_plateRedstone, + 's', + ORE_stickWood, + 'u', + upgradeTemplate, + 'w', + redAlloyWire)); // Redstone Max Upgrade recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeRedstone, 1, 1), "rrr", "sus", "sws", - 'r', ORE_plateRedstone, - 's', ORE_stickWood, - 'u', upgradeTemplate, - 'w', redAlloyWire)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeRedstone, 1, 1), + "rrr", + "sus", + "sws", + 'r', + ORE_plateRedstone, + 's', + ORE_stickWood, + 'u', + upgradeTemplate, + 'w', + redAlloyWire)); // Redstone Min recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeRedstone, 1, 2), "sws", "sus", "rrr", - 'r', ORE_plateRedstone, - 's', ORE_stickWood, - 'u', upgradeTemplate, - 'w', redAlloyWire)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeRedstone, 1, 2), + "sws", + "sus", + "rrr", + 'r', + ORE_plateRedstone, + 's', + ORE_stickWood, + 'u', + upgradeTemplate, + 'w', + redAlloyWire)); } private static void voidUpgradeRecipes() { if (!config.cache.enableVoidUpgrades) return; // Upgrade Void recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeVoid), "sws", "ouo", "sws", - 's', ORE_stickWood, - 'w', redAlloyWire, - 'o', ORE_plateDenseObsidian, - 'u', upgradeTemplate)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeVoid), + "sws", + "ouo", + "sws", + 's', + ORE_stickWood, + 'w', + redAlloyWire, + 'o', + ORE_plateDenseObsidian, + 'u', + upgradeTemplate)); } private static void lockUpgradeRecipes() { if (!config.cache.enableLockUpgrades) return; // Drawer Key recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgradeLock), " bs", "uso", "gt ", - 'b', ORE_boltGold, - 's', ORE_plateSteel, - 'u', upgradeTemplate, - 'o', ORE_stickGold, - 'g', ORE_plateGold, - 't', ORE_craftingToolSaw)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(ModItems.upgradeLock), + " bs", + "uso", + "gt ", + 'b', + ORE_boltGold, + 's', + ORE_plateSteel, + 'u', + upgradeTemplate, + 'o', + ORE_stickGold, + 'g', + ORE_plateGold, + 't', + ORE_craftingToolSaw)); } private static void shroudKeyUpgradeRecipes() { if (!config.cache.enableShroudUpgrades) return; // Concealment Key - RA.addAssemblerRecipe(new ItemStack[]{upgradeLock, new ItemStack(Items.ender_eye)}, NF, new ItemStack(ModItems.shroudKey), 100, 30); + RA.addAssemblerRecipe( + new ItemStack[] {upgradeLock, new ItemStack(Items.ender_eye)}, + NF, + new ItemStack(ModItems.shroudKey), + 100, + 30); } private static void personalKeyUpgradeRecipes() { if (!config.cache.enablePersonalUpgrades) return; // Storage Personal Key - RA.addAssemblerRecipe(new ItemStack[]{upgradeLock, new ItemStack(Items.name_tag)}, NF, new ItemStack(ModItems.personalKey), 100, 30); + RA.addAssemblerRecipe( + new ItemStack[] {upgradeLock, new ItemStack(Items.name_tag)}, + NF, + new ItemStack(ModItems.personalKey), + 100, + 30); } private static void packingTapeRecipes() { if (!config.cache.enableTape) return; // Packing Tape - RA.addAssemblerRecipe(new ItemStack[]{ - new ItemStack(Items.paper), - GT_Utility.getIntegratedCircuit(1)}, - new FluidStack((FluidRegistry.getFluid(FLUID_NAME_refinedglue) != null) ? - FluidRegistry.getFluid(FLUID_NAME_refinedglue) : - FluidRegistry.getFluid("glue"), // Fallback glue + RA.addAssemblerRecipe( + new ItemStack[] {new ItemStack(Items.paper), GT_Utility.getIntegratedCircuit(1)}, + new FluidStack( + (FluidRegistry.getFluid(FLUID_NAME_refinedglue) != null) + ? FluidRegistry.getFluid(FLUID_NAME_refinedglue) + : FluidRegistry.getFluid("glue"), // Fallback glue 144), new ItemStack(ModItems.tape), - 200, 30); + 200, + 30); } /* Same as cpw.mods.fml.common.registry.GameRegistry.makeItemStack diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/Compaction.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/Compaction.java index 4502f83..ff8f9de 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/Compaction.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/Compaction.java @@ -10,66 +10,62 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @ZenClass("mods.storagedrawers.Compaction") -public class Compaction -{ +public class Compaction { @ZenMethod - public static void add (IItemStack upper, IItemStack lower, int conversion) { + public static void add(IItemStack upper, IItemStack lower, int conversion) { ItemStack upperStack = MineTweakerMC.getItemStack(upper); ItemStack lowerStack = MineTweakerMC.getItemStack(lower); if (upperStack == null || lowerStack == null) MineTweakerAPI.logError("Tried to add compacting tier with invalid item stack."); - else - MineTweakerAPI.apply(new AddRecordAction(upperStack, lowerStack, conversion)); + else MineTweakerAPI.apply(new AddRecordAction(upperStack, lowerStack, conversion)); } - private static class AddRecordAction implements IUndoableAction - { + private static class AddRecordAction implements IUndoableAction { ItemStack upper; ItemStack lower; int conversionRate; boolean added; - public AddRecordAction (ItemStack upper, ItemStack lower, int conversionRate) { + public AddRecordAction(ItemStack upper, ItemStack lower, int conversionRate) { this.upper = upper; this.lower = lower; this.conversionRate = conversionRate; } @Override - public void apply () { + public void apply() { added = StorageDrawers.compRegistry.register(upper, lower, conversionRate); } @Override - public boolean canUndo () { + public boolean canUndo() { return true; } @Override - public void undo () { - if (added) - StorageDrawers.compRegistry.unregisterUpperTarget(upper); + public void undo() { + if (added) StorageDrawers.compRegistry.unregisterUpperTarget(upper); } @Override - public String describe () { + public String describe() { if (added) - return "Adding compacting tier: 1 '" + upper.getDisplayName() + "' = " + conversionRate + " '" + lower.getDisplayName() + "'."; - else - return "Failed to add compacting tier."; + return "Adding compacting tier: 1 '" + upper.getDisplayName() + "' = " + conversionRate + " '" + + lower.getDisplayName() + "'."; + else return "Failed to add compacting tier."; } @Override - public String describeUndo () { + public String describeUndo() { if (added) - return "Removing previously added compacting tier: 1 '" + upper.getDisplayName() + "' = " + conversionRate + " '" + lower.getDisplayName() + "'."; - else - return ""; + return "Removing previously added compacting tier: 1 '" + upper.getDisplayName() + "' = " + + conversionRate + " '" + lower.getDisplayName() + "'."; + else return ""; } @Override - public Object getOverrideKey () { + public Object getOverrideKey() { return null; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryBlacklist.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryBlacklist.java index 6a7747f..9d99e25 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryBlacklist.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryBlacklist.java @@ -7,114 +7,100 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @ZenClass("mods.storagedrawers.OreDictionaryBlacklist") -public class OreDictionaryBlacklist -{ +public class OreDictionaryBlacklist { @ZenMethod - public static void add (String name) { - if (name != null && name.length() > 0) - MineTweakerAPI.apply(new AddNameAction(name)); - else - MineTweakerAPI.logError("Tried to add empty ore dictionary name to drawer conversion blacklist."); + public static void add(String name) { + if (name != null && name.length() > 0) MineTweakerAPI.apply(new AddNameAction(name)); + else MineTweakerAPI.logError("Tried to add empty ore dictionary name to drawer conversion blacklist."); } @ZenMethod - public static void addPrefix (String prefix) { - if (prefix != null && prefix.length() > 0) - MineTweakerAPI.apply(new AddPrefixAction(prefix)); - else - MineTweakerAPI.logError("Tried to add empty ore dictionary prefix to drawer conversion blacklist."); + public static void addPrefix(String prefix) { + if (prefix != null && prefix.length() > 0) MineTweakerAPI.apply(new AddPrefixAction(prefix)); + else MineTweakerAPI.logError("Tried to add empty ore dictionary prefix to drawer conversion blacklist."); } - private static class AddNameAction implements IUndoableAction - { + private static class AddNameAction implements IUndoableAction { String name; boolean added; - public AddNameAction (String name) { + public AddNameAction(String name) { this.name = name; } @Override - public void apply () { + public void apply() { added = StorageDrawers.oreDictRegistry.addBlacklist(name); } @Override - public boolean canUndo () { + public boolean canUndo() { return true; } @Override - public void undo () { - if (added) - StorageDrawers.oreDictRegistry.removeBlacklist(name); + public void undo() { + if (added) StorageDrawers.oreDictRegistry.removeBlacklist(name); } @Override - public String describe () { - if (added) - return "Adding ore dictionary key '" + name + "' to drawer conversion blacklist."; - else - return "Ore dictionary key '" + name + "' already registered in drawer conversion blacklist."; + public String describe() { + if (added) return "Adding ore dictionary key '" + name + "' to drawer conversion blacklist."; + else return "Ore dictionary key '" + name + "' already registered in drawer conversion blacklist."; } @Override - public String describeUndo () { + public String describeUndo() { if (added) return "Removing previously added ore dictionary key '" + name + "' from drawer conversion blacklist."; - else - return ""; + else return ""; } @Override - public Object getOverrideKey () { + public Object getOverrideKey() { return null; } } - private static class AddPrefixAction implements IUndoableAction - { + private static class AddPrefixAction implements IUndoableAction { String name; boolean added; - public AddPrefixAction (String name) { + public AddPrefixAction(String name) { this.name = name; } @Override - public void apply () { + public void apply() { added = StorageDrawers.oreDictRegistry.addBlacklistPrefix(name); } @Override - public boolean canUndo () { + public boolean canUndo() { return true; } @Override - public void undo () { - if (added) - StorageDrawers.oreDictRegistry.removeBlacklistPrefix(name); + public void undo() { + if (added) StorageDrawers.oreDictRegistry.removeBlacklistPrefix(name); } @Override - public String describe () { - if (added) - return "Adding ore dictionary prefix '" + name + "' to drawer conversion blacklist."; - else - return "Ore dictionary prefix '" + name + "' already registered in drawer conversion blacklist."; + public String describe() { + if (added) return "Adding ore dictionary prefix '" + name + "' to drawer conversion blacklist."; + else return "Ore dictionary prefix '" + name + "' already registered in drawer conversion blacklist."; } @Override - public String describeUndo () { + public String describeUndo() { if (added) - return "Removing previously added ore dictionary prefix '" + name + "' from drawer conversion blacklist."; - else - return ""; + return "Removing previously added ore dictionary prefix '" + name + + "' from drawer conversion blacklist."; + else return ""; } @Override - public Object getOverrideKey () { + public Object getOverrideKey() { return null; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryWhitelist.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryWhitelist.java index 7d96cfd..8ace6a1 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryWhitelist.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryWhitelist.java @@ -7,60 +7,52 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @ZenClass("mods.storagedrawers.OreDictionaryWhitelist") -public class OreDictionaryWhitelist -{ +public class OreDictionaryWhitelist { @ZenMethod - public static void add (String name) { - if (name != null && name.length() > 0) - MineTweakerAPI.apply(new AddNameAction(name)); - else - MineTweakerAPI.logError("Tried to add empty ore dictionary name to drawer conversion whitelist."); + public static void add(String name) { + if (name != null && name.length() > 0) MineTweakerAPI.apply(new AddNameAction(name)); + else MineTweakerAPI.logError("Tried to add empty ore dictionary name to drawer conversion whitelist."); } - private static class AddNameAction implements IUndoableAction - { + private static class AddNameAction implements IUndoableAction { String name; boolean added; - public AddNameAction (String name) { + public AddNameAction(String name) { this.name = name; } @Override - public void apply () { + public void apply() { added = StorageDrawers.oreDictRegistry.addWhitelist(name); } @Override - public boolean canUndo () { + public boolean canUndo() { return true; } @Override - public void undo () { - if (added) - StorageDrawers.oreDictRegistry.removeWhitelist(name); + public void undo() { + if (added) StorageDrawers.oreDictRegistry.removeWhitelist(name); } @Override - public String describe () { - if (added) - return "Adding ore dictionary key '" + name + "' to drawer conversion whitelist."; - else - return "Ore dictionary key '" + name + "' already registered in drawer conversion whitelist."; + public String describe() { + if (added) return "Adding ore dictionary key '" + name + "' to drawer conversion whitelist."; + else return "Ore dictionary key '" + name + "' already registered in drawer conversion whitelist."; } @Override - public String describeUndo () { + public String describeUndo() { if (added) return "Removing previously added ore dictionary key '" + name + "' from drawer conversion whitelist."; - else - return ""; + else return ""; } @Override - public Object getOverrideKey () { + public Object getOverrideKey() { return null; } } -} \ No newline at end of file +} diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/notenoughitems/NEIStorageDrawersConfig.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/notenoughitems/NEIStorageDrawersConfig.java index 6270bf6..6e2a9d0 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/notenoughitems/NEIStorageDrawersConfig.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/notenoughitems/NEIStorageDrawersConfig.java @@ -5,53 +5,48 @@ import codechicken.nei.api.IConfigureNEI; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameData; +import java.util.HashSet; +import java.util.Set; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import java.util.HashSet; -import java.util.Set; - @Optional.Interface(iface = "codechicken.nei.api.IConfigureNEI", modid = "NotEnoughItems") -public class NEIStorageDrawersConfig implements IConfigureNEI -{ +public class NEIStorageDrawersConfig implements IConfigureNEI { private static Set pendingHide = new HashSet(); private static boolean loaded; @Override @Optional.Method(modid = "NotEnoughItems") - public void loadConfig () { - for (ItemStack stack : pendingHide) - API.hideItem(stack); + public void loadConfig() { + for (ItemStack stack : pendingHide) API.hideItem(stack); pendingHide.clear(); loaded = true; } @Override @Optional.Method(modid = "NotEnoughItems") - public String getName () { + public String getName() { return StorageDrawers.MOD_NAME; } @Override @Optional.Method(modid = "NotEnoughItems") - public String getVersion () { + public String getVersion() { return StorageDrawers.MOD_VERSION; } - private static void hideItem (ItemStack stack) { + private static void hideItem(ItemStack stack) { API.hideItem(stack); } - public static void hideBlock (String blockID) { + public static void hideBlock(String blockID) { Block block = GameData.getBlockRegistry().getObject(blockID); if (block != null) { ItemStack stack = new ItemStack(Item.getItemFromBlock(block), 1, OreDictionary.WILDCARD_VALUE); - if (loaded) - hideItem(stack); - else - pendingHide.add(stack); + if (loaded) hideItem(stack); + else pendingHide.add(stack); } } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/BlockSortingCompDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/BlockSortingCompDrawers.java index 49fc5b1..00384c7 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/BlockSortingCompDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/BlockSortingCompDrawers.java @@ -14,26 +14,24 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class BlockSortingCompDrawers extends BlockCompDrawers -{ +public class BlockSortingCompDrawers extends BlockCompDrawers { @SideOnly(Side.CLIENT) IIcon iconSort; - public BlockSortingCompDrawers (String blockName) { + public BlockSortingCompDrawers(String blockName) { super(blockName); setCreativeTab(RefinedRelocation.tabStorageDrawers); } - public static boolean upgradeToSorting (World world, int x, int y, int z) { + public static boolean upgradeToSorting(World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - if (!(tile instanceof TileEntityDrawersComp) || tile instanceof TileSortingDrawersComp) - return false; + if (!(tile instanceof TileEntityDrawersComp) || tile instanceof TileSortingDrawersComp) return false; Block block = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); - TileEntityDrawersComp oldDrawer = (TileEntityDrawersComp)tile; + TileEntityDrawersComp oldDrawer = (TileEntityDrawersComp) tile; TileSortingDrawersComp newDrawer = new TileSortingDrawersComp(); NBTTagCompound tag = new NBTTagCompound(); @@ -54,31 +52,29 @@ public class BlockSortingCompDrawers extends BlockCompDrawers } @Override - public TileSortingDrawersComp createNewTileEntity (World world, int meta) { + public TileSortingDrawersComp createNewTileEntity(World world, int meta) { return new TileSortingDrawersComp(); } @Override - public IIcon getIcon (int side, int meta) { - if (side == 1) - return iconSort; + public IIcon getIcon(int side, int meta) { + if (side == 1) return iconSort; return super.getIcon(side, meta); } @SideOnly(Side.CLIENT) - public IIcon getIcon (IBlockAccess blockAccess, int x, int y, int z, int side) { - if (side == 1) - return iconSort; + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { + if (side == 1) return iconSort; return super.getIcon(blockAccess, x, y, z, side); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { super.registerBlockIcons(register); iconSort = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_sort"); } -} \ No newline at end of file +} diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/BlockSortingDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/BlockSortingDrawers.java index cdf0c18..6ea5187 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/BlockSortingDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/BlockSortingDrawers.java @@ -16,26 +16,24 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class BlockSortingDrawers extends BlockDrawers -{ +public class BlockSortingDrawers extends BlockDrawers { @SideOnly(Side.CLIENT) protected IIcon[] iconSort; - public BlockSortingDrawers (String blockName, int drawerCount, boolean halfDepth) { + public BlockSortingDrawers(String blockName, int drawerCount, boolean halfDepth) { super(blockName, drawerCount, halfDepth); setCreativeTab(RefinedRelocation.tabStorageDrawers); } - public static boolean upgradeToSorting (World world, int x, int y, int z) { + public static boolean upgradeToSorting(World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - if (!(tile instanceof TileEntityDrawersStandard) || tile instanceof TileSortingDrawersStandard) - return false; + if (!(tile instanceof TileEntityDrawersStandard) || tile instanceof TileSortingDrawersStandard) return false; Block block = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); - TileEntityDrawersStandard oldDrawer = (TileEntityDrawersStandard)tile; + TileEntityDrawersStandard oldDrawer = (TileEntityDrawersStandard) tile; TileSortingDrawersStandard newDrawer = new TileSortingDrawersStandard(); NBTTagCompound tag = new NBTTagCompound(); @@ -56,35 +54,33 @@ public class BlockSortingDrawers extends BlockDrawers } @Override - public BlockType retrimType () { + public BlockType retrimType() { return BlockType.DrawersSorting; } @Override - public TileSortingDrawersStandard createNewTileEntity (World world, int meta) { + public TileSortingDrawersStandard createNewTileEntity(World world, int meta) { return new TileSortingDrawersStandard(); } @Override - public IIcon getIcon (int side, int meta) { - if (side == 1 && !halfDepth) - return iconSort[meta]; + public IIcon getIcon(int side, int meta) { + if (side == 1 && !halfDepth) return iconSort[meta]; return super.getIcon(side, meta); } @SideOnly(Side.CLIENT) - protected IIcon getIcon (IBlockAccess blockAccess, int x, int y, int z, int side, int level) { + protected IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side, int level) { int meta = blockAccess.getBlockMetadata(x, y, z) % iconSort.length; - if (side == 1 && !halfDepth) - return iconSort[meta]; + if (side == 1 && !halfDepth) return iconSort[meta]; return super.getIcon(blockAccess, x, y, z, side, level); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { super.registerBlockIcons(register); String[] subtex = BlockWood.field_150096_a; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/BlockSortingTrim.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/BlockSortingTrim.java index a7a1fe2..9048a22 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/BlockSortingTrim.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/BlockSortingTrim.java @@ -13,12 +13,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -public class BlockSortingTrim extends BlockTrim implements ITileEntityProvider -{ +public class BlockSortingTrim extends BlockTrim implements ITileEntityProvider { @SideOnly(Side.CLIENT) protected IIcon[] iconSort; - public BlockSortingTrim (String name) { + public BlockSortingTrim(String name) { super(name); setCreativeTab(RefinedRelocation.tabStorageDrawers); } @@ -29,16 +28,15 @@ public class BlockSortingTrim extends BlockTrim implements ITileEntityProvider } @Override - public IIcon getIcon (int side, int meta) { - if (side == 1) - return iconSort[meta]; + public IIcon getIcon(int side, int meta) { + if (side == 1) return iconSort[meta]; return super.getIcon(side, meta); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { super.registerBlockIcons(register); String[] subtex = BlockWood.field_150096_a; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/DrawerFilter.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/DrawerFilter.java index 225f072..eab234d 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/DrawerFilter.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/DrawerFilter.java @@ -5,23 +5,20 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import net.minecraft.item.ItemStack; -public class DrawerFilter implements IFilter -{ +public class DrawerFilter implements IFilter { private IDrawerGroup group; - public DrawerFilter (IDrawerGroup group) { + public DrawerFilter(IDrawerGroup group) { this.group = group; } @Override - public boolean passesFilter (ItemStack itemStack) { + public boolean passesFilter(ItemStack itemStack) { for (int i = 0; i < group.getDrawerCount(); i++) { - if (!group.isDrawerEnabled(i)) - continue; + if (!group.isDrawerEnabled(i)) continue; IDrawer drawer = group.getDrawer(i); - if (!drawer.isEmpty() && drawer.canItemBeStored(itemStack)) - return true; + if (!drawer.isEmpty() && drawer.canItemBeStored(itemStack)) return true; } return false; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/DrawerSortingInventory.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/DrawerSortingInventory.java index eb1371b..18d7fab 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/DrawerSortingInventory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/DrawerSortingInventory.java @@ -13,8 +13,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -public class DrawerSortingInventory -{ +public class DrawerSortingInventory { private ISpecialSortingInventory parent; private IDrawerGroup group; private IInventory inventory; @@ -24,8 +23,9 @@ public class DrawerSortingInventory private DrawerFilter filter; private boolean isAttached; - public DrawerSortingInventory (TileEntity tileEntity, IDrawerGroup group, IInventory inventory, IUpgradeProvider upgrade) { - parent = (ISpecialSortingInventory)tileEntity; + public DrawerSortingInventory( + TileEntity tileEntity, IDrawerGroup group, IInventory inventory, IUpgradeProvider upgrade) { + parent = (ISpecialSortingInventory) tileEntity; this.group = group; this.inventory = inventory; this.upgrade = upgrade; @@ -34,56 +34,53 @@ public class DrawerSortingInventory filter = new DrawerFilter(group); } - public void attach () { + public void attach() { if (!isAttached) { getHandler().onTileAdded(); isAttached = true; } } - public void detach () { + public void detach() { if (isAttached) { getHandler().onTileRemoved(); isAttached = false; } } - public boolean isAttached () { + public boolean isAttached() { return isAttached; } - public boolean putStackInSlot (ItemStack itemStack, int slotIndex) { + public boolean putStackInSlot(ItemStack itemStack, int slotIndex) { inventory.setInventorySlotContents(slotIndex, itemStack); return true; } - public ItemStack putInInventory (ItemStack itemStack, boolean simulate) { + public ItemStack putInInventory(ItemStack itemStack, boolean simulate) { for (int i = 0; i < group.getDrawerCount(); i++) { - if (!group.isDrawerEnabled(i)) - continue; + if (!group.isDrawerEnabled(i)) continue; IDrawer drawer = group.getDrawer(i); - if (drawer.isEmpty() || !drawer.canItemBeStored(itemStack)) - continue; + if (drawer.isEmpty() || !drawer.canItemBeStored(itemStack)) continue; - int added = upgrade.isVoid() ? itemStack.stackSize : Math.min(drawer.getRemainingCapacity(), itemStack.stackSize); - if (!simulate) - drawer.setStoredItemCount(drawer.getStoredItemCount() + added); + int added = upgrade.isVoid() + ? itemStack.stackSize + : Math.min(drawer.getRemainingCapacity(), itemStack.stackSize); + if (!simulate) drawer.setStoredItemCount(drawer.getStoredItemCount() + added); itemStack.stackSize -= added; - if (itemStack.stackSize == 0) - return null; + if (itemStack.stackSize == 0) return null; } return itemStack; } - public SpecialLocalizedStack getLocalizedStackInSlot (int slot) { + public SpecialLocalizedStack getLocalizedStackInSlot(int slot) { ItemStack itemStack = inventory.getStackInSlot(slot); if (itemStack != null) { int drawerSlot = group.getDrawerInventory().getDrawerSlot(slot); - if (!group.isDrawerEnabled(drawerSlot)) - return null; + if (!group.isDrawerEnabled(drawerSlot)) return null; IDrawer drawer = group.getDrawer(drawerSlot); return new SpecialLocalizedStack(itemStack, parent, slot, drawer.getStoredItemCount()); @@ -92,32 +89,29 @@ public class DrawerSortingInventory return null; } - public void alterStackSize (int slot, int alteration) { + public void alterStackSize(int slot, int alteration) { int drawerSlot = group.getDrawerInventory().getDrawerSlot(slot); - if (!group.isDrawerEnabled(drawerSlot)) - return; + if (!group.isDrawerEnabled(drawerSlot)) return; IDrawer drawer = group.getDrawer(drawerSlot); drawer.setStoredItemCount(drawer.getStoredItemCount() + alteration); } - public ISortingInventory.Priority getPriority () { + public ISortingInventory.Priority getPriority() { return ISortingInventory.Priority.NORMAL_HIGH; } - public void setPriority (ISortingInventory.Priority priority) { + public void setPriority(ISortingInventory.Priority priority) {} - } - - public IFilter getFilter () { + public IFilter getFilter() { return filter; } - public ISortingInventoryHandler getHandler () { + public ISortingInventoryHandler getHandler() { return sortingHandler; } - public void markDirty () { + public void markDirty() { getHandler().onInventoryChange(); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemSortingCompDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemSortingCompDrawers.java index bb58592..e07afed 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemSortingCompDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemSortingCompDrawers.java @@ -3,23 +3,21 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; import com.jaquadro.minecraft.storagedrawers.item.ItemCompDrawers; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import java.util.List; - -public class ItemSortingCompDrawers extends ItemCompDrawers -{ - public ItemSortingCompDrawers (Block block) { +public class ItemSortingCompDrawers extends ItemCompDrawers { + public ItemSortingCompDrawers(Block block) { super(block); } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { super.addInformation(itemStack, player, list, par4); Block block = Block.getBlockFromItem(itemStack.getItem()); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemSortingDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemSortingDrawers.java index 22858e1..03d6865 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemSortingDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemSortingDrawers.java @@ -4,26 +4,23 @@ import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import com.jaquadro.minecraft.storagedrawers.integration.RefinedRelocation; import com.jaquadro.minecraft.storagedrawers.item.ItemBasicDrawers; -import com.jaquadro.minecraft.storagedrawers.item.ItemDrawers; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import java.util.List; - -public class ItemSortingDrawers extends ItemBasicDrawers -{ - public ItemSortingDrawers (Block block) { +public class ItemSortingDrawers extends ItemBasicDrawers { + public ItemSortingDrawers(Block block) { super(block); } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { super.addInformation(itemStack, player, list, par4); Block block = Block.getBlockFromItem(itemStack.getItem()); @@ -31,22 +28,16 @@ public class ItemSortingDrawers extends ItemBasicDrawers } @Override - protected int getCapacityForBlock (Block block) { + protected int getCapacityForBlock(Block block) { ConfigManager config = StorageDrawers.config; int count = 0; - if (block == RefinedRelocation.fullDrawers1) - count = config.getBlockBaseStorage("fulldrawers1"); - else if (block == RefinedRelocation.fullDrawers2) - count = config.getBlockBaseStorage("fulldrawers2"); - else if (block == RefinedRelocation.fullDrawers4) - count = config.getBlockBaseStorage("fulldrawers4"); - else if (block == RefinedRelocation.halfDrawers2) - count = config.getBlockBaseStorage("halfdrawers2"); - else if (block == RefinedRelocation.halfDrawers4) - count = config.getBlockBaseStorage("halfdrawers4"); - else if (block == RefinedRelocation.compDrawers) - count = config.getBlockBaseStorage("compDrawers"); + if (block == RefinedRelocation.fullDrawers1) count = config.getBlockBaseStorage("fulldrawers1"); + else if (block == RefinedRelocation.fullDrawers2) count = config.getBlockBaseStorage("fulldrawers2"); + else if (block == RefinedRelocation.fullDrawers4) count = config.getBlockBaseStorage("fulldrawers4"); + else if (block == RefinedRelocation.halfDrawers2) count = config.getBlockBaseStorage("halfdrawers2"); + else if (block == RefinedRelocation.halfDrawers4) count = config.getBlockBaseStorage("halfdrawers4"); + else if (block == RefinedRelocation.compDrawers) count = config.getBlockBaseStorage("compDrawers"); return count; } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemSortingTrim.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemSortingTrim.java index 56be839..09c8c16 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemSortingTrim.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemSortingTrim.java @@ -3,23 +3,21 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; import com.jaquadro.minecraft.storagedrawers.item.ItemTrim; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import java.util.List; - -public class ItemSortingTrim extends ItemTrim -{ +public class ItemSortingTrim extends ItemTrim { public ItemSortingTrim(Block block) { super(block); } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { super.addInformation(itemStack, player, list, par4); Block block = Block.getBlockFromItem(itemStack.getItem()); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemUpgradeSorting.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemUpgradeSorting.java index 63e9b72..eccde46 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemUpgradeSorting.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/ItemUpgradeSorting.java @@ -5,25 +5,18 @@ import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersComp; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard; import com.jaquadro.minecraft.storagedrawers.core.ModBlocks; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; -import com.jaquadro.minecraft.storagedrawers.integration.RefinedRelocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import java.util.List; - -public class ItemUpgradeSorting extends Item -{ - public ItemUpgradeSorting (String name) { +public class ItemUpgradeSorting extends Item { + public ItemUpgradeSorting(String name) { setUnlocalizedName(name); setCreativeTab(ModCreativeTabs.tabStorageDrawers); setTextureName(StorageDrawers.MOD_ID + ":upgrade_sorting"); @@ -32,26 +25,34 @@ public class ItemUpgradeSorting extends Item @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { String name = getUnlocalizedName(itemStack); list.add(StatCollector.translateToLocalFormatted(name + ".description")); } @Override - public boolean onItemUseFirst (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - if (world.isRemote) - return false; + public boolean onItemUseFirst( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ) { + if (world.isRemote) return false; - if(world.getBlock(x, y, z) == ModBlocks.trim) { - if(BlockSortingTrim.upgradeToSorting(world, x, y, z)) { + if (world.getBlock(x, y, z) == ModBlocks.trim) { + if (BlockSortingTrim.upgradeToSorting(world, x, y, z)) { stack.stackSize--; return true; } } TileEntity tile = world.getTileEntity(x, y, z); - if (tile == null) - return false; + if (tile == null) return false; if (tile instanceof TileEntityDrawersStandard) { if (BlockSortingDrawers.upgradeToSorting(world, x, y, z)) { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/SortingBlockRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/SortingBlockRegistry.java index 94dc8e7..3b99b95 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/SortingBlockRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/SortingBlockRegistry.java @@ -1,19 +1,17 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; -import net.minecraft.block.Block; - import java.util.HashMap; import java.util.Map; +import net.minecraft.block.Block; -public class SortingBlockRegistry -{ +public class SortingBlockRegistry { private static Map registry = new HashMap(); - public static void register (Block storageBlock, Block sortingBlock) { + public static void register(Block storageBlock, Block sortingBlock) { registry.put(storageBlock, sortingBlock); } - public static Block resolveSortingBlock (Block storageBlock) { + public static Block resolveSortingBlock(Block storageBlock) { return registry.get(storageBlock); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/TileSortingDrawersComp.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/TileSortingDrawersComp.java index fe977c7..8861219 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/TileSortingDrawersComp.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/TileSortingDrawersComp.java @@ -8,86 +8,84 @@ import com.dynious.refinedrelocation.api.tileentity.handlers.ISortingInventoryHa import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersComp; import net.minecraft.item.ItemStack; -public class TileSortingDrawersComp extends TileEntityDrawersComp implements ISpecialSortingInventory -{ +public class TileSortingDrawersComp extends TileEntityDrawersComp implements ISpecialSortingInventory { private DrawerSortingInventory sortingInventory; - public TileSortingDrawersComp () { + public TileSortingDrawersComp() { sortingInventory = new DrawerSortingInventory(this, this, this, this); } @Override - public boolean isSorting () { + public boolean isSorting() { return true; } @Override - public boolean canUpdate () { + public boolean canUpdate() { return super.canUpdate() || !sortingInventory.isAttached(); } @Override - public void updateEntity () { - if (!sortingInventory.isAttached()) - sortingInventory.attach(); + public void updateEntity() { + if (!sortingInventory.isAttached()) sortingInventory.attach(); super.updateEntity(); } @Override - public void invalidate () { + public void invalidate() { sortingInventory.detach(); super.invalidate(); } @Override - public void onChunkUnload () { + public void onChunkUnload() { sortingInventory.detach(); super.onChunkUnload(); } @Override - public void markDirty () { + public void markDirty() { super.markDirty(); sortingInventory.markDirty(); } @Override - public boolean putStackInSlot (ItemStack itemStack, int slotIndex) { + public boolean putStackInSlot(ItemStack itemStack, int slotIndex) { return sortingInventory.putStackInSlot(itemStack, slotIndex); } @Override - public ItemStack putInInventory (ItemStack itemStack, boolean simulate) { + public ItemStack putInInventory(ItemStack itemStack, boolean simulate) { return sortingInventory.putInInventory(itemStack, simulate); } @Override - public SpecialLocalizedStack getLocalizedStackInSlot (int slot) { + public SpecialLocalizedStack getLocalizedStackInSlot(int slot) { return sortingInventory.getLocalizedStackInSlot(slot); } @Override - public void alterStackSize (int slot, int alteration) { + public void alterStackSize(int slot, int alteration) { sortingInventory.alterStackSize(slot, alteration); } @Override - public ISortingInventory.Priority getPriority () { + public ISortingInventory.Priority getPriority() { return sortingInventory.getPriority(); } @Override - public void setPriority (ISortingInventory.Priority priority) { + public void setPriority(ISortingInventory.Priority priority) { sortingInventory.setPriority(priority); } @Override - public IFilter getFilter () { + public IFilter getFilter() { return sortingInventory.getFilter(); } @Override - public ISortingInventoryHandler getHandler () { + public ISortingInventoryHandler getHandler() { return sortingInventory.getHandler(); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/TileSortingDrawersStandard.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/TileSortingDrawersStandard.java index 7d91f07..bca174f 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/TileSortingDrawersStandard.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/TileSortingDrawersStandard.java @@ -8,86 +8,84 @@ import com.dynious.refinedrelocation.api.tileentity.handlers.ISortingInventoryHa import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard; import net.minecraft.item.ItemStack; -public class TileSortingDrawersStandard extends TileEntityDrawersStandard implements ISpecialSortingInventory -{ +public class TileSortingDrawersStandard extends TileEntityDrawersStandard implements ISpecialSortingInventory { private DrawerSortingInventory sortingInventory; - public TileSortingDrawersStandard () { + public TileSortingDrawersStandard() { sortingInventory = new DrawerSortingInventory(this, this, this, this); } @Override - public boolean isSorting () { + public boolean isSorting() { return true; } @Override - public boolean canUpdate () { + public boolean canUpdate() { return super.canUpdate() || !sortingInventory.isAttached(); } @Override - public void updateEntity () { - if (!sortingInventory.isAttached()) - sortingInventory.attach(); + public void updateEntity() { + if (!sortingInventory.isAttached()) sortingInventory.attach(); super.updateEntity(); } @Override - public void invalidate () { + public void invalidate() { sortingInventory.detach(); super.invalidate(); } @Override - public void onChunkUnload () { + public void onChunkUnload() { sortingInventory.detach(); super.onChunkUnload(); } @Override - public void markDirty () { + public void markDirty() { super.markDirty(); sortingInventory.markDirty(); } @Override - public boolean putStackInSlot (ItemStack itemStack, int slotIndex) { + public boolean putStackInSlot(ItemStack itemStack, int slotIndex) { return sortingInventory.putStackInSlot(itemStack, slotIndex); } @Override - public ItemStack putInInventory (ItemStack itemStack, boolean simulate) { + public ItemStack putInInventory(ItemStack itemStack, boolean simulate) { return sortingInventory.putInInventory(itemStack, simulate); } @Override - public SpecialLocalizedStack getLocalizedStackInSlot (int slot) { + public SpecialLocalizedStack getLocalizedStackInSlot(int slot) { return sortingInventory.getLocalizedStackInSlot(slot); } @Override - public void alterStackSize (int slot, int alteration) { + public void alterStackSize(int slot, int alteration) { sortingInventory.alterStackSize(slot, alteration); } @Override - public ISortingInventory.Priority getPriority () { + public ISortingInventory.Priority getPriority() { return sortingInventory.getPriority(); } @Override - public void setPriority (ISortingInventory.Priority priority) { + public void setPriority(ISortingInventory.Priority priority) { sortingInventory.setPriority(priority); } @Override - public IFilter getFilter () { + public IFilter getFilter() { return sortingInventory.getFilter(); } @Override - public ISortingInventoryHandler getHandler () { + public ISortingInventoryHandler getHandler() { return sortingInventory.getHandler(); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/TileSortingTrim.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/TileSortingTrim.java index 667f3f0..7b5c4c0 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/TileSortingTrim.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/refinedrelocation/TileSortingTrim.java @@ -17,7 +17,7 @@ public class TileSortingTrim extends TileEntity implements ISortingMember { @Override public void updateEntity() { - if(isFirstTick) { + if (isFirstTick) { sortingHandler.onTileAdded(); isFirstTick = false; } @@ -35,5 +35,4 @@ public class TileSortingTrim extends TileEntity implements ISortingMember { sortingHandler.onTileRemoved(); super.onChunkUnload(); } - } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/thermalfoundation/CoFHSecurityProvider.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/thermalfoundation/CoFHSecurityProvider.java index 68f3243..4624741 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/thermalfoundation/CoFHSecurityProvider.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/thermalfoundation/CoFHSecurityProvider.java @@ -6,33 +6,31 @@ import com.jaquadro.minecraft.storagedrawers.integration.ThermalFoundation; import com.jaquadro.minecraft.storagedrawers.security.DefaultSecurityProvider; import com.mojang.authlib.GameProfile; -public class CoFHSecurityProvider implements ISecurityProvider -{ +public class CoFHSecurityProvider implements ISecurityProvider { ThermalFoundation foundation; private DefaultSecurityProvider defaultProvider = new DefaultSecurityProvider(); - public CoFHSecurityProvider (ThermalFoundation foundation) { + public CoFHSecurityProvider(ThermalFoundation foundation) { this.foundation = foundation; } @Override - public String getProviderID () { + public String getProviderID() { return "cofh"; } @Override - public boolean hasOwnership (GameProfile profile, IProtectable target) { + public boolean hasOwnership(GameProfile profile, IProtectable target) { return defaultProvider.hasOwnership(profile, target); } @Override - public boolean hasAccess (GameProfile profile, IProtectable target) { - if (target.getOwner() == null) - return true; + public boolean hasAccess(GameProfile profile, IProtectable target) { + if (target.getOwner() == null) return true; GameProfile ownerProfile = (profile.getId().equals(target.getOwner())) - ? new GameProfile(profile.getId(), profile.getName()) - : new GameProfile(target.getOwner(), null); + ? new GameProfile(profile.getId(), profile.getName()) + : new GameProfile(target.getOwner(), null); return foundation.playerHasAccess(profile.getName(), ownerProfile); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java index 65782d6..04f10d2 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java @@ -1,7 +1,8 @@ package com.jaquadro.minecraft.storagedrawers.inventory; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; -import com.jaquadro.minecraft.storagedrawers.core.ModItems; +import java.util.ArrayList; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -9,11 +10,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import java.util.ArrayList; -import java.util.List; - -public class ContainerDrawers extends Container -{ +public class ContainerDrawers extends Container { private static final int InventoryX = 8; private static final int InventoryY = 117; private static final int HotbarY = 175; @@ -29,14 +26,15 @@ public class ContainerDrawers extends Container private List playerSlots; private List hotbarSlots; - public ContainerDrawers (InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { - //storageInventory = new InventoryStorage(tileEntity, this); + public ContainerDrawers(InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { + // storageInventory = new InventoryStorage(tileEntity, this); storageInventory = new InventoryStorage(tileEntity); upgradeInventory = new InventoryUpgrade(tileEntity); storageSlots = new ArrayList(); for (int i = 0; i < tileEntity.getDrawerCount(); i++) - storageSlots.add(addSlotToContainer(new SlotStorage(storageInventory, i, getStorageSlotX(i), getStorageSlotY(i)))); + storageSlots.add( + addSlotToContainer(new SlotStorage(storageInventory, i, getStorageSlotX(i), getStorageSlotY(i)))); upgradeSlots = new ArrayList(); for (int i = 0; i < 5; i++) @@ -45,7 +43,8 @@ public class ContainerDrawers extends Container playerSlots = new ArrayList(); for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) - playerSlots.add(addSlotToContainer(new Slot(playerInventory, j + i * 9 + 9, InventoryX + j * 18, InventoryY + i * 18))); + playerSlots.add(addSlotToContainer( + new Slot(playerInventory, j + i * 9 + 9, InventoryX + j * 18, InventoryY + i * 18))); } hotbarSlots = new ArrayList(); @@ -53,33 +52,33 @@ public class ContainerDrawers extends Container hotbarSlots.add(addSlotToContainer(new Slot(playerInventory, i, InventoryX + i * 18, HotbarY))); } - public InventoryStorage getStorageInventory () { - return (InventoryStorage)storageInventory; + public InventoryStorage getStorageInventory() { + return (InventoryStorage) storageInventory; } - protected int getStorageSlotX (int slot) { + protected int getStorageSlotX(int slot) { return 0; } - protected int getStorageSlotY (int slot) { + protected int getStorageSlotY(int slot) { return 0; } - public List getStorageSlots () { + public List getStorageSlots() { return storageSlots; } - public List getUpgradeSlots () { + public List getUpgradeSlots() { return upgradeSlots; } @Override - public boolean canInteractWith (EntityPlayer player) { + public boolean canInteractWith(EntityPlayer player) { return storageInventory.isUseableByPlayer(player) || upgradeInventory.isUseableByPlayer(player); } @Override - public ItemStack transferStackInSlot (EntityPlayer player, int slotIndex) { + public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { ItemStack itemStack = null; Slot slot = (Slot) inventorySlots.get(slotIndex); @@ -99,8 +98,7 @@ public class ContainerDrawers extends Container // Try merge upgrades to inventory if (slotIndex >= upgradeStart && slotIndex < upgradeEnd) { - if (!mergeItemStack(slotStack, inventoryStart, hotbarEnd, true)) - return null; + if (!mergeItemStack(slotStack, inventoryStart, hotbarEnd, true)) return null; slot.onSlotChange(slotStack, itemStack); } @@ -123,23 +121,19 @@ public class ContainerDrawers extends Container }*/ if (slotIndex >= inventoryStart && slotIndex < hotbarStart) { - if (!mergeItemStack(slotStack, hotbarStart, hotbarEnd, false)) - return null; - } else if (slotIndex >= hotbarStart && slotIndex < hotbarEnd && !mergeItemStack(slotStack, inventoryStart, hotbarStart, false)) - return null; + if (!mergeItemStack(slotStack, hotbarStart, hotbarEnd, false)) return null; + } else if (slotIndex >= hotbarStart + && slotIndex < hotbarEnd + && !mergeItemStack(slotStack, inventoryStart, hotbarStart, false)) return null; } // Try merge stack into inventory - else if (!mergeItemStack(slotStack, inventoryStart, hotbarEnd, false)) - return null; + else if (!mergeItemStack(slotStack, inventoryStart, hotbarEnd, false)) return null; - if (slotStack.stackSize == 0) - slot.putStack(null); - else - slot.onSlotChanged(); + if (slotStack.stackSize == 0) slot.putStack(null); + else slot.onSlotChanged(); - if (slotStack.stackSize == itemStack.stackSize) - return null; + if (slotStack.stackSize == itemStack.stackSize) return null; slot.onPickupFromSlot(player, slotStack); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers1.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers1.java index b8c1a8e..eb59520 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers1.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers1.java @@ -3,23 +3,20 @@ package com.jaquadro.minecraft.storagedrawers.inventory; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import net.minecraft.entity.player.InventoryPlayer; -public class ContainerDrawers1 extends ContainerDrawers -{ - private static final int[][] slotCoordinates = new int[][] { - { 80, 36 } - }; +public class ContainerDrawers1 extends ContainerDrawers { + private static final int[][] slotCoordinates = new int[][] {{80, 36}}; - public ContainerDrawers1 (InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { + public ContainerDrawers1(InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { super(playerInventory, tileEntity); } @Override - protected int getStorageSlotX (int slot) { + protected int getStorageSlotX(int slot) { return slotCoordinates[slot][0]; } @Override - protected int getStorageSlotY (int slot) { + protected int getStorageSlotY(int slot) { return slotCoordinates[slot][1]; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers2.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers2.java index b7fd977..8d401c9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers2.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers2.java @@ -3,23 +3,20 @@ package com.jaquadro.minecraft.storagedrawers.inventory; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import net.minecraft.entity.player.InventoryPlayer; -public class ContainerDrawers2 extends ContainerDrawers -{ - private static final int[][] slotCoordinates = new int[][] { - { 80, 23 }, { 80, 49 } - }; +public class ContainerDrawers2 extends ContainerDrawers { + private static final int[][] slotCoordinates = new int[][] {{80, 23}, {80, 49}}; - public ContainerDrawers2 (InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { + public ContainerDrawers2(InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { super(playerInventory, tileEntity); } @Override - protected int getStorageSlotX (int slot) { + protected int getStorageSlotX(int slot) { return slotCoordinates[slot][0]; } @Override - protected int getStorageSlotY (int slot) { + protected int getStorageSlotY(int slot) { return slotCoordinates[slot][1]; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers4.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers4.java index b48b859..fb1112f 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers4.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers4.java @@ -3,24 +3,20 @@ package com.jaquadro.minecraft.storagedrawers.inventory; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import net.minecraft.entity.player.InventoryPlayer; -public class ContainerDrawers4 extends ContainerDrawers -{ - private static final int[][] slotCoordinates = new int[][] { - { 67, 23 }, { 67, 49 }, { 93, 23 }, { 93, 49 } - }; +public class ContainerDrawers4 extends ContainerDrawers { + private static final int[][] slotCoordinates = new int[][] {{67, 23}, {67, 49}, {93, 23}, {93, 49}}; - public ContainerDrawers4 (InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { + public ContainerDrawers4(InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { super(playerInventory, tileEntity); } @Override - protected int getStorageSlotX (int slot) { + protected int getStorageSlotX(int slot) { return slotCoordinates[slot][0]; } @Override - protected int getStorageSlotY (int slot) { + protected int getStorageSlotY(int slot) { return slotCoordinates[slot][1]; } } - diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawersComp.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawersComp.java index eafabf8..8307f60 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawersComp.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawersComp.java @@ -3,23 +3,20 @@ package com.jaquadro.minecraft.storagedrawers.inventory; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import net.minecraft.entity.player.InventoryPlayer; -public class ContainerDrawersComp extends ContainerDrawers -{ - private static final int[][] slotCoordinates = new int[][] { - { 80, 23 }, { 67, 49 }, { 93, 49 } - }; +public class ContainerDrawersComp extends ContainerDrawers { + private static final int[][] slotCoordinates = new int[][] {{80, 23}, {67, 49}, {93, 49}}; - public ContainerDrawersComp (InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { + public ContainerDrawersComp(InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { super(playerInventory, tileEntity); } @Override - protected int getStorageSlotX (int slot) { + protected int getStorageSlotX(int slot) { return slotCoordinates[slot][0]; } @Override - protected int getStorageSlotY (int slot) { + protected int getStorageSlotY(int slot) { return slotCoordinates[slot][1]; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerFramingTable.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerFramingTable.java index d50f9bf..c2e6262 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerFramingTable.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerFramingTable.java @@ -5,6 +5,8 @@ import com.jaquadro.minecraft.storagedrawers.block.BlockTrimCustom; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityFramingTable; import com.jaquadro.minecraft.storagedrawers.item.ItemCustomDrawers; import com.jaquadro.minecraft.storagedrawers.item.ItemCustomTrim; +import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -14,11 +16,7 @@ import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import java.util.ArrayList; -import java.util.List; - -public class ContainerFramingTable extends Container -{ +public class ContainerFramingTable extends Container { private static final int InventoryX = 8; private static final int InventoryY = 84; private static final int HotbarY = 142; @@ -45,19 +43,21 @@ public class ContainerFramingTable extends Container private List playerSlots; private List hotbarSlots; - public ContainerFramingTable (InventoryPlayer inventory, TileEntityFramingTable tileEntity) { + public ContainerFramingTable(InventoryPlayer inventory, TileEntityFramingTable tileEntity) { tableInventory = new InventoryContainerProxy(tileEntity, this); inputSlot = addSlotToContainer(new SlotRestricted(tableInventory, 0, InputX, InputY)); materialSideSlot = addSlotToContainer(new SlotRestricted(tableInventory, 1, MaterialSideX, MaterialSideY)); materialTrimSlot = addSlotToContainer(new SlotRestricted(tableInventory, 2, MaterialTrimX, MaterialTrimY)); materialFrontSlot = addSlotToContainer(new SlotRestricted(tableInventory, 3, MaterialFrontX, MaterialFrontY)); - outputSlot = addSlotToContainer(new SlotCraftResult(inventory.player, tableInventory, craftResult, new int[] { 0, 1, 2, 3 }, 4, OutputX, OutputY)); + outputSlot = addSlotToContainer(new SlotCraftResult( + inventory.player, tableInventory, craftResult, new int[] {0, 1, 2, 3}, 4, OutputX, OutputY)); playerSlots = new ArrayList(); for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) - playerSlots.add(addSlotToContainer(new Slot(inventory, j + i * 9 + 9, InventoryX + j * 18, InventoryY + i * 18))); + playerSlots.add(addSlotToContainer( + new Slot(inventory, j + i * 9 + 9, InventoryX + j * 18, InventoryY + i * 18))); } hotbarSlots = new ArrayList(); @@ -68,12 +68,12 @@ public class ContainerFramingTable extends Container } @Override - public boolean canInteractWith (EntityPlayer player) { + public boolean canInteractWith(EntityPlayer player) { return tableInventory.isUseableByPlayer(player); } @Override - public void onCraftMatrixChanged (IInventory inventory) { + public void onCraftMatrixChanged(IInventory inventory) { ItemStack target = tableInventory.getStackInSlot(inputSlot.getSlotIndex()); ItemStack matSide = tableInventory.getStackInSlot(materialSideSlot.getSlotIndex()); ItemStack matTrim = tableInventory.getStackInSlot(materialTrimSlot.getSlotIndex()); @@ -83,11 +83,11 @@ public class ContainerFramingTable extends Container Block block = Block.getBlockFromItem(target.getItem()); if (block instanceof BlockDrawersCustom) { if (matSide != null) { - craftResult.setInventorySlotContents(0, ItemCustomDrawers.makeItemStack(block, 1, matSide, matTrim, matFront)); + craftResult.setInventorySlotContents( + 0, ItemCustomDrawers.makeItemStack(block, 1, matSide, matTrim, matFront)); return; } - } - else if (block instanceof BlockTrimCustom) { + } else if (block instanceof BlockTrimCustom) { if (matSide != null) { craftResult.setInventorySlotContents(0, ItemCustomTrim.makeItemStack(block, 1, matSide, matTrim)); return; @@ -99,7 +99,7 @@ public class ContainerFramingTable extends Container } @Override - public ItemStack transferStackInSlot (EntityPlayer player, int slotIndex) { + public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { ItemStack itemStack = null; Slot slot = (Slot) inventorySlots.get(slotIndex); @@ -114,8 +114,7 @@ public class ContainerFramingTable extends Container // Try merge output into inventory and signal change if (slotIndex == outputSlot.slotNumber) { - if (!mergeItemStack(slotStack, inventoryStart, hotbarEnd, true)) - return null; + if (!mergeItemStack(slotStack, inventoryStart, hotbarEnd, true)) return null; slot.onSlotChange(slotStack, itemStack); } @@ -125,28 +124,25 @@ public class ContainerFramingTable extends Container if (TileEntityFramingTable.isItemValidDrawer(slotStack)) merged = mergeItemStack(slotStack, inputSlot.slotNumber, inputSlot.slotNumber + 1, false); if (TileEntityFramingTable.isItemValidMaterial(slotStack)) - merged = mergeItemStack(slotStack, materialSideSlot.slotNumber, materialFrontSlot.slotNumber + 1, false); + merged = mergeItemStack( + slotStack, materialSideSlot.slotNumber, materialFrontSlot.slotNumber + 1, false); if (!merged) { if (slotIndex >= inventoryStart && slotIndex < hotbarStart) { - if (!mergeItemStack(slotStack, hotbarStart, hotbarEnd, false)) - return null; - } else if (slotIndex >= hotbarStart && slotIndex < hotbarEnd && !this.mergeItemStack(slotStack, inventoryStart, hotbarStart, false)) - return null; + if (!mergeItemStack(slotStack, hotbarStart, hotbarEnd, false)) return null; + } else if (slotIndex >= hotbarStart + && slotIndex < hotbarEnd + && !this.mergeItemStack(slotStack, inventoryStart, hotbarStart, false)) return null; } } // Try merge stack into inventory - else if (!mergeItemStack(slotStack, inventoryStart, hotbarEnd, false)) - return null; + else if (!mergeItemStack(slotStack, inventoryStart, hotbarEnd, false)) return null; - if (slotStack.stackSize == 0) - slot.putStack(null); - else - slot.onSlotChanged(); + if (slotStack.stackSize == 0) slot.putStack(null); + else slot.onSlotChanged(); - if (slotStack.stackSize == itemStack.stackSize) - return null; + if (slotStack.stackSize == itemStack.stackSize) return null; slot.onPickupFromSlot(player, slotStack); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ISideManager.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ISideManager.java index 8d8f2d9..5614e10 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ISideManager.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ISideManager.java @@ -3,7 +3,6 @@ package com.jaquadro.minecraft.storagedrawers.inventory; /** * Created by Justin on 11/9/2014. */ -public interface ISideManager -{ - public int[] getSlotsForSide (int side); +public interface ISideManager { + public int[] getSlotsForSide(int side); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryContainerProxy.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryContainerProxy.java index 6d8aacc..ceb095a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryContainerProxy.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryContainerProxy.java @@ -5,90 +5,87 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -public class InventoryContainerProxy implements IInventory -{ +public class InventoryContainerProxy implements IInventory { private IInventory parent; private Container container; - public InventoryContainerProxy (IInventory parentInventory, Container container) { + public InventoryContainerProxy(IInventory parentInventory, Container container) { this.parent = parentInventory; this.container = container; } @Override - public int getSizeInventory () { + public int getSizeInventory() { return parent.getSizeInventory(); } @Override - public ItemStack getStackInSlot (int slot) { + public ItemStack getStackInSlot(int slot) { return parent.getStackInSlot(slot); } @Override - public ItemStack decrStackSize (int slot, int count) { + public ItemStack decrStackSize(int slot, int count) { ItemStack stack = parent.getStackInSlot(slot); - if (stack == null) - return null; + if (stack == null) return null; int stackCount = stack.stackSize; ItemStack result = parent.decrStackSize(slot, count); ItemStack stackAfter = parent.getStackInSlot(slot); - if (stack != stackAfter || stackCount != stackAfter.stackSize) - container.onCraftMatrixChanged(this); + if (stack != stackAfter || stackCount != stackAfter.stackSize) container.onCraftMatrixChanged(this); return result; } @Override - public ItemStack getStackInSlotOnClosing (int slot) { + public ItemStack getStackInSlotOnClosing(int slot) { return parent.getStackInSlotOnClosing(slot); } @Override - public void setInventorySlotContents (int slot, ItemStack stack) { + public void setInventorySlotContents(int slot, ItemStack stack) { parent.setInventorySlotContents(slot, stack); container.onCraftMatrixChanged(this); } @Override - public String getInventoryName () { + public String getInventoryName() { return parent.getInventoryName(); } @Override - public boolean hasCustomInventoryName () { + public boolean hasCustomInventoryName() { return parent.hasCustomInventoryName(); } @Override - public int getInventoryStackLimit () { + public int getInventoryStackLimit() { return parent.getInventoryStackLimit(); } @Override - public void markDirty () { + public void markDirty() { parent.markDirty(); } @Override - public boolean isUseableByPlayer (EntityPlayer player) { + public boolean isUseableByPlayer(EntityPlayer player) { return parent.isUseableByPlayer(player); } @Override - public void openInventory () { + public void openInventory() { parent.openInventory(); } @Override - public void closeInventory () { + public void closeInventory() { parent.closeInventory(); } @Override - public boolean isItemValidForSlot (int slot, ItemStack stack) { + public boolean isItemValidForSlot(int slot, ItemStack stack) { return parent.isItemValidForSlot(slot, stack); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java index e3fb051..2ff0c8a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java @@ -2,19 +2,18 @@ package com.jaquadro.minecraft.storagedrawers.inventory; import net.minecraft.item.ItemStack; -public abstract class InventoryStack -{ +public abstract class InventoryStack { private ItemStack inStack; private ItemStack outStack; private int inCount; private int outCount; - public void init () { + public void init() { reset(); } - public void reset () { + public void reset() { inStack = getNewItemStack(); outStack = getNewItemStack(); @@ -24,23 +23,20 @@ public abstract class InventoryStack refresh(); } - public ItemStack getInStack () { - if (inStack == null || inStack.stackSize == 0) - return null; + public ItemStack getInStack() { + if (inStack == null || inStack.stackSize == 0) return null; return inStack; } - public ItemStack getOutStack () { + public ItemStack getOutStack() { return outStack; } - public void setInStack (ItemStack stack) { + public void setInStack(ItemStack stack) { if (stack != null) { - if (inStack == null) - applyDiff(stack.stackSize); - else - applyDiff(stack.stackSize - inCount); + if (inStack == null) applyDiff(stack.stackSize); + else applyDiff(stack.stackSize - inCount); } inStack = null; @@ -49,7 +45,7 @@ public abstract class InventoryStack setOutStack(outStack); } - private void syncInStack () { + private void syncInStack() { if (inStack == null) { inStack = getNewItemStack(); inCount = 0; @@ -65,19 +61,17 @@ public abstract class InventoryStack } } - public void setOutStack (ItemStack stack) { + public void setOutStack(ItemStack stack) { if (outStack != null) { - if (stack == null) - applyDiff(0 - outCount); - else - applyDiff(0 - outCount + stack.stackSize); + if (stack == null) applyDiff(0 - outCount); + else applyDiff(0 - outCount + stack.stackSize); } outStack = stack; syncOutStack(); } - private void syncOutStack () { + private void syncOutStack() { if (outStack == null) { outStack = getNewItemStack(); outCount = 0; @@ -92,17 +86,20 @@ public abstract class InventoryStack } } - protected abstract ItemStack getNewItemStack (); - protected abstract int getItemStackSize (); - protected abstract int getItemCount (); - protected abstract int getItemCapacity (); + protected abstract ItemStack getNewItemStack(); - public void markDirty () { + protected abstract int getItemStackSize(); + + protected abstract int getItemCount(); + + protected abstract int getItemCapacity(); + + public void markDirty() { applyDiff(getDiff()); refresh(); } - public boolean markDirtyIfNeeded () { + public boolean markDirtyIfNeeded() { int diff = getDiff(); if (diff != 0) { applyDiff(diff); @@ -113,16 +110,16 @@ public abstract class InventoryStack return false; } - public int getDiff () { + public int getDiff() { int diffIn = ((inStack == null) ? 0 : inStack.stackSize) - inCount; int diffOut = ((outStack == null) ? 0 : outStack.stackSize) - outCount; return diffIn + diffOut; } - protected abstract void applyDiff (int diff); + protected abstract void applyDiff(int diff); - protected void refresh () { + protected void refresh() { int itemStackLimit = getItemStackSize(); int itemCount = getItemCount(); int remainingLimit = getItemCapacity() - itemCount; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java index fefa92d..79a63f5 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java @@ -1,33 +1,29 @@ package com.jaquadro.minecraft.storagedrawers.inventory; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.client.renderer.StorageRenderItem; -import cpw.mods.fml.common.asm.transformers.ItemStackTransformer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -public class InventoryStorage implements IInventory -{ +public class InventoryStorage implements IInventory { public StorageRenderItem activeRenderItem; private static class InventorySnapshot { private ItemStack[] snapshotItems; private int[] snapshotCounts; - public InventorySnapshot (int size) { + public InventorySnapshot(int size) { snapshotItems = new ItemStack[size]; snapshotCounts = new int[snapshotItems.length]; } - public ItemStack takeSnapshot (ItemStack stack, int slot) { + public ItemStack takeSnapshot(ItemStack stack, int slot) { if (stack != null) { snapshotItems[slot] = stack; snapshotCounts[slot] = stack.stackSize; - } - else { + } else { snapshotItems[slot] = null; snapshotCounts[slot] = 0; } @@ -35,14 +31,13 @@ public class InventoryStorage implements IInventory return stack; } - public int getDiff (int slot) { - if (snapshotItems[slot] == null) - return 0; + public int getDiff(int slot) { + if (snapshotItems[slot] == null) return 0; return snapshotItems[slot].stackSize - snapshotCounts[slot]; } - public int splitDiff (int slot) { + public int splitDiff(int slot) { int diff = getDiff(slot); if (diff != 0) { snapshotCounts[slot] = snapshotItems[slot].stackSize; @@ -55,77 +50,71 @@ public class InventoryStorage implements IInventory private TileEntityDrawers tile; private InventorySnapshot snapshot; - public InventoryStorage (TileEntityDrawers tileEntity) { + public InventoryStorage(TileEntityDrawers tileEntity) { tile = tileEntity; snapshot = new InventorySnapshot(tile.getSizeInventory()); } @Override - public int getSizeInventory () { + public int getSizeInventory() { return tile.getSizeInventory(); } @Override - public ItemStack getStackInSlot (int slot) { + public ItemStack getStackInSlot(int slot) { int drawerSlot = tile.getDrawerInventory().getDrawerSlot(slot); - if (!tile.isDrawerEnabled(drawerSlot)) - return null; + if (!tile.isDrawerEnabled(drawerSlot)) return null; IDrawer drawer = tile.getDrawer(drawerSlot); ItemStack stack = drawer.getStoredItemCopy(); - if (stack == null) - return null; + if (stack == null) return null; stack.stackSize = drawer.getStoredItemCount(); ItemStack snapStack = snapshot.takeSnapshot(stack, slot); - if (activeRenderItem != null) - activeRenderItem.overrideStack = snapStack; + if (activeRenderItem != null) activeRenderItem.overrideStack = snapStack; return snapStack; } @Override - public ItemStack decrStackSize (int slot, int count) { + public ItemStack decrStackSize(int slot, int count) { return snapshot.takeSnapshot(tile.decrStackSize(slot, count), slot); } @Override - public ItemStack getStackInSlotOnClosing (int slot) { + public ItemStack getStackInSlotOnClosing(int slot) { return null; } @Override - public void setInventorySlotContents (int slot, ItemStack stack) { - - } + public void setInventorySlotContents(int slot, ItemStack stack) {} @Override - public String getInventoryName () { + public String getInventoryName() { return tile.getInventoryName(); } @Override - public boolean hasCustomInventoryName () { + public boolean hasCustomInventoryName() { return tile.hasCustomInventoryName(); } @Override - public int getInventoryStackLimit () { + public int getInventoryStackLimit() { int limit = tile.getInventoryStackLimit(); return (limit > 64) ? 64 : limit; } @Override - public void markDirty () { + public void markDirty() { for (int i = 0, n = getSizeInventory(); i < n; i++) { int diff = snapshot.splitDiff(i); if (diff != 0) { ItemStack stack = tile.getStackInSlot(i); - if (stack != null) - stack.stackSize += diff; - //else if (diff > 0) + if (stack != null) stack.stackSize += diff; + // else if (diff > 0) // tile.setInventorySlotContents(i, snapshot.); } } @@ -134,22 +123,18 @@ public class InventoryStorage implements IInventory } @Override - public boolean isUseableByPlayer (EntityPlayer player) { + public boolean isUseableByPlayer(EntityPlayer player) { return tile.isUseableByPlayer(player); } @Override - public void openInventory () { - - } + public void openInventory() {} @Override - public void closeInventory () { - - } + public void closeInventory() {} @Override - public boolean isItemValidForSlot (int slot, ItemStack stack) { + public boolean isItemValidForSlot(int slot, ItemStack stack) { return tile.isItemValidForSlot(slot, stack); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryUpgrade.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryUpgrade.java index 8ba5f3c..09e7676 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryUpgrade.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryUpgrade.java @@ -3,7 +3,6 @@ package com.jaquadro.minecraft.storagedrawers.inventory; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; -import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import com.jaquadro.minecraft.storagedrawers.item.ItemUpgrade; import com.jaquadro.minecraft.storagedrawers.item.ItemUpgradeStatus; import com.jaquadro.minecraft.storagedrawers.item.ItemUpgradeVoid; @@ -11,114 +10,105 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -public class InventoryUpgrade implements IInventory -{ +public class InventoryUpgrade implements IInventory { private static final int upgradeCapacity = 5; private TileEntityDrawers tile; - public InventoryUpgrade (TileEntityDrawers tileEntity) { + public InventoryUpgrade(TileEntityDrawers tileEntity) { tile = tileEntity; } @Override - public int getSizeInventory () { + public int getSizeInventory() { return upgradeCapacity; } @Override - public ItemStack getStackInSlot (int slot) { + public ItemStack getStackInSlot(int slot) { return tile.getUpgrade(slot); } @Override - public ItemStack decrStackSize (int slot, int count) { + public ItemStack decrStackSize(int slot, int count) { ItemStack stack = tile.getUpgrade(slot); - if (count > 0) - tile.setUpgrade(slot, null); + if (count > 0) tile.setUpgrade(slot, null); return stack; } @Override - public ItemStack getStackInSlotOnClosing (int slot) { + public ItemStack getStackInSlotOnClosing(int slot) { return null; } @Override - public void setInventorySlotContents (int slot, ItemStack item) { - //if (item != null && item.stackSize > getInventoryStackLimit()) + public void setInventorySlotContents(int slot, ItemStack item) { + // if (item != null && item.stackSize > getInventoryStackLimit()) // item.stackSize = getInventoryStackLimit(); tile.setUpgrade(slot, item); } @Override - public String getInventoryName () { + public String getInventoryName() { return tile.getInventoryName(); } @Override - public boolean hasCustomInventoryName () { + public boolean hasCustomInventoryName() { return tile.hasCustomInventoryName(); } @Override - public int getInventoryStackLimit () { + public int getInventoryStackLimit() { return 1; } @Override - public void markDirty () { + public void markDirty() { tile.markDirty(); } @Override - public boolean isUseableByPlayer (EntityPlayer player) { + public boolean isUseableByPlayer(EntityPlayer player) { return tile.isUseableByPlayer(player); } @Override - public void openInventory () { - - } + public void openInventory() {} @Override - public void closeInventory () { - - } + public void closeInventory() {} @Override - public boolean isItemValidForSlot (int slot, ItemStack item) { - if (item.getItem() instanceof ItemUpgrade || item.getItem() instanceof ItemUpgradeStatus || item.getItem() instanceof ItemUpgradeVoid) - return true; + public boolean isItemValidForSlot(int slot, ItemStack item) { + if (item.getItem() instanceof ItemUpgrade + || item.getItem() instanceof ItemUpgradeStatus + || item.getItem() instanceof ItemUpgradeVoid) return true; return false; } - public boolean canRemoveStorageUpgrade (int storageLevel) { + public boolean canRemoveStorageUpgrade(int storageLevel) { return canRemoveStorageUpgrade(tile, storageLevel); } - private boolean canRemoveStorageUpgrade (TileEntityDrawers tile, int storageLevel) { + private boolean canRemoveStorageUpgrade(TileEntityDrawers tile, int storageLevel) { int storageMult = StorageDrawers.config.getStorageUpgradeMultiplier(storageLevel); int effectiveStorageMult = tile.getEffectiveStorageMultiplier(); - if (effectiveStorageMult == storageMult) - storageMult--; + if (effectiveStorageMult == storageMult) storageMult--; int addedStackCapacity = storageMult * tile.getDrawerCapacity(); for (int i = 0; i < tile.getDrawerCount(); i++) { - if (!tile.isDrawerEnabled(i)) - continue; + if (!tile.isDrawerEnabled(i)) continue; IDrawer drawer = tile.getDrawer(i); - if (drawer.isEmpty()) - continue; + if (drawer.isEmpty()) continue; int addedItemCapacity = addedStackCapacity * drawer.getStoredItemStackSize(); - if (drawer.getMaxCapacity() - addedItemCapacity < drawer.getStoredItemCount()) - return false; + if (drawer.getMaxCapacity() - addedItemCapacity < drawer.getStoredItemCount()) return false; } return true; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotCraftResult.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotCraftResult.java index 8910619..4b890d7 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotCraftResult.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotCraftResult.java @@ -8,14 +8,20 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; -public class SlotCraftResult extends Slot -{ +public class SlotCraftResult extends Slot { private final IInventory inputInventory; private final int[] inputSlots; private EntityPlayer player; private int amountCrafted; - public SlotCraftResult (EntityPlayer player, IInventory inputInventory, IInventory inventory, int[] inputSlots, int slot, int x, int y) { + public SlotCraftResult( + EntityPlayer player, + IInventory inputInventory, + IInventory inventory, + int[] inputSlots, + int slot, + int x, + int y) { super(inventory, slot, x, y); this.player = player; @@ -24,32 +30,31 @@ public class SlotCraftResult extends Slot } @Override - public boolean isItemValid (ItemStack stack) { + public boolean isItemValid(ItemStack stack) { return false; } @Override - public ItemStack decrStackSize (int count) { - if (getHasStack()) - amountCrafted += Math.min(count, getStack().stackSize); + public ItemStack decrStackSize(int count) { + if (getHasStack()) amountCrafted += Math.min(count, getStack().stackSize); return super.decrStackSize(count); } @Override - protected void onCrafting (ItemStack stack, int count) { + protected void onCrafting(ItemStack stack, int count) { amountCrafted += count; super.onCrafting(stack, count); } @Override - protected void onCrafting (ItemStack stack) { + protected void onCrafting(ItemStack stack) { stack.onCrafting(player.worldObj, player, amountCrafted); amountCrafted = 0; } @Override - public void onPickupFromSlot (EntityPlayer player, ItemStack itemStack) { + public void onPickupFromSlot(EntityPlayer player, ItemStack itemStack) { FMLCommonHandler.instance().firePlayerCraftingEvent(player, itemStack, inputInventory); onCrafting(itemStack); @@ -60,16 +65,18 @@ public class SlotCraftResult extends Slot if (itemTarget.getItem().hasContainerItem(itemTarget)) { ItemStack itemContainer = itemTarget.getItem().getContainerItem(itemTarget); - if (itemContainer != null && itemContainer.isItemStackDamageable() && itemContainer.getItemDamage() > itemContainer.getMaxDamage()) { + if (itemContainer != null + && itemContainer.isItemStackDamageable() + && itemContainer.getItemDamage() > itemContainer.getMaxDamage()) { MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(this.player, itemContainer)); continue; } - if (!itemTarget.getItem().doesContainerItemLeaveCraftingGrid(itemTarget) || !this.player.inventory.addItemStackToInventory(itemContainer)) { + if (!itemTarget.getItem().doesContainerItemLeaveCraftingGrid(itemTarget) + || !this.player.inventory.addItemStackToInventory(itemContainer)) { if (inputInventory.getStackInSlot(slot) == null) inputInventory.setInventorySlotContents(slot, itemContainer); - else - this.player.dropPlayerItemWithRandomChoice(itemContainer, false); + else this.player.dropPlayerItemWithRandomChoice(itemContainer, false); } } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotRestricted.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotRestricted.java index 7d1d208..a43322a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotRestricted.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotRestricted.java @@ -4,14 +4,13 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class SlotRestricted extends Slot -{ - public SlotRestricted (IInventory inventory, int slotIndex, int xDisplayPosition, int yDisplayPosition) { +public class SlotRestricted extends Slot { + public SlotRestricted(IInventory inventory, int slotIndex, int xDisplayPosition, int yDisplayPosition) { super(inventory, slotIndex, xDisplayPosition, yDisplayPosition); } @Override - public boolean isItemValid (ItemStack stack) { + public boolean isItemValid(ItemStack stack) { return inventory.isItemValidForSlot(getSlotIndex(), stack); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotStorage.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotStorage.java index 0b34aa7..1745638 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotStorage.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotStorage.java @@ -4,14 +4,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -public class SlotStorage extends Slot -{ - public SlotStorage (IInventory inventory, int index, int x, int y) { +public class SlotStorage extends Slot { + public SlotStorage(IInventory inventory, int index, int x, int y) { super(inventory, index, x, y); } @Override - public boolean canTakeStack (EntityPlayer player) { + public boolean canTakeStack(EntityPlayer player) { return false; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotUpgrade.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotUpgrade.java index 8754eac..bec994e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotUpgrade.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotUpgrade.java @@ -6,14 +6,13 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class SlotUpgrade extends Slot -{ - public SlotUpgrade (IInventory inventory, int index, int x, int y) { +public class SlotUpgrade extends Slot { + public SlotUpgrade(IInventory inventory, int index, int x, int y) { super(inventory, index, x, y); } @Override - public boolean canTakeStack (EntityPlayer player) { + public boolean canTakeStack(EntityPlayer player) { if (inventory instanceof InventoryUpgrade) { ItemStack stack = getStack(); if (stack != null && stack.getItem() == ModItems.upgrade) @@ -27,7 +26,7 @@ public class SlotUpgrade extends Slot return true; } - public boolean canTakeStack () { + public boolean canTakeStack() { return canTakeStack(null); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java index 7d5ec7e..8698488 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java @@ -1,19 +1,18 @@ package com.jaquadro.minecraft.storagedrawers.inventory; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.inventory.IDrawerInventory; import com.jaquadro.minecraft.storagedrawers.api.inventory.IInventoryAdapter; import com.jaquadro.minecraft.storagedrawers.api.inventory.SlotType; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; -import com.jaquadro.minecraft.storagedrawers.api.inventory.IDrawerInventory; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ILockable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; import com.jaquadro.minecraft.storagedrawers.storage.IUpgradeProvider; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -public class StorageInventory implements IDrawerInventory -{ +public class StorageInventory implements IDrawerInventory { private static final int[] emptySlots = new int[0]; private final IDrawerGroup group; @@ -22,48 +21,43 @@ public class StorageInventory implements IDrawerInventory private final int[] inventorySlots; - public StorageInventory (IDrawerGroup drawerGroup, ISideManager sideManager, IUpgradeProvider upgradeProvider) { + public StorageInventory(IDrawerGroup drawerGroup, ISideManager sideManager, IUpgradeProvider upgradeProvider) { group = drawerGroup; sideMan = sideManager; upgrade = upgradeProvider; inventorySlots = new int[group.getDrawerCount() * SlotType.values.length]; - for (int i = 0, n = inventorySlots.length; i < n; i++) - inventorySlots[i] = i; + for (int i = 0, n = inventorySlots.length; i < n; i++) inventorySlots[i] = i; } @Override - public int getDrawerSlot (int inventorySlot) { + public int getDrawerSlot(int inventorySlot) { return inventorySlot % group.getDrawerCount(); } @Override - public SlotType getInventorySlotType (int inventorySlot) { + public SlotType getInventorySlotType(int inventorySlot) { return SlotType.values[inventorySlot / group.getDrawerCount()]; } @Override - public int getInventorySlot (int drawerSlot, SlotType type) { + public int getInventorySlot(int drawerSlot, SlotType type) { return group.getDrawerCount() * type.ordinal() + drawerSlot; } @Override - public boolean canInsertItem (int slot, ItemStack stack) { - if (!StorageDrawers.config.cache.enableSidedInput) - return false; + public boolean canInsertItem(int slot, ItemStack stack) { + if (!StorageDrawers.config.cache.enableSidedInput) return false; int lowerThresh = SlotType.INPUT.ordinal() * group.getDrawerCount(); int upperThresh = lowerThresh + group.getDrawerCount(); - if (slot < lowerThresh || slot >= upperThresh) - return false; + if (slot < lowerThresh || slot >= upperThresh) return false; int baseSlot = getDrawerSlot(slot); - if (!group.isDrawerEnabled(baseSlot)) - return false; + if (!group.isDrawerEnabled(baseSlot)) return false; IDrawer drawer = group.getDrawer(baseSlot); - if (drawer == null) - return false; + if (drawer == null) return false; if (drawer.isEmpty() && drawer instanceof ILockable && ((ILockable) drawer).isLocked(LockAttribute.LOCK_EMPTY)) return false; @@ -72,86 +66,74 @@ public class StorageInventory implements IDrawerInventory } @Override - public boolean canExtractItem (int slot, ItemStack stack) { - if (!StorageDrawers.config.cache.enableSidedOutput) - return false; + public boolean canExtractItem(int slot, ItemStack stack) { + if (!StorageDrawers.config.cache.enableSidedOutput) return false; int lowerThresh = SlotType.OUTPUT.ordinal() * group.getDrawerCount(); int upperThresh = lowerThresh + group.getDrawerCount(); - if (slot < lowerThresh || slot >= upperThresh) - return false; + if (slot < lowerThresh || slot >= upperThresh) return false; int baseSlot = getDrawerSlot(slot); - if (!group.isDrawerEnabled(baseSlot)) - return false; + if (!group.isDrawerEnabled(baseSlot)) return false; IDrawer drawer = group.getDrawer(baseSlot); - if (drawer == null) - return false; + if (drawer == null) return false; - if (drawer.getStoredItemCount() == 0) - return false; + if (drawer.getStoredItemCount() == 0) return false; return drawer.canItemBeExtracted(stack); } @Override - public int[] getAccessibleSlotsFromSide (int side) { + public int[] getAccessibleSlotsFromSide(int side) { int[] autoSides = sideMan.getSlotsForSide(side); for (int aside : autoSides) { - if (side == aside) - return inventorySlots; + if (side == aside) return inventorySlots; } return emptySlots; } @Override - public boolean canInsertItem (int slot, ItemStack item, int side) { + public boolean canInsertItem(int slot, ItemStack item, int side) { return canInsertItem(slot, item); } @Override - public boolean canExtractItem (int slot, ItemStack item, int side) { + public boolean canExtractItem(int slot, ItemStack item, int side) { return canExtractItem(slot, item); } @Override - public int getSizeInventory () { + public int getSizeInventory() { return inventorySlots.length; } @Override - public ItemStack getStackInSlot (int slot) { - if (slot < 0 || slot >= getSizeInventory()) - return null; + public ItemStack getStackInSlot(int slot) { + if (slot < 0 || slot >= getSizeInventory()) return null; IDrawer drawer = group.getDrawer(getDrawerSlot(slot)); - if (drawer == null) - return null; + if (drawer == null) return null; - if (!(drawer instanceof IInventoryAdapter)) - return null; + if (!(drawer instanceof IInventoryAdapter)) return null; - IInventoryAdapter adapter = (IInventoryAdapter)drawer; + IInventoryAdapter adapter = (IInventoryAdapter) drawer; adapter.syncInventory(); return adapter.getInventoryStack(getInventorySlotType(slot)); } @Override - public ItemStack decrStackSize (int slot, int count) { - if (slot < 0 || slot >= getSizeInventory()) - return null; + public ItemStack decrStackSize(int slot, int count) { + if (slot < 0 || slot >= getSizeInventory()) return null; IDrawer drawer = group.getDrawer(getDrawerSlot(slot)); - if (drawer == null) - return null; + if (drawer == null) return null; - if (!(drawer instanceof IInventoryAdapter)) - return null; + if (!(drawer instanceof IInventoryAdapter)) return null; - IInventoryAdapter adapter = (IInventoryAdapter)drawer; + IInventoryAdapter adapter = (IInventoryAdapter) drawer; adapter.syncInventory(); ItemStack stack = adapter.getInventoryStack(SlotType.OUTPUT).copy(); @@ -164,29 +146,26 @@ public class StorageInventory implements IDrawerInventory } @Override - public ItemStack getStackInSlotOnClosing (int slot) { + public ItemStack getStackInSlotOnClosing(int slot) { return null; } @Override - public void setInventorySlotContents (int slot, ItemStack item) { - if (slot < 0 || slot >= getSizeInventory()) - return; + public void setInventorySlotContents(int slot, ItemStack item) { + if (slot < 0 || slot >= getSizeInventory()) return; IDrawer drawer = group.getDrawer(getDrawerSlot(slot)); - if (drawer == null) - return; + if (drawer == null) return; - if (!(drawer instanceof IInventoryAdapter)) - return; + if (!(drawer instanceof IInventoryAdapter)) return; + + IInventoryAdapter adapter = (IInventoryAdapter) drawer; - IInventoryAdapter adapter = (IInventoryAdapter)drawer; - if (drawer.isEmpty()) { setInventorySlotContents(drawer, item); return; } - + switch (getInventorySlotType(slot)) { case INPUT: adapter.setInStack(item); @@ -197,102 +176,89 @@ public class StorageInventory implements IDrawerInventory } } - private void setInventorySlotContents (IDrawer drawer, ItemStack item) { - if (item == null) - drawer.setStoredItem(null, 0); + private void setInventorySlotContents(IDrawer drawer, ItemStack item) { + if (item == null) drawer.setStoredItem(null, 0); else { drawer.setStoredItem(item, 0); - if (!drawer.canItemBeStored(item)) - drawer = findDrawer(item); - if (drawer == null) - return; + if (!drawer.canItemBeStored(item)) drawer = findDrawer(item); + if (drawer == null) return; int insertCount = item.stackSize; - if (insertCount > drawer.getMaxCapacity()) - insertCount = drawer.getMaxCapacity(); + if (insertCount > drawer.getMaxCapacity()) insertCount = drawer.getMaxCapacity(); drawer.setStoredItemCount(insertCount); - if (!upgrade.isVoid()) - item.stackSize = insertCount; + if (!upgrade.isVoid()) item.stackSize = insertCount; } } - private IDrawer findDrawer (ItemStack item) { + private IDrawer findDrawer(ItemStack item) { for (int i = 0; i < group.getDrawerCount(); i++) { - if (!group.isDrawerEnabled(i)) - continue; + if (!group.isDrawerEnabled(i)) continue; IDrawer drawer = group.getDrawer(i); - if (drawer.canItemBeStored(item)) - return drawer; + if (drawer.canItemBeStored(item)) return drawer; } return null; } @Override - public String getInventoryName () { + public String getInventoryName() { return null; } @Override - public boolean hasCustomInventoryName () { + public boolean hasCustomInventoryName() { return false; } @Override - public int getInventoryStackLimit () { + public int getInventoryStackLimit() { return 64; } @Override - public void markDirty () { + public void markDirty() { for (int i = 0, n = group.getDrawerCount(); i < n; i++) { - if (!group.isDrawerEnabled(i)) - continue; + if (!group.isDrawerEnabled(i)) continue; IDrawer drawer = group.getDrawer(i); - if (drawer instanceof IInventoryAdapter) - ((IInventoryAdapter) drawer).syncInventory(); + if (drawer instanceof IInventoryAdapter) ((IInventoryAdapter) drawer).syncInventory(); } } @Override - public boolean syncInventoryIfNeeded () { + public boolean syncInventoryIfNeeded() { boolean synced = false; for (int i = 0, n = group.getDrawerCount(); i < n; i++) { - if (!group.isDrawerEnabled(i)) - continue; + if (!group.isDrawerEnabled(i)) continue; IDrawer drawer = group.getDrawer(i); - if (drawer instanceof IInventoryAdapter) - synced |= ((IInventoryAdapter) drawer).syncInventoryIfNeeded(); + if (drawer instanceof IInventoryAdapter) synced |= ((IInventoryAdapter) drawer).syncInventoryIfNeeded(); } return synced; } @Override - public boolean isUseableByPlayer (EntityPlayer player) { + public boolean isUseableByPlayer(EntityPlayer player) { return false; } @Override - public void openInventory () { } + public void openInventory() {} @Override - public void closeInventory () { } + public void closeInventory() {} @Override - public boolean isItemValidForSlot (int slot, ItemStack item) { - if (slot < 0 || slot >= getSizeInventory()) - return false; + public boolean isItemValidForSlot(int slot, ItemStack item) { + if (slot < 0 || slot >= getSizeInventory()) return false; IDrawer drawer = group.getDrawer(getDrawerSlot(slot)); - if (drawer == null) - return false; + if (drawer == null) return false; switch (getInventorySlotType(slot)) { case INPUT: diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemBasicDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemBasicDrawers.java index ffcf2c2..070a08f 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemBasicDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemBasicDrawers.java @@ -7,16 +7,15 @@ import net.minecraft.block.BlockWood; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -public class ItemBasicDrawers extends ItemDrawers -{ +public class ItemBasicDrawers extends ItemDrawers { protected final Block blockTemplate; protected final String[] blockNames; - public ItemBasicDrawers (Block block) { + public ItemBasicDrawers(Block block) { this(block, BlockWood.field_150096_a); } - protected ItemBasicDrawers (Block block, String[] names) { + protected ItemBasicDrawers(Block block, String[] names) { super(block); setHasSubtypes(true); blockTemplate = block; @@ -38,8 +37,7 @@ public class ItemBasicDrawers extends ItemDrawers public String getUnlocalizedName(ItemStack stack) { int i = stack.getItemDamage(); - if (i < 0 || i >= blockNames.length) - i = 0; + if (i < 0 || i >= blockNames.length) i = 0; return super.getUnlocalizedName() + "." + blockNames[i]; } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCompDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCompDrawers.java index 28c696c..9e62b46 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCompDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCompDrawers.java @@ -5,27 +5,34 @@ import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import java.util.List; - -public class ItemCompDrawers extends ItemBlock -{ - public ItemCompDrawers (Block block) { +public class ItemCompDrawers extends ItemBlock { + public ItemCompDrawers(Block block) { super(block); } @Override - public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - if (!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) - return false; + public boolean placeBlockAt( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ, + int metadata) { + if (!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) return false; TileEntityDrawers tile = (TileEntityDrawers) world.getTileEntity(x, y, z); if (tile != null) { @@ -35,8 +42,7 @@ public class ItemCompDrawers extends ItemBlock if (stack.hasTagCompound() && stack.getTagCompound().hasKey("tile")) tile.readFromPortableNBT(stack.getTagCompound().getCompoundTag("tile")); - if (side > 1) - tile.setDirection(side); + if (side > 1) tile.setDirection(side); tile.setIsSealed(false); } @@ -46,14 +52,15 @@ public class ItemCompDrawers extends ItemBlock @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { ConfigManager config = StorageDrawers.config; int count = config.getBlockBaseStorage("compdrawers"); list.add(StatCollector.translateToLocalFormatted("storageDrawers.drawers.description", count)); if (itemStack.hasTagCompound() && itemStack.getTagCompound().hasKey("tile")) { - list.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocalFormatted("storageDrawers.drawers.sealed")); + list.add(EnumChatFormatting.YELLOW + + StatCollector.translateToLocalFormatted("storageDrawers.drawers.sealed")); } } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemController.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemController.java index e79bca5..7fdad12 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemController.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemController.java @@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.item; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityController; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -10,23 +11,29 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import java.util.List; - -public class ItemController extends ItemBlock -{ - public ItemController (Block block) { +public class ItemController extends ItemBlock { + public ItemController(Block block) { super(block); } @Override - public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - if (!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) - return false; + public boolean placeBlockAt( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ, + int metadata) { + if (!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) return false; TileEntityController tile = (TileEntityController) world.getTileEntity(x, y, z); if (tile != null) { - if (side > 1) - tile.setDirection(side); + if (side > 1) tile.setDirection(side); } return true; @@ -34,7 +41,7 @@ public class ItemController extends ItemBlock @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { list.add(StatCollector.translateToLocalFormatted("storageDrawers.controller.description")); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCustomDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCustomDrawers.java index bdd8c85..1765723 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCustomDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCustomDrawers.java @@ -8,54 +8,62 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -public class ItemCustomDrawers extends ItemDrawers -{ - public ItemCustomDrawers (Block block) { +public class ItemCustomDrawers extends ItemDrawers { + public ItemCustomDrawers(Block block) { super(block); } @Override - public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - if (!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) - return false; + public boolean placeBlockAt( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ, + int metadata) { + if (!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) return false; TileEntityDrawers tile = (TileEntityDrawers) world.getTileEntity(x, y, z); if (tile != null && stack.hasTagCompound() && !stack.getTagCompound().hasKey("tile")) { if (stack.getTagCompound().hasKey("MatS")) - tile.setMaterialSide(ItemStack.loadItemStackFromNBT(stack.getTagCompound().getCompoundTag("MatS"))); + tile.setMaterialSide( + ItemStack.loadItemStackFromNBT(stack.getTagCompound().getCompoundTag("MatS"))); if (stack.getTagCompound().hasKey("MatT")) - tile.setMaterialTrim(ItemStack.loadItemStackFromNBT(stack.getTagCompound().getCompoundTag("MatT"))); + tile.setMaterialTrim( + ItemStack.loadItemStackFromNBT(stack.getTagCompound().getCompoundTag("MatT"))); if (stack.getTagCompound().hasKey("MatF")) - tile.setMaterialFront(ItemStack.loadItemStackFromNBT(stack.getTagCompound().getCompoundTag("MatF"))); + tile.setMaterialFront( + ItemStack.loadItemStackFromNBT(stack.getTagCompound().getCompoundTag("MatF"))); } return true; } - public static ItemStack makeItemStack (Block block, int count, ItemStack matSide, ItemStack matTrim, ItemStack matFront) { + public static ItemStack makeItemStack( + Block block, int count, ItemStack matSide, ItemStack matTrim, ItemStack matFront) { Item item = Item.getItemFromBlock(block); - if (!(item instanceof ItemCustomDrawers)) - return null; + if (!(item instanceof ItemCustomDrawers)) return null; NBTTagCompound tag = new NBTTagCompound(); - if (matSide != null) - tag.setTag("MatS", getMaterialTag(matSide)); + if (matSide != null) tag.setTag("MatS", getMaterialTag(matSide)); - if (matTrim != null) - tag.setTag("MatT", getMaterialTag(matTrim)); + if (matTrim != null) tag.setTag("MatT", getMaterialTag(matTrim)); - if (matFront != null) - tag.setTag("MatF", getMaterialTag(matFront)); + if (matFront != null) tag.setTag("MatF", getMaterialTag(matFront)); ItemStack stack = new ItemStack(item, count, 0); - if (!tag.hasNoTags()) - stack.setTagCompound(tag); + if (!tag.hasNoTags()) stack.setTagCompound(tag); return stack; } - private static NBTTagCompound getMaterialTag (ItemStack mat) { + private static NBTTagCompound getMaterialTag(ItemStack mat) { mat = mat.copy(); mat.stackSize = 1; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCustomTrim.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCustomTrim.java index ee09228..c72c551 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCustomTrim.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCustomTrim.java @@ -9,49 +9,56 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -public class ItemCustomTrim extends ItemBlock -{ - public ItemCustomTrim (Block block) { +public class ItemCustomTrim extends ItemBlock { + public ItemCustomTrim(Block block) { super(block); } @Override - public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - if (!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) - return false; + public boolean placeBlockAt( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ, + int metadata) { + if (!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) return false; TileEntityTrim tile = (TileEntityTrim) world.getTileEntity(x, y, z); if (tile != null && stack.hasTagCompound() && !stack.getTagCompound().hasKey("tile")) { if (stack.getTagCompound().hasKey("MatS")) - tile.setMaterialSide(ItemStack.loadItemStackFromNBT(stack.getTagCompound().getCompoundTag("MatS"))); + tile.setMaterialSide( + ItemStack.loadItemStackFromNBT(stack.getTagCompound().getCompoundTag("MatS"))); if (stack.getTagCompound().hasKey("MatT")) - tile.setMaterialTrim(ItemStack.loadItemStackFromNBT(stack.getTagCompound().getCompoundTag("MatT"))); + tile.setMaterialTrim( + ItemStack.loadItemStackFromNBT(stack.getTagCompound().getCompoundTag("MatT"))); } return true; } - public static ItemStack makeItemStack (Block block, int count, ItemStack matSide, ItemStack matTrim) { + public static ItemStack makeItemStack(Block block, int count, ItemStack matSide, ItemStack matTrim) { Item item = Item.getItemFromBlock(block); - if (!(item instanceof ItemCustomTrim)) - return null; + if (!(item instanceof ItemCustomTrim)) return null; NBTTagCompound tag = new NBTTagCompound(); - if (matSide != null) - tag.setTag("MatS", getMaterialTag(matSide)); + if (matSide != null) tag.setTag("MatS", getMaterialTag(matSide)); - if (matTrim != null) - tag.setTag("MatT", getMaterialTag(matTrim)); + if (matTrim != null) tag.setTag("MatT", getMaterialTag(matTrim)); ItemStack stack = new ItemStack(item, count, 0); - if (!tag.hasNoTags()) - stack.setTagCompound(tag); + if (!tag.hasNoTags()) stack.setTagCompound(tag); return stack; } - private static NBTTagCompound getMaterialTag (ItemStack mat) { + private static NBTTagCompound getMaterialTag(ItemStack mat) { mat = mat.copy(); mat.stackSize = 1; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemDrawers.java index b441e5d..aa5c000 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemDrawers.java @@ -5,49 +5,50 @@ import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard; import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; -import com.jaquadro.minecraft.storagedrawers.core.ModBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.block.Block; -import net.minecraft.block.BlockWood; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemMultiTexture; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants; -import java.util.List; - -public class ItemDrawers extends ItemBlock -{ - public ItemDrawers (Block block) { +public class ItemDrawers extends ItemBlock { + public ItemDrawers(Block block) { super(block); setMaxDamage(0); } @Override - public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - if (!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) - return false; + public boolean placeBlockAt( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ, + int metadata) { + if (!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) return false; TileEntityDrawers tile = (TileEntityDrawers) world.getTileEntity(x, y, z); if (tile != null) { BlockDrawers block = (BlockDrawers) field_150939_a; if (tile instanceof TileEntityDrawersStandard) - ((TileEntityDrawersStandard)tile).setDrawerCount(block.drawerCount); + ((TileEntityDrawersStandard) tile).setDrawerCount(block.drawerCount); tile.setDrawerCapacity(getCapacityForBlock(block)); if (stack.hasTagCompound() && stack.getTagCompound().hasKey("tile")) tile.readFromPortableNBT(stack.getTagCompound().getCompoundTag("tile")); - if (side > 1) - tile.setDirection(side); + if (side > 1) tile.setDirection(side); tile.setIsSealed(false); } @@ -57,36 +58,31 @@ public class ItemDrawers extends ItemBlock @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { Block block = Block.getBlockFromItem(itemStack.getItem()); - list.add(StatCollector.translateToLocalFormatted("storageDrawers.drawers.description", getCapacityForBlock(block))); + list.add(StatCollector.translateToLocalFormatted( + "storageDrawers.drawers.description", getCapacityForBlock(block))); if (itemStack.hasTagCompound() && itemStack.getTagCompound().hasKey("tile")) { - list.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocalFormatted("storageDrawers.drawers.sealed")); + list.add(EnumChatFormatting.YELLOW + + StatCollector.translateToLocalFormatted("storageDrawers.drawers.sealed")); } } - protected int getCapacityForBlock (Block block) { + protected int getCapacityForBlock(Block block) { ConfigManager config = StorageDrawers.config; int count = 0; - if (!(block instanceof BlockDrawers)) - return 0; + if (!(block instanceof BlockDrawers)) return 0; - BlockDrawers drawer = (BlockDrawers)block; + BlockDrawers drawer = (BlockDrawers) block; - if (drawer.drawerCount == 1) - count = config.getBlockBaseStorage("fulldrawers1"); - else if (drawer.drawerCount == 2 && !drawer.halfDepth) - count = config.getBlockBaseStorage("fulldrawers2"); - else if (drawer.drawerCount == 4 && !drawer.halfDepth) - count = config.getBlockBaseStorage("fulldrawers4"); - else if (drawer.drawerCount == 2 && drawer.halfDepth) - count = config.getBlockBaseStorage("halfdrawers2"); - else if (drawer.drawerCount == 4 && drawer.halfDepth) - count = config.getBlockBaseStorage("halfdrawers4"); - else if (drawer.drawerCount == 3) - count = config.getBlockBaseStorage("compDrawers"); + if (drawer.drawerCount == 1) count = config.getBlockBaseStorage("fulldrawers1"); + else if (drawer.drawerCount == 2 && !drawer.halfDepth) count = config.getBlockBaseStorage("fulldrawers2"); + else if (drawer.drawerCount == 4 && !drawer.halfDepth) count = config.getBlockBaseStorage("fulldrawers4"); + else if (drawer.drawerCount == 2 && drawer.halfDepth) count = config.getBlockBaseStorage("halfdrawers2"); + else if (drawer.drawerCount == 4 && drawer.halfDepth) count = config.getBlockBaseStorage("halfdrawers4"); + else if (drawer.drawerCount == 3) count = config.getBlockBaseStorage("compDrawers"); return count; } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemFramingTable.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemFramingTable.java index 5c8bd45..ad2585e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemFramingTable.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemFramingTable.java @@ -7,56 +7,52 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -public class ItemFramingTable extends ItemBlock -{ - public ItemFramingTable (Block block) { +public class ItemFramingTable extends ItemBlock { + public ItemFramingTable(Block block) { super(block); setMaxDamage(0); } @Override - public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { + public boolean placeBlockAt( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ, + int metadata) { metadata = 0; - if (side == 0) - return false; + if (side == 0) return false; if (side == 1) { int quad = (MathHelper.floor_double((double) (player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3); - if (quad == 0) - side = 2; - if (quad == 1) - side = 5; - if (quad == 2) - side = 3; - if (quad == 3) - side = 4; + if (quad == 0) side = 2; + if (quad == 1) side = 5; + if (quad == 2) side = 3; + if (quad == 3) side = 4; } int xOff = 0; int zOff = 0; - if (side == 2) - xOff = 1; - if (side == 3) - xOff = -1; - if (side == 4) - zOff = -1; - if (side == 5) - zOff = 1; + if (side == 2) xOff = 1; + if (side == 3) xOff = -1; + if (side == 4) zOff = -1; + if (side == 5) zOff = 1; - if (!world.isAirBlock(x, y, z) || !world.isAirBlock(x, y + 1, z)) - return false; + if (!world.isAirBlock(x, y, z) || !world.isAirBlock(x, y + 1, z)) return false; if (!world.isAirBlock(x + xOff, y, z + zOff) || !world.isAirBlock(x + xOff, y + 1, z + zOff)) { - if (side == 2 || side == 3) - xOff *= -1; - if (side == 4 || side == 5) - zOff *= -1; - if (!world.isAirBlock(x + xOff, y, z + zOff) || !world.isAirBlock(x + xOff, y + 1, z + zOff)) - return false; + if (side == 2 || side == 3) xOff *= -1; + if (side == 4 || side == 5) zOff *= -1; + if (!world.isAirBlock(x + xOff, y, z + zOff) || !world.isAirBlock(x + xOff, y + 1, z + zOff)) return false; metadata = 8; } - if (!world.setBlock(x, y, z, field_150939_a, metadata | side, 3)) - return false; + if (!world.setBlock(x, y, z, field_150939_a, metadata | side, 3)) return false; if (!world.setBlock(x + xOff, y, z + zOff, field_150939_a, (8 - metadata) | side, 3)) { world.setBlockToAir(x, y, z); return false; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemPersonalKey.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemPersonalKey.java index d3f8d5f..6c8bb56 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemPersonalKey.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemPersonalKey.java @@ -6,6 +6,7 @@ import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import com.jaquadro.minecraft.storagedrawers.integration.IntegrationRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.SharedMonsterAttributes; @@ -17,16 +18,13 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; -import java.util.List; - -public class ItemPersonalKey extends Item -{ - public static final String[] iconNames = new String[] { "default", "cofh" }; +public class ItemPersonalKey extends Item { + public static final String[] iconNames = new String[] {"default", "cofh"}; @SideOnly(Side.CLIENT) private IIcon[] icons; - public ItemPersonalKey (String name) { + public ItemPersonalKey(String name) { setUnlocalizedName(name); setCreativeTab(ModCreativeTabs.tabStorageDrawers); setHasSubtypes(true); @@ -35,50 +33,50 @@ public class ItemPersonalKey extends Item @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage (int meta) { + public IIcon getIconFromDamage(int meta) { return icons[MathHelper.clamp_int(meta, 0, iconNames.length - 1)]; } @Override - public String getUnlocalizedName (ItemStack itemStack) { + public String getUnlocalizedName(ItemStack itemStack) { int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, iconNames.length - 1); - if (iconNames[meta] == null) - return super.getUnlocalizedName(); + if (iconNames[meta] == null) return super.getUnlocalizedName(); return super.getUnlocalizedName() + "." + iconNames[meta]; } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { String name = getUnlocalizedName(itemStack); list.add(StatCollector.translateToLocalFormatted(name + ".description")); } @SideOnly(Side.CLIENT) - public boolean isFull3D() - { + public boolean isFull3D() { return true; } @Override - public Multimap getAttributeModifiers (ItemStack item) { + public Multimap getAttributeModifiers(ItemStack item) { Multimap multimap = super.getAttributeModifiers(item); - multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double)2, 0)); + multimap.put( + SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier(field_111210_e, "Weapon modifier", (double) 2, 0)); return multimap; } @Override @SideOnly(Side.CLIENT) - public void getSubItems (Item item, CreativeTabs creativeTabs, List list) { + public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { list.add(new ItemStack(item, 1, 0)); - if (StorageDrawers.config.cache.enableThermalFoundationIntegration && IntegrationRegistry.instance().isModLoaded("ThermalFoundation")) - list.add(new ItemStack(item, 1, 1)); + if (StorageDrawers.config.cache.enableThermalFoundationIntegration + && IntegrationRegistry.instance().isModLoaded("ThermalFoundation")) list.add(new ItemStack(item, 1, 1)); } @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister register) { + public void registerIcons(IIconRegister register) { icons = new IIcon[iconNames.length]; for (int i = 0, n = iconNames.length; i < n; i++) { @@ -87,11 +85,14 @@ public class ItemPersonalKey extends Item } } - public String getSecurityProviderKey (int meta) { + public String getSecurityProviderKey(int meta) { switch (meta) { - case 0: return null; - case 1: return "cofh"; - default: return null; + case 0: + return null; + case 1: + return "cofh"; + default: + return null; } } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemShroudKey.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemShroudKey.java index 77f85c2..d530a71 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemShroudKey.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemShroudKey.java @@ -5,7 +5,7 @@ import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.entity.EntityLivingBase; +import java.util.List; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; @@ -13,11 +13,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import java.util.List; - -public class ItemShroudKey extends Item -{ - public ItemShroudKey (String name) { +public class ItemShroudKey extends Item { + public ItemShroudKey(String name) { setUnlocalizedName(name); setCreativeTab(ModCreativeTabs.tabStorageDrawers); setTextureName(StorageDrawers.MOD_ID + ":drawer_key_shroud"); @@ -26,21 +23,22 @@ public class ItemShroudKey extends Item @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { String name = getUnlocalizedName(itemStack); list.add(StatCollector.translateToLocalFormatted(name + ".description")); } @SideOnly(Side.CLIENT) - public boolean isFull3D() - { + public boolean isFull3D() { return true; } @Override - public Multimap getAttributeModifiers (ItemStack item) { + public Multimap getAttributeModifiers(ItemStack item) { Multimap multimap = super.getAttributeModifiers(item); - multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double)2, 0)); + multimap.put( + SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier(field_111210_e, "Weapon modifier", (double) 2, 0)); return multimap; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemTape.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemTape.java index 73bd98c..7486119 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemTape.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemTape.java @@ -7,6 +7,7 @@ import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import com.jaquadro.minecraft.storagedrawers.security.SecurityManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -14,11 +15,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import java.util.List; - -public class ItemTape extends Item -{ - public ItemTape (String name) { +public class ItemTape extends Item { + public ItemTape(String name) { setUnlocalizedName(name); setMaxStackSize(1); setMaxDamage(8); @@ -28,26 +26,33 @@ public class ItemTape extends Item @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { String name = getUnlocalizedName(itemStack); list.add(StatCollector.translateToLocalFormatted(name + ".description")); } @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - if (!player.canPlayerEdit(x, y, z, side, stack)) - return false; + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ) { + if (!player.canPlayerEdit(x, y, z, side, stack)) return false; TileEntity tile = world.getTileEntity(x, y, z); if (tile instanceof IProtectable) { - if (!SecurityManager.hasOwnership(player.getGameProfile(), (IProtectable)tile)) - return false; + if (!SecurityManager.hasOwnership(player.getGameProfile(), (IProtectable) tile)) return false; } if (tile instanceof ISealable) { ISealable tileseal = (ISealable) tile; - if (tileseal.isSealed()) - return false; + if (tileseal.isSealed()) return false; tileseal.setIsSealed(true); stack.damageItem(1, player); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemTrim.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemTrim.java index 5e86c71..4341f7a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemTrim.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemTrim.java @@ -7,21 +7,19 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemMultiTexture; import net.minecraft.world.World; -public class ItemTrim extends ItemMultiTexture -{ - public ItemTrim (Block block) { +public class ItemTrim extends ItemMultiTexture { + public ItemTrim(Block block) { super(block, block, BlockWood.field_150096_a); } - protected ItemTrim (Block block, String[] names) { + protected ItemTrim(Block block, String[] names) { super(block, block, names); } @Override - public boolean doesSneakBypassUse (World world, int x, int y, int z, EntityPlayer player) { + public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) { Block block = world.getBlock(x, y, z); - if (block instanceof BlockDrawers && ((BlockDrawers) block).retrimType() != null) - return true; + if (block instanceof BlockDrawers && ((BlockDrawers) block).retrimType() != null) return true; return false; } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgrade.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgrade.java index aa0cf4b..ea09737 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgrade.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgrade.java @@ -4,6 +4,7 @@ import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -13,16 +14,14 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; -import java.util.List; - -public class ItemUpgrade extends Item -{ - public static final String[] iconNames = new String[] { null, null, "iron", "gold", "obsidian", "diamond", "emerald" }; +public class ItemUpgrade extends Item { + public static final String[] iconNames = + new String[] {null, null, "iron", "gold", "obsidian", "diamond", "emerald"}; @SideOnly(Side.CLIENT) private IIcon[] icons; - public ItemUpgrade (String name) { + public ItemUpgrade(String name) { setUnlocalizedName(name); setHasSubtypes(true); setMaxDamage(0); @@ -31,38 +30,36 @@ public class ItemUpgrade extends Item @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage (int meta) { + public IIcon getIconFromDamage(int meta) { return icons[MathHelper.clamp_int(meta, 0, iconNames.length - 1)]; } @Override - public String getUnlocalizedName (ItemStack itemStack) { + public String getUnlocalizedName(ItemStack itemStack) { int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, iconNames.length - 1); - if (iconNames[meta] == null) - return super.getUnlocalizedName(); + if (iconNames[meta] == null) return super.getUnlocalizedName(); return super.getUnlocalizedName() + "." + iconNames[meta]; } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { int mult = StorageDrawers.config.getStorageUpgradeMultiplier(itemStack.getItemDamage()); list.add(StatCollector.translateToLocalFormatted("storageDrawers.upgrade.description", mult)); } @Override @SideOnly(Side.CLIENT) - public void getSubItems (Item item, CreativeTabs creativeTabs, List list) { + public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { for (int i = 0, n = iconNames.length; i < n; i++) { - if (iconNames[i] != null) - list.add(new ItemStack(item, 1, i)); + if (iconNames[i] != null) list.add(new ItemStack(item, 1, i)); } } @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister register) { + public void registerIcons(IIconRegister register) { icons = new IIcon[iconNames.length]; for (int i = 0, n = iconNames.length; i < n; i++) { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeCreative.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeCreative.java index 77cd5ba..085f794 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeCreative.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeCreative.java @@ -4,6 +4,7 @@ import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -13,16 +14,13 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; -import java.util.List; - -public class ItemUpgradeCreative extends Item -{ - public static final String[] iconNames = new String[] { "store", "vend" }; +public class ItemUpgradeCreative extends Item { + public static final String[] iconNames = new String[] {"store", "vend"}; @SideOnly(Side.CLIENT) private IIcon[] icons; - public ItemUpgradeCreative (String name) { + public ItemUpgradeCreative(String name) { setUnlocalizedName(name); setHasSubtypes(true); setCreativeTab(ModCreativeTabs.tabStorageDrawers); @@ -31,38 +29,36 @@ public class ItemUpgradeCreative extends Item @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage (int meta) { + public IIcon getIconFromDamage(int meta) { return icons[MathHelper.clamp_int(meta, 0, iconNames.length - 1)]; } @Override - public String getUnlocalizedName (ItemStack itemStack) { + public String getUnlocalizedName(ItemStack itemStack) { int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, iconNames.length - 1); - if (iconNames[meta] == null) - return super.getUnlocalizedName(); + if (iconNames[meta] == null) return super.getUnlocalizedName(); return super.getUnlocalizedName() + "." + iconNames[meta]; } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { String name = getUnlocalizedName(itemStack); list.add(StatCollector.translateToLocalFormatted(name + ".description")); } @Override @SideOnly(Side.CLIENT) - public void getSubItems (Item item, CreativeTabs creativeTabs, List list) { + public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { for (int i = 0, n = iconNames.length; i < n; i++) { - if (iconNames[i] != null) - list.add(new ItemStack(item, 1, i)); + if (iconNames[i] != null) list.add(new ItemStack(item, 1, i)); } } @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister register) { + public void registerIcons(IIconRegister register) { icons = new IIcon[iconNames.length]; for (int i = 0, n = iconNames.length; i < n; i++) { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeDowngrade.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeDowngrade.java index 1934486..c6efb78 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeDowngrade.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeDowngrade.java @@ -4,13 +4,12 @@ import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import java.util.List; - public class ItemUpgradeDowngrade extends Item { public ItemUpgradeDowngrade(String name) { @@ -22,9 +21,8 @@ public class ItemUpgradeDowngrade extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { String name = getUnlocalizedName(itemStack); list.add(StatCollector.translateToLocalFormatted(name + ".description")); } - } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeLock.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeLock.java index d7afc31..f79e51b 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeLock.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeLock.java @@ -5,7 +5,7 @@ import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.entity.EntityLivingBase; +import java.util.List; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; @@ -13,11 +13,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import java.util.List; - -public class ItemUpgradeLock extends Item -{ - public ItemUpgradeLock (String name) { +public class ItemUpgradeLock extends Item { + public ItemUpgradeLock(String name) { setUnlocalizedName(name); setCreativeTab(ModCreativeTabs.tabStorageDrawers); setTextureName(StorageDrawers.MOD_ID + ":drawer_key"); @@ -26,21 +23,22 @@ public class ItemUpgradeLock extends Item @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { String name = getUnlocalizedName(itemStack); list.add(StatCollector.translateToLocalFormatted(name + ".description")); } @SideOnly(Side.CLIENT) - public boolean isFull3D() - { + public boolean isFull3D() { return true; } @Override - public Multimap getAttributeModifiers (ItemStack item) { + public Multimap getAttributeModifiers(ItemStack item) { Multimap multimap = super.getAttributeModifiers(item); - multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double)2, 0)); + multimap.put( + SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier(field_111210_e, "Weapon modifier", (double) 2, 0)); return multimap; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeRedstone.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeRedstone.java index 871b47b..e08d835 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeRedstone.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeRedstone.java @@ -4,6 +4,7 @@ import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -13,16 +14,13 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; -import java.util.List; - -public class ItemUpgradeRedstone extends Item -{ - public static final String[] iconNames = new String[] { "combined", "max", "min" }; +public class ItemUpgradeRedstone extends Item { + public static final String[] iconNames = new String[] {"combined", "max", "min"}; @SideOnly(Side.CLIENT) private IIcon[] icons; - public ItemUpgradeRedstone (String name) { + public ItemUpgradeRedstone(String name) { setUnlocalizedName(name); setHasSubtypes(true); setCreativeTab(ModCreativeTabs.tabStorageDrawers); @@ -31,38 +29,36 @@ public class ItemUpgradeRedstone extends Item @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage (int meta) { + public IIcon getIconFromDamage(int meta) { return icons[MathHelper.clamp_int(meta, 0, iconNames.length - 1)]; } @Override - public String getUnlocalizedName (ItemStack itemStack) { + public String getUnlocalizedName(ItemStack itemStack) { int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, iconNames.length - 1); - if (iconNames[meta] == null) - return super.getUnlocalizedName(); + if (iconNames[meta] == null) return super.getUnlocalizedName(); return super.getUnlocalizedName() + "." + iconNames[meta]; } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { String name = getUnlocalizedName(itemStack); list.add(StatCollector.translateToLocalFormatted(name + ".description")); } @Override @SideOnly(Side.CLIENT) - public void getSubItems (Item item, CreativeTabs creativeTabs, List list) { + public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { for (int i = 0, n = iconNames.length; i < n; i++) { - if (iconNames[i] != null) - list.add(new ItemStack(item, 1, i)); + if (iconNames[i] != null) list.add(new ItemStack(item, 1, i)); } } @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister register) { + public void registerIcons(IIconRegister register) { icons = new IIcon[iconNames.length]; for (int i = 0, n = iconNames.length; i < n; i++) { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeStatus.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeStatus.java index 5ece029..3f8312c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeStatus.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeStatus.java @@ -4,6 +4,7 @@ import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -13,16 +14,13 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; -import java.util.List; - -public class ItemUpgradeStatus extends Item -{ - public static final String[] iconNames = new String[] { null, "level1", "level2" }; +public class ItemUpgradeStatus extends Item { + public static final String[] iconNames = new String[] {null, "level1", "level2"}; @SideOnly(Side.CLIENT) private IIcon[] icons; - public ItemUpgradeStatus (String name) { + public ItemUpgradeStatus(String name) { setUnlocalizedName(name); setHasSubtypes(true); setMaxDamage(0); @@ -31,38 +29,36 @@ public class ItemUpgradeStatus extends Item @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage (int meta) { + public IIcon getIconFromDamage(int meta) { return icons[MathHelper.clamp_int(meta, 0, iconNames.length - 1)]; } @Override - public String getUnlocalizedName (ItemStack itemStack) { + public String getUnlocalizedName(ItemStack itemStack) { int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, iconNames.length - 1); - if (iconNames[meta] == null) - return super.getUnlocalizedName(); + if (iconNames[meta] == null) return super.getUnlocalizedName(); return super.getUnlocalizedName() + "." + iconNames[meta]; } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { String name = getUnlocalizedName(itemStack); list.add(StatCollector.translateToLocalFormatted(name + ".description")); } @Override @SideOnly(Side.CLIENT) - public void getSubItems (Item item, CreativeTabs creativeTabs, List list) { + public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { for (int i = 0, n = iconNames.length; i < n; i++) { - if (iconNames[i] != null) - list.add(new ItemStack(item, 1, i)); + if (iconNames[i] != null) list.add(new ItemStack(item, 1, i)); } } @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister register) { + public void registerIcons(IIconRegister register) { icons = new IIcon[iconNames.length]; for (int i = 0, n = iconNames.length; i < n; i++) { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeVoid.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeVoid.java index 1a9f39e..7ab9282 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeVoid.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeVoid.java @@ -4,16 +4,14 @@ import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import java.util.List; - -public class ItemUpgradeVoid extends Item -{ - public ItemUpgradeVoid (String name) { +public class ItemUpgradeVoid extends Item { + public ItemUpgradeVoid(String name) { setUnlocalizedName(name); setCreativeTab(ModCreativeTabs.tabStorageDrawers); setTextureName(StorageDrawers.MOD_ID + ":upgrade_void"); @@ -22,7 +20,7 @@ public class ItemUpgradeVoid extends Item @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { String name = getUnlocalizedName(itemStack); list.add(StatCollector.translateToLocalFormatted(name + ".description")); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemDrawersPack.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemDrawersPack.java index b2872d8..684ed0a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemDrawersPack.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemDrawersPack.java @@ -1,24 +1,20 @@ package com.jaquadro.minecraft.storagedrawers.item.pack; -import com.jaquadro.minecraft.storagedrawers.item.ItemBasicDrawers; -import com.jaquadro.minecraft.storagedrawers.item.ItemDrawers; import com.jaquadro.minecraft.storagedrawers.block.pack.BlockDrawersPack; +import com.jaquadro.minecraft.storagedrawers.item.ItemBasicDrawers; import net.minecraft.block.Block; -public class ItemDrawersPack extends ItemBasicDrawers -{ - public ItemDrawersPack (Block block) { +public class ItemDrawersPack extends ItemBasicDrawers { + public ItemDrawersPack(Block block) { super(block, getUnlocalizedNames(block)); } - protected ItemDrawersPack (Block block, String[] unlocalizedNames) { + protected ItemDrawersPack(Block block, String[] unlocalizedNames) { super(block, unlocalizedNames); } - private static String[] getUnlocalizedNames (Block block) { - if (block instanceof BlockDrawersPack) - return ((BlockDrawersPack) block).getUnlocalizedNames(); - else - return new String[16]; + private static String[] getUnlocalizedNames(Block block) { + if (block instanceof BlockDrawersPack) return ((BlockDrawersPack) block).getUnlocalizedNames(); + else return new String[16]; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemSortingDrawersPack.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemSortingDrawersPack.java index 7a57832..7433410 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemSortingDrawersPack.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemSortingDrawersPack.java @@ -3,30 +3,26 @@ package com.jaquadro.minecraft.storagedrawers.item.pack; import com.jaquadro.minecraft.storagedrawers.block.pack.BlockSortingDrawersPack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import java.util.List; - -public class ItemSortingDrawersPack extends ItemDrawersPack -{ - public ItemSortingDrawersPack (Block block) { +public class ItemSortingDrawersPack extends ItemDrawersPack { + public ItemSortingDrawersPack(Block block) { super(block, getUnlocalizedNames(block)); } - private static String[] getUnlocalizedNames (Block block) { - if (block instanceof BlockSortingDrawersPack) - return ((BlockSortingDrawersPack) block).getUnlocalizedNames(); - else - return new String[16]; + private static String[] getUnlocalizedNames(Block block) { + if (block instanceof BlockSortingDrawersPack) return ((BlockSortingDrawersPack) block).getUnlocalizedNames(); + else return new String[16]; } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { super.addInformation(itemStack, player, list, par4); list.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocalFormatted("storageDrawers.waila.sorting")); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemSortingTrimPack.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemSortingTrimPack.java index deda525..c53a278 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemSortingTrimPack.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemSortingTrimPack.java @@ -3,31 +3,27 @@ package com.jaquadro.minecraft.storagedrawers.item.pack; import com.jaquadro.minecraft.storagedrawers.block.pack.BlockSortingTrimPack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import java.util.List; - -public class ItemSortingTrimPack extends ItemTrimPack -{ - public ItemSortingTrimPack (Block block) { +public class ItemSortingTrimPack extends ItemTrimPack { + public ItemSortingTrimPack(Block block) { super(block, getUnlocalizedNames(block)); } - private static String[] getUnlocalizedNames (Block block) { - if (block instanceof BlockSortingTrimPack) - return ((BlockSortingTrimPack) block).getUnlocalizedNames(); - else - return new String[16]; + private static String[] getUnlocalizedNames(Block block) { + if (block instanceof BlockSortingTrimPack) return ((BlockSortingTrimPack) block).getUnlocalizedNames(); + else return new String[16]; } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { super.addInformation(itemStack, player, list, par4); list.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocalFormatted("storageDrawers.waila.sorting")); } -} \ No newline at end of file +} diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemTrimPack.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemTrimPack.java index 4354c48..8d5e15e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemTrimPack.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/pack/ItemTrimPack.java @@ -1,23 +1,20 @@ package com.jaquadro.minecraft.storagedrawers.item.pack; -import com.jaquadro.minecraft.storagedrawers.item.ItemTrim; import com.jaquadro.minecraft.storagedrawers.block.pack.BlockTrimPack; +import com.jaquadro.minecraft.storagedrawers.item.ItemTrim; import net.minecraft.block.Block; -public class ItemTrimPack extends ItemTrim -{ - public ItemTrimPack (Block block) { +public class ItemTrimPack extends ItemTrim { + public ItemTrimPack(Block block) { super(block, getUnlocalizedNames(block)); } - protected ItemTrimPack (Block block, String[] unlocalizedNames) { + protected ItemTrimPack(Block block, String[] unlocalizedNames) { super(block, unlocalizedNames); } - private static String[] getUnlocalizedNames (Block block) { - if (block instanceof BlockTrimPack) - return ((BlockTrimPack) block).getUnlocalizedNames(); - else - return new String[16]; + private static String[] getUnlocalizedNames(Block block) { + if (block instanceof BlockTrimPack) return ((BlockTrimPack) block).getUnlocalizedNames(); + else return new String[16]; } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/network/BlockClickMessage.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/network/BlockClickMessage.java index fe51efc..a3a0a25 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/network/BlockClickMessage.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/network/BlockClickMessage.java @@ -9,8 +9,7 @@ import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.world.World; -public class BlockClickMessage implements IMessage -{ +public class BlockClickMessage implements IMessage { private int x; private int y; private int z; @@ -20,9 +19,9 @@ public class BlockClickMessage implements IMessage private float hitZ; private boolean invertShift; - public BlockClickMessage () { } + public BlockClickMessage() {} - public BlockClickMessage (int x, int y, int z, int side, float hitX, float hitY, float hitZ, boolean invertShift) { + public BlockClickMessage(int x, int y, int z, int side, float hitX, float hitY, float hitZ, boolean invertShift) { this.x = x; this.y = y; this.z = z; @@ -34,7 +33,7 @@ public class BlockClickMessage implements IMessage } @Override - public void fromBytes (ByteBuf buf) { + public void fromBytes(ByteBuf buf) { x = buf.readInt(); y = buf.readShort(); z = buf.readInt(); @@ -46,7 +45,7 @@ public class BlockClickMessage implements IMessage } @Override - public void toBytes (ByteBuf buf) { + public void toBytes(ByteBuf buf) { buf.writeInt(x); buf.writeShort(y); buf.writeInt(z); @@ -57,15 +56,25 @@ public class BlockClickMessage implements IMessage buf.writeBoolean(invertShift); } - public static class Handler implements IMessageHandler - { + public static class Handler implements IMessageHandler { @Override - public IMessage onMessage (BlockClickMessage message, MessageContext ctx) { + public IMessage onMessage(BlockClickMessage message, MessageContext ctx) { if (ctx.side == Side.SERVER) { World world = ctx.getServerHandler().playerEntity.getEntityWorld(); Block block = world.getBlock(message.x, message.y, message.z); if (block instanceof IExtendedBlockClickHandler) - ((IExtendedBlockClickHandler) block).onBlockClicked(world, message.x, message.y, message.z, ctx.getServerHandler().playerEntity, message.side, message.hitX, message.hitY, message.hitZ, message.invertShift); + ((IExtendedBlockClickHandler) block) + .onBlockClicked( + world, + message.x, + message.y, + message.z, + ctx.getServerHandler().playerEntity, + message.side, + message.hitX, + message.hitY, + message.hitZ, + message.invertShift); } return null; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/network/CountUpdateMessage.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/network/CountUpdateMessage.java index c19393f..27bb068 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/network/CountUpdateMessage.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/network/CountUpdateMessage.java @@ -14,17 +14,16 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import org.apache.logging.log4j.Level; -public class CountUpdateMessage implements IMessage -{ +public class CountUpdateMessage implements IMessage { private int x; private int y; private int z; private int slot; private int count; - public CountUpdateMessage () { } + public CountUpdateMessage() {} - public CountUpdateMessage (int x, int y, int z, int slot, int count) { + public CountUpdateMessage(int x, int y, int z, int slot, int count) { this.x = x; this.y = y; this.z = z; @@ -33,7 +32,7 @@ public class CountUpdateMessage implements IMessage } @Override - public void fromBytes (ByteBuf buf) { + public void fromBytes(ByteBuf buf) { x = buf.readInt(); y = buf.readShort(); z = buf.readInt(); @@ -42,7 +41,7 @@ public class CountUpdateMessage implements IMessage } @Override - public void toBytes (ByteBuf buf) { + public void toBytes(ByteBuf buf) { buf.writeInt(x); buf.writeShort(y); buf.writeInt(z); @@ -51,10 +50,9 @@ public class CountUpdateMessage implements IMessage } @SideOnly(Side.CLIENT) - public static class Handler implements IMessageHandler - { + public static class Handler implements IMessageHandler { @Override - public IMessage onMessage (CountUpdateMessage message, MessageContext ctx) { + public IMessage onMessage(CountUpdateMessage message, MessageContext ctx) { if (ctx.side == Side.CLIENT) { World world = Minecraft.getMinecraft().theWorld; TileEntity tileEntity = world.getTileEntity(message.x, message.y, message.z); @@ -67,10 +65,9 @@ public class CountUpdateMessage implements IMessage } } - public static class HandlerStub implements IMessageHandler - { + public static class HandlerStub implements IMessageHandler { @Override - public IMessage onMessage (CountUpdateMessage message, MessageContext ctx) { + public IMessage onMessage(CountUpdateMessage message, MessageContext ctx) { FMLLog.log(StorageDrawers.MOD_ID, Level.WARN, "CountUpdateMessage stub handler called."); return null; } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/security/DefaultSecurityProvider.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/security/DefaultSecurityProvider.java index 832275f..6ea0341 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/security/DefaultSecurityProvider.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/security/DefaultSecurityProvider.java @@ -4,23 +4,21 @@ import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IProtectable; import com.mojang.authlib.GameProfile; -public class DefaultSecurityProvider implements ISecurityProvider -{ +public class DefaultSecurityProvider implements ISecurityProvider { @Override - public String getProviderID () { + public String getProviderID() { return null; } @Override - public boolean hasOwnership (GameProfile profile, IProtectable target) { - if (target == null || profile == null) - return false; + public boolean hasOwnership(GameProfile profile, IProtectable target) { + if (target == null || profile == null) return false; return target.getOwner() == null || target.getOwner().equals(profile.getId()); } @Override - public boolean hasAccess (GameProfile profile, IProtectable target) { + public boolean hasAccess(GameProfile profile, IProtectable target) { return hasOwnership(profile, target); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/security/SecurityManager.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/security/SecurityManager.java index f0e921a..02c6df9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/security/SecurityManager.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/security/SecurityManager.java @@ -4,28 +4,23 @@ import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IProtectable; import com.mojang.authlib.GameProfile; -public class SecurityManager -{ +public class SecurityManager { private static ISecurityProvider defaultProvider = new DefaultSecurityProvider(); - public static boolean hasOwnership (GameProfile profile, IProtectable target) { - if (target == null || profile == null) - return false; + public static boolean hasOwnership(GameProfile profile, IProtectable target) { + if (target == null || profile == null) return false; ISecurityProvider provider = target.getSecurityProvider(); - if (provider == null) - provider = defaultProvider; + if (provider == null) provider = defaultProvider; return provider.hasOwnership(profile, target); } - public static boolean hasAccess (GameProfile profile, IProtectable target) { - if (target == null || profile == null) - return false; + public static boolean hasAccess(GameProfile profile, IProtectable target) { + if (target == null || profile == null) return false; ISecurityProvider provider = target.getSecurityProvider(); - if (provider == null) - provider = defaultProvider; + if (provider == null) provider = defaultProvider; return provider.hasAccess(profile, target); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/security/SecurityRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/security/SecurityRegistry.java index 8c5a3da..a13f9a0 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/security/SecurityRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/security/SecurityRegistry.java @@ -1,19 +1,17 @@ package com.jaquadro.minecraft.storagedrawers.security; import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; - import java.util.HashMap; import java.util.Map; -public class SecurityRegistry -{ +public class SecurityRegistry { private Map registry = new HashMap(); - public void registerProvider (ISecurityProvider provider) { + public void registerProvider(ISecurityProvider provider) { registry.put(provider.getProviderID(), provider); } - public ISecurityProvider getProvider (String name) { + public ISecurityProvider getProvider(String name) { return registry.get(name); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/BaseDrawerData.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/BaseDrawerData.java index ab1ee76..73c4300 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/BaseDrawerData.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/BaseDrawerData.java @@ -5,38 +5,35 @@ import com.jaquadro.minecraft.storagedrawers.api.inventory.IInventoryAdapter; import com.jaquadro.minecraft.storagedrawers.api.inventory.SlotType; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.inventory.InventoryStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; -public abstract class BaseDrawerData implements IDrawer, IInventoryAdapter -{ +public abstract class BaseDrawerData implements IDrawer, IInventoryAdapter { protected InventoryStack inventoryStack; private List oreDictMatches; private Map auxData; - protected BaseDrawerData () { + protected BaseDrawerData() { inventoryStack = new DrawerInventoryStack(); } - protected void postInit () { + protected void postInit() { inventoryStack.init(); } - protected void reset () { + protected void reset() { oreDictMatches = null; inventoryStack.reset(); } @Override - public ItemStack getStoredItemCopy () { + public ItemStack getStoredItemCopy() { ItemStack protoStack = getStoredItemPrototype(); - if (protoStack == null) - return null; + if (protoStack == null) return null; ItemStack stack = protoStack.copy(); stack.stackSize = getStoredItemCount(); @@ -44,32 +41,28 @@ public abstract class BaseDrawerData implements IDrawer, IInventoryAdapter return stack; } - protected void refreshOreDictMatches () { + protected void refreshOreDictMatches() { int[] oreIDs = OreDictionary.getOreIDs(getStoredItemPrototype()); - if (oreIDs.length == 0) - oreDictMatches = null; + if (oreIDs.length == 0) oreDictMatches = null; else { oreDictMatches = new ArrayList(); for (int id : oreIDs) { String oreName = OreDictionary.getOreName(id); - if (!StorageDrawers.oreDictRegistry.isEntryValid(oreName)) - continue; + if (!StorageDrawers.oreDictRegistry.isEntryValid(oreName)) continue; List list = OreDictionary.getOres(oreName); for (int i = 0, n = list.size(); i < n; i++) { - if (list.get(i).getItemDamage() == OreDictionary.WILDCARD_VALUE) - continue; + if (list.get(i).getItemDamage() == OreDictionary.WILDCARD_VALUE) continue; oreDictMatches.add(list.get(i)); } } - if (oreDictMatches.size() == 0) - oreDictMatches = null; + if (oreDictMatches.size() == 0) oreDictMatches = null; } } @Override - public ItemStack getInventoryStack (SlotType slotType) { + public ItemStack getInventoryStack(SlotType slotType) { switch (slotType) { case INPUT: return inventoryStack.getInStack(); @@ -81,58 +74,51 @@ public abstract class BaseDrawerData implements IDrawer, IInventoryAdapter } @Override - public void setInStack (ItemStack stack) { + public void setInStack(ItemStack stack) { inventoryStack.setInStack(stack); } @Override - public void setOutStack (ItemStack stack) { + public void setOutStack(ItemStack stack) { inventoryStack.setOutStack(stack); } @Override - public void syncInventory () { + public void syncInventory() { inventoryStack.markDirty(); } - public boolean syncInventoryIfNeeded () { + public boolean syncInventoryIfNeeded() { return inventoryStack.markDirtyIfNeeded(); } @Override - public Object getExtendedData (String key) { - if (auxData == null || !auxData.containsKey(key)) - return null; + public Object getExtendedData(String key) { + if (auxData == null || !auxData.containsKey(key)) return null; return auxData.get(key); } @Override - public void setExtendedData (String key, Object data) { - if (auxData == null) - auxData = new HashMap(); + public void setExtendedData(String key, Object data) { + if (auxData == null) auxData = new HashMap(); auxData.put(key, data); } - protected int getItemCapacityForInventoryStack () { + protected int getItemCapacityForInventoryStack() { return getMaxCapacity(); } - public boolean areItemsEqual (ItemStack item) { + public boolean areItemsEqual(ItemStack item) { ItemStack protoStack = getStoredItemPrototype(); - if (protoStack == null || item == null) - return false; - if (protoStack.getItem() == null || item.getItem() == null) - return false; + if (protoStack == null || item == null) return false; + if (protoStack.getItem() == null || item.getItem() == null) return false; if (!protoStack.isItemEqual(item)) { - if (!StorageDrawers.config.cache.enableItemConversion) - return false; - if (oreDictMatches == null) - return false; - if (protoStack.getItem() == item.getItem()) - return false; + if (!StorageDrawers.config.cache.enableItemConversion) return false; + if (oreDictMatches == null) return false; + if (protoStack.getItem() == item.getItem()) return false; boolean oreMatch = false; for (int i = 0, n = oreDictMatches.size(); i < n; i++) { @@ -142,41 +128,34 @@ public abstract class BaseDrawerData implements IDrawer, IInventoryAdapter } } - if (!oreMatch) - return false; + if (!oreMatch) return false; } return ItemStack.areItemStackTagsEqual(protoStack, item); } - public static boolean areItemsEqual (ItemStack stack1, ItemStack stack2) { + public static boolean areItemsEqual(ItemStack stack1, ItemStack stack2) { return areItemsEqual(stack1, stack2, true); } - public static boolean areItemsEqual (ItemStack stack1, ItemStack stack2, boolean oreDictStrictMode) { - if (stack1 == null || stack2 == null) - return false; - if (stack1.getItem() == null || stack2.getItem() == null) - return false; + public static boolean areItemsEqual(ItemStack stack1, ItemStack stack2, boolean oreDictStrictMode) { + if (stack1 == null || stack2 == null) return false; + if (stack1.getItem() == null || stack2.getItem() == null) return false; if (!stack1.isItemEqual(stack2)) { - if (!StorageDrawers.config.cache.enableItemConversion) - return false; - if (stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE || stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE) - return false; - if (stack1.getItem() == stack2.getItem()) - return false; + if (!StorageDrawers.config.cache.enableItemConversion) return false; + if (stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE + || stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE) return false; + if (stack1.getItem() == stack2.getItem()) return false; int[] ids1 = OreDictionary.getOreIDs(stack1); int[] ids2 = OreDictionary.getOreIDs(stack2); - if (ids1.length == 0 || ids2.length == 0) - return false; + if (ids1.length == 0 || ids2.length == 0) return false; boolean oreMatch = false; for (int id1 : ids1) { for (int id2 : ids2) { - if (id1 != id2) - continue; + if (id1 != id2) continue; String name = OreDictionary.getOreName(id1); if (!oreDictStrictMode || StorageDrawers.oreDictRegistry.isEntryValid(name)) { @@ -185,43 +164,39 @@ public abstract class BaseDrawerData implements IDrawer, IInventoryAdapter } } - if (oreMatch) - break; + if (oreMatch) break; } - if (!oreMatch) - return false; + if (!oreMatch) return false; } return ItemStack.areItemStackTagsEqual(stack1, stack2); } - class DrawerInventoryStack extends InventoryStack - { + class DrawerInventoryStack extends InventoryStack { @Override - protected ItemStack getNewItemStack () { + protected ItemStack getNewItemStack() { return getStoredItemCopy(); } @Override - protected int getItemStackSize () { + protected int getItemStackSize() { return getStoredItemStackSize(); } @Override - protected int getItemCount () { + protected int getItemCount() { return getStoredItemCount(); } @Override - protected int getItemCapacity () { + protected int getItemCapacity() { return getItemCapacityForInventoryStack(); } @Override - protected void applyDiff (int diff) { - if (diff != 0) - setStoredItemCount(getStoredItemCount() + diff); + protected void applyDiff(int diff) { + if (diff != 0) setStoredItemCount(getStoredItemCount() + diff); } } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java index c3b0a1d..2d418a9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java @@ -10,25 +10,24 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -public class CompDrawerData extends BaseDrawerData implements IFractionalDrawer, IVoidable, IShroudable, ILockable -{ - private static final ItemStack nullStack = new ItemStack((Item)null); +public class CompDrawerData extends BaseDrawerData implements IFractionalDrawer, IVoidable, IShroudable, ILockable { + private static final ItemStack nullStack = new ItemStack((Item) null); private ICentralInventory central; private int slot; - public CompDrawerData (ICentralInventory centralInventory, int slot) { + public CompDrawerData(ICentralInventory centralInventory, int slot) { this.slot = slot; this.central = centralInventory; } @Override - public ItemStack getStoredItemPrototype () { + public ItemStack getStoredItemPrototype() { return central.getStoredItemPrototype(slot); } @Override - public void setStoredItem (ItemStack itemPrototype, int amount) { + public void setStoredItem(ItemStack itemPrototype, int amount) { central.setStoredItem(slot, itemPrototype, amount); refresh(); @@ -36,7 +35,7 @@ public class CompDrawerData extends BaseDrawerData implements IFractionalDrawer, } @Override - public IDrawer setStoredItemRedir (ItemStack itemPrototype, int amount) { + public IDrawer setStoredItemRedir(ItemStack itemPrototype, int amount) { IDrawer target = central.setStoredItem(slot, itemPrototype, amount); refresh(); @@ -44,114 +43,113 @@ public class CompDrawerData extends BaseDrawerData implements IFractionalDrawer, } @Override - public int getStoredItemCount () { + public int getStoredItemCount() { return central.getStoredItemCount(slot); } @Override - public void setStoredItemCount (int amount) { + public void setStoredItemCount(int amount) { central.setStoredItemCount(slot, amount); } @Override - public int getMaxCapacity () { + public int getMaxCapacity() { return central.getMaxCapacity(slot); } @Override - public int getMaxCapacity (ItemStack itemPrototype) { + public int getMaxCapacity(ItemStack itemPrototype) { return central.getMaxCapacity(slot, itemPrototype); } @Override - public int getRemainingCapacity () { + public int getRemainingCapacity() { return central.getRemainingCapacity(slot); } @Override - public int getStoredItemStackSize () { + public int getStoredItemStackSize() { return central.getStoredItemStackSize(slot); } @Override - protected int getItemCapacityForInventoryStack () { + protected int getItemCapacityForInventoryStack() { return central.getItemCapacityForInventoryStack(slot); } @Override - public boolean canItemBeStored (ItemStack itemPrototype) { - if (getStoredItemPrototype() == null && !isLocked(LockAttribute.LOCK_EMPTY)) - return true; + public boolean canItemBeStored(ItemStack itemPrototype) { + if (getStoredItemPrototype() == null && !isLocked(LockAttribute.LOCK_EMPTY)) return true; return areItemsEqual(itemPrototype); } @Override - public boolean canItemBeExtracted (ItemStack itemPrototype) { + public boolean canItemBeExtracted(ItemStack itemPrototype) { return areItemsEqual(itemPrototype); } @Override - public boolean isEmpty () { + public boolean isEmpty() { return getStoredItemPrototype() == null; } @Override - public void writeToNBT (NBTTagCompound tag) { + public void writeToNBT(NBTTagCompound tag) { central.writeToNBT(slot, tag); } @Override - public void readFromNBT (NBTTagCompound tag) { + public void readFromNBT(NBTTagCompound tag) { central.readFromNBT(slot, tag); refresh(); } @Override - public int getConversionRate () { + public int getConversionRate() { return central.getConversionRate(slot); } @Override - public int getStoredItemRemainder () { + public int getStoredItemRemainder() { return central.getStoredItemRemainder(slot); } @Override - public boolean isSmallestUnit () { + public boolean isSmallestUnit() { return central.isSmallestUnit(slot); } - public void refresh () { + public void refresh() { reset(); refreshOreDictMatches(); } @Override - public boolean isVoid () { + public boolean isVoid() { return central.isVoidSlot(slot); } @Override - public boolean isShrouded () { + public boolean isShrouded() { return central.isShroudedSlot(slot); } @Override - public boolean setIsShrouded (boolean state) { + public boolean setIsShrouded(boolean state) { return central.setIsSlotShrouded(slot, state); } @Override - public boolean isLocked (LockAttribute attr) { + public boolean isLocked(LockAttribute attr) { return central.isLocked(slot, attr); } @Override - public boolean canLock (LockAttribute attr) { + public boolean canLock(LockAttribute attr) { return false; } @Override - public void setLocked (LockAttribute attr, boolean isLocked) { } + public void setLocked(LockAttribute attr, boolean isLocked) {} } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DefaultStorageProvider.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DefaultStorageProvider.java index 5ca733d..6b277f9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DefaultStorageProvider.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DefaultStorageProvider.java @@ -6,49 +6,47 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute import com.jaquadro.minecraft.storagedrawers.network.CountUpdateMessage; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.IMessage; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -public class DefaultStorageProvider implements IStorageProvider -{ +public class DefaultStorageProvider implements IStorageProvider { TileEntity tile; IDrawerGroup group; - public DefaultStorageProvider (TileEntity tileEntity, IDrawerGroup drawerGroup) { + public DefaultStorageProvider(TileEntity tileEntity, IDrawerGroup drawerGroup) { tile = tileEntity; group = drawerGroup; } @Override - public boolean isCentrallyManaged () { + public boolean isCentrallyManaged() { return false; } @Override - public int getSlotCount (int slot) { + public int getSlotCount(int slot) { return 0; } @Override - public void setSlotCount (int slot, int amount) { } + public void setSlotCount(int slot, int amount) {} @Override - public int getSlotStackCapacity (int slot) { + public int getSlotStackCapacity(int slot) { return 0; } @Override - public boolean isLocked ( int slot, LockAttribute attr) { + public boolean isLocked(int slot, LockAttribute attr) { return false; } @Override - public boolean isVoid (int slot) { + public boolean isVoid(int slot) { return false; } @Override - public boolean isShrouded (int slot) { + public boolean isShrouded(int slot) { return false; } @@ -58,48 +56,48 @@ public class DefaultStorageProvider implements IStorageProvider } @Override - public boolean setIsShrouded (int slot, boolean state) { + public boolean setIsShrouded(int slot, boolean state) { return false; } @Override - public boolean isStorageUnlimited (int slot) { + public boolean isStorageUnlimited(int slot) { return false; } @Override - public boolean isVendingUnlimited (int slot) { + public boolean isVendingUnlimited(int slot) { return false; } @Override - public boolean isRedstone (int slot) { + public boolean isRedstone(int slot) { return false; } @Override - public void markAmountDirty (int slot) { - if (tile.getWorldObj().isRemote) - return; + public void markAmountDirty(int slot) { + if (tile.getWorldObj().isRemote) return; int count = group.getDrawer(slot).getStoredItemCount(); IMessage message = new CountUpdateMessage(tile.xCoord, tile.yCoord, tile.zCoord, slot, count); - NetworkRegistry.TargetPoint targetPoint = new NetworkRegistry.TargetPoint(tile.getWorldObj().provider.dimensionId, tile.xCoord, tile.yCoord, tile.zCoord, 500); + NetworkRegistry.TargetPoint targetPoint = new NetworkRegistry.TargetPoint( + tile.getWorldObj().provider.dimensionId, tile.xCoord, tile.yCoord, tile.zCoord, 500); StorageDrawers.network.sendToAllAround(message, targetPoint); tile.getWorldObj().markTileEntityChunkModified(tile.xCoord, tile.yCoord, tile.zCoord, tile); if (isRedstone(slot)) { tile.getWorldObj().notifyBlocksOfNeighborChange(tile.xCoord, tile.yCoord, tile.zCoord, tile.getBlockType()); - tile.getWorldObj().notifyBlocksOfNeighborChange(tile.xCoord, tile.yCoord - 1, tile.zCoord, tile.getBlockType()); + tile.getWorldObj() + .notifyBlocksOfNeighborChange(tile.xCoord, tile.yCoord - 1, tile.zCoord, tile.getBlockType()); } } @Override - public void markDirty (int slot) { - if (tile.getWorldObj().isRemote) - return; + public void markDirty(int slot) { + if (tile.getWorldObj().isRemote) return; tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord); tile.getWorldObj().markTileEntityChunkModified(tile.xCoord, tile.yCoord, tile.zCoord, tile); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java index 1d852ef..765c8fc 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java @@ -11,9 +11,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; -public class DrawerData extends BaseDrawerData implements IVoidable, IShroudable, ILockable -{ - private static final ItemStack nullStack = new ItemStack((Item)null); +public class DrawerData extends BaseDrawerData implements IVoidable, IShroudable, ILockable { + private static final ItemStack nullStack = new ItemStack((Item) null); private IStorageProvider storageProvider; private int slot; @@ -21,7 +20,7 @@ public class DrawerData extends BaseDrawerData implements IVoidable, IShroudable private ItemStack protoStack; private int count; - public DrawerData (IStorageProvider provider, int slot) { + public DrawerData(IStorageProvider provider, int slot) { storageProvider = provider; protoStack = nullStack; this.slot = slot; @@ -30,25 +29,24 @@ public class DrawerData extends BaseDrawerData implements IVoidable, IShroudable } @Override - public ItemStack getStoredItemPrototype () { - if (protoStack == nullStack) - return null; + public ItemStack getStoredItemPrototype() { + if (protoStack == nullStack) return null; return protoStack; } @Override - public void setStoredItem (ItemStack itemPrototype, int amount) { + public void setStoredItem(ItemStack itemPrototype, int amount) { setStoredItem(itemPrototype, amount, true); } @Override - public IDrawer setStoredItemRedir (ItemStack itemPrototype, int amount) { + public IDrawer setStoredItemRedir(ItemStack itemPrototype, int amount) { setStoredItem(itemPrototype, amount, true); return this; } - private void setStoredItem (ItemStack itemPrototype, int amount, boolean mark) { + private void setStoredItem(ItemStack itemPrototype, int amount, boolean mark) { if (itemPrototype == null) { setStoredItemCount(0, false, true); protoStack = nullStack; @@ -57,8 +55,7 @@ public class DrawerData extends BaseDrawerData implements IVoidable, IShroudable DrawerPopulatedEvent event = new DrawerPopulatedEvent(this); MinecraftForge.EVENT_BUS.post(event); - if (mark) - storageProvider.markDirty(slot); + if (mark) storageProvider.markDirty(slot); return; } @@ -72,52 +69,43 @@ public class DrawerData extends BaseDrawerData implements IVoidable, IShroudable DrawerPopulatedEvent event = new DrawerPopulatedEvent(this); MinecraftForge.EVENT_BUS.post(event); - if (mark) - storageProvider.markDirty(slot); + if (mark) storageProvider.markDirty(slot); } @Override - public int getStoredItemCount () { - if (protoStack != nullStack && storageProvider.isVendingUnlimited(slot)) - return Integer.MAX_VALUE; + public int getStoredItemCount() { + if (protoStack != nullStack && storageProvider.isVendingUnlimited(slot)) return Integer.MAX_VALUE; return count; } @Override - public void setStoredItemCount (int amount) { + public void setStoredItemCount(int amount) { setStoredItemCount(amount, true, true); } - public void setStoredItemCount (int amount, boolean mark, boolean clearOnEmpty) { - if (storageProvider.isVendingUnlimited(slot)) - return; + public void setStoredItemCount(int amount, boolean mark, boolean clearOnEmpty) { + if (storageProvider.isVendingUnlimited(slot)) return; count = amount; - if (count > getMaxCapacity()) - count = getMaxCapacity(); + if (count > getMaxCapacity()) count = getMaxCapacity(); if (amount == 0) { if (clearOnEmpty) { - if (!storageProvider.isLocked(slot, LockAttribute.LOCK_POPULATED)) - reset(); - if (mark) - storageProvider.markDirty(slot); + if (!storageProvider.isLocked(slot, LockAttribute.LOCK_POPULATED)) reset(); + if (mark) storageProvider.markDirty(slot); } - } - else if (mark) - storageProvider.markAmountDirty(slot); + } else if (mark) storageProvider.markAmountDirty(slot); } @Override - public int getMaxCapacity () { + public int getMaxCapacity() { return getMaxCapacity(protoStack); } @Override - public int getMaxCapacity (ItemStack itemPrototype) { - if (itemPrototype == null || itemPrototype.getItem() == null) - return 0; + public int getMaxCapacity(ItemStack itemPrototype) { + if (itemPrototype == null || itemPrototype.getItem() == null) return 0; if (storageProvider.isStorageUnlimited(slot) || storageProvider.isVendingUnlimited(slot)) return Integer.MAX_VALUE; @@ -126,86 +114,75 @@ public class DrawerData extends BaseDrawerData implements IVoidable, IShroudable } @Override - public int getRemainingCapacity () { - if (protoStack.getItem() == null) - return 0; + public int getRemainingCapacity() { + if (protoStack.getItem() == null) return 0; - if (storageProvider.isVendingUnlimited(slot)) - return Integer.MAX_VALUE; + if (storageProvider.isVendingUnlimited(slot)) return Integer.MAX_VALUE; return getMaxCapacity() - getStoredItemCount(); } @Override - public int getStoredItemStackSize () { - if (protoStack.getItem() == null) - return 0; + public int getStoredItemStackSize() { + if (protoStack.getItem() == null) return 0; return protoStack.getItem().getItemStackLimit(protoStack); } @Override - protected int getItemCapacityForInventoryStack () { - if (storageProvider.isVoid(slot)) - return Integer.MAX_VALUE; - else - return getMaxCapacity(); + protected int getItemCapacityForInventoryStack() { + if (storageProvider.isVoid(slot)) return Integer.MAX_VALUE; + else return getMaxCapacity(); } @Override - public boolean canItemBeStored (ItemStack itemPrototype) { - if (protoStack == nullStack && !isLocked(LockAttribute.LOCK_EMPTY)) - return true; + public boolean canItemBeStored(ItemStack itemPrototype) { + if (protoStack == nullStack && !isLocked(LockAttribute.LOCK_EMPTY)) return true; return areItemsEqual(itemPrototype); } @Override - public boolean canItemBeExtracted (ItemStack itemPrototype) { - if (protoStack == nullStack) - return false; + public boolean canItemBeExtracted(ItemStack itemPrototype) { + if (protoStack == nullStack) return false; return areItemsEqual(itemPrototype); } @Override - public boolean isEmpty () { + public boolean isEmpty() { return protoStack == nullStack; } - public void writeToNBT (NBTTagCompound tag) { + public void writeToNBT(NBTTagCompound tag) { if (protoStack.getItem() != null) { tag.setShort("Item", (short) Item.getIdFromItem(protoStack.getItem())); tag.setShort("Meta", (short) protoStack.getItemDamage()); tag.setInteger("Count", count); - if (protoStack.getTagCompound() != null) - tag.setTag("Tags", protoStack.getTagCompound()); + if (protoStack.getTagCompound() != null) tag.setTag("Tags", protoStack.getTagCompound()); } } - public void readFromNBT (NBTTagCompound tag) { + public void readFromNBT(NBTTagCompound tag) { if (tag.hasKey("Item") && tag.hasKey("Count")) { Item item = Item.getItemById(tag.getShort("Item")); if (item != null) { ItemStack stack = new ItemStack(item); stack.setItemDamage(tag.getShort("Meta")); - if (tag.hasKey("Tags")) - stack.setTagCompound(tag.getCompoundTag("Tags")); + if (tag.hasKey("Tags")) stack.setTagCompound(tag.getCompoundTag("Tags")); setStoredItem(stack, tag.getInteger("Count"), false); - } - else { + } else { reset(); } - } - else { + } else { reset(); } } @Override - protected void reset () { + protected void reset() { protoStack = nullStack; super.reset(); @@ -214,31 +191,30 @@ public class DrawerData extends BaseDrawerData implements IVoidable, IShroudable } @Override - public boolean isVoid () { + public boolean isVoid() { return storageProvider.isVoid(slot); } @Override - public boolean isShrouded () { + public boolean isShrouded() { return storageProvider.isShrouded(slot); } @Override - public boolean setIsShrouded (boolean state) { + public boolean setIsShrouded(boolean state) { return storageProvider.setIsShrouded(slot, state); } @Override - public boolean isLocked (LockAttribute attr) { + public boolean isLocked(LockAttribute attr) { return storageProvider.isLocked(slot, attr); } @Override - public boolean canLock (LockAttribute attr) { + public boolean canLock(LockAttribute attr) { return false; } @Override - public void setLocked (LockAttribute attr, boolean isLocked) { } + public void setLocked(LockAttribute attr, boolean isLocked) {} } - diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java index b701be7..66786bb 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java @@ -5,41 +5,40 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -public interface ICentralInventory -{ - public ItemStack getStoredItemPrototype (int slot); +public interface ICentralInventory { + public ItemStack getStoredItemPrototype(int slot); - public IDrawer setStoredItem (int slot, ItemStack itemPrototype, int amount); + public IDrawer setStoredItem(int slot, ItemStack itemPrototype, int amount); - public int getStoredItemCount (int slot); + public int getStoredItemCount(int slot); - public void setStoredItemCount (int slot, int amount); + public void setStoredItemCount(int slot, int amount); - public int getMaxCapacity (int slot); + public int getMaxCapacity(int slot); - public int getMaxCapacity (int slot, ItemStack itemPrototype); + public int getMaxCapacity(int slot, ItemStack itemPrototype); - public int getRemainingCapacity (int slot); + public int getRemainingCapacity(int slot); - public int getStoredItemStackSize (int slot); + public int getStoredItemStackSize(int slot); - public int getItemCapacityForInventoryStack (int slot); + public int getItemCapacityForInventoryStack(int slot); - public int getConversionRate (int slot); + public int getConversionRate(int slot); - public int getStoredItemRemainder (int slot); + public int getStoredItemRemainder(int slot); - public boolean isSmallestUnit (int slot); + public boolean isSmallestUnit(int slot); - public boolean isVoidSlot (int slot); + public boolean isVoidSlot(int slot); - public boolean isShroudedSlot (int slot); + public boolean isShroudedSlot(int slot); - public boolean setIsSlotShrouded (int slot, boolean state); + public boolean setIsSlotShrouded(int slot, boolean state); - public boolean isLocked (int slot, LockAttribute attr); + public boolean isLocked(int slot, LockAttribute attr); - public void readFromNBT (int slot, NBTTagCompound tag); + public void readFromNBT(int slot, NBTTagCompound tag); - public void writeToNBT (int slot, NBTTagCompound tag); + public void writeToNBT(int slot, NBTTagCompound tag); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/IStorageProvider.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/IStorageProvider.java index f382d06..bd86cda 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/IStorageProvider.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/IStorageProvider.java @@ -1,35 +1,33 @@ package com.jaquadro.minecraft.storagedrawers.storage; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; -import net.minecraft.item.ItemStack; -public interface IStorageProvider -{ - public boolean isCentrallyManaged (); +public interface IStorageProvider { + public boolean isCentrallyManaged(); - public int getSlotCount (int slot); + public int getSlotCount(int slot); - public void setSlotCount (int slot, int amount); + public void setSlotCount(int slot, int amount); - public int getSlotStackCapacity (int slot); + public int getSlotStackCapacity(int slot); - public boolean isLocked (int slot, LockAttribute attr); + public boolean isLocked(int slot, LockAttribute attr); - public boolean isVoid (int slot); + public boolean isVoid(int slot); - public boolean isShrouded (int slot); + public boolean isShrouded(int slot); - public boolean isDowngraded (int slot); + public boolean isDowngraded(int slot); - public boolean setIsShrouded (int slot, boolean state); + public boolean setIsShrouded(int slot, boolean state); - public boolean isStorageUnlimited (int slot); + public boolean isStorageUnlimited(int slot); - public boolean isVendingUnlimited (int slot); + public boolean isVendingUnlimited(int slot); - public boolean isRedstone (int slot); + public boolean isRedstone(int slot); - public void markAmountDirty (int slot); + public void markAmountDirty(int slot); - public void markDirty (int slot); + public void markDirty(int slot); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/IUpgradeProvider.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/IUpgradeProvider.java index d8bf228..110f487 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/IUpgradeProvider.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/IUpgradeProvider.java @@ -1,13 +1,11 @@ package com.jaquadro.minecraft.storagedrawers.storage; -public interface IUpgradeProvider -{ - boolean isVoid (); +public interface IUpgradeProvider { + boolean isVoid(); - boolean isSorting (); + boolean isSorting(); - boolean isShrouded (); - - boolean isDowngraded (); + boolean isShrouded(); + boolean isDowngraded(); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/ItemMetaListRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/ItemMetaListRegistry.java index 49e3240..b030dbc 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/ItemMetaListRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/ItemMetaListRegistry.java @@ -1,27 +1,25 @@ package com.jaquadro.minecraft.storagedrawers.util; -import net.minecraft.item.Item; - import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraft.item.Item; -public class ItemMetaListRegistry -{ +public class ItemMetaListRegistry { private ItemMetaRegistry> registry; private boolean compactTopLevel; - public ItemMetaListRegistry () { + public ItemMetaListRegistry() { this(false); } - public ItemMetaListRegistry (boolean compactTopLevel) { + public ItemMetaListRegistry(boolean compactTopLevel) { this.registry = new ItemMetaRegistry>(compactTopLevel); this.compactTopLevel = compactTopLevel; } - public void register (Item item, int meta, E entry) { + public void register(Item item, int meta, E entry) { List list = registry.getEntry(item, meta); if (list == null) { list = new ArrayList(); @@ -31,33 +29,31 @@ public class ItemMetaListRegistry list.add(entry); } - public List getEntries (Item item, int meta) { + public List getEntries(Item item, int meta) { return registry.getEntry(item, meta); } - public void remove (Item item, int meta) { + public void remove(Item item, int meta) { registry.remove(item, meta); } - public void clear (Item item, int meta) { + public void clear(Item item, int meta) { List list = registry.getEntry(item, meta); - if (list != null) - list.clear(); + if (list != null) list.clear(); } - public void clear (Item item) { + public void clear(Item item) { for (Map.Entry> map : registry.entrySet(item)) map.getValue().clear(); } - public void clear () { + public void clear() { for (Map.Entry>> map : registry.entrySet()) { - for (List list : map.getValue().values()) - list.clear(); + for (List list : map.getValue().values()) list.clear(); } } - public Set>>> entrySet () { + public Set>>> entrySet() { return registry.entrySet(); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/ItemMetaRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/ItemMetaRegistry.java index 9a02e22..2927024 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/ItemMetaRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/ItemMetaRegistry.java @@ -1,26 +1,24 @@ package com.jaquadro.minecraft.storagedrawers.util; -import net.minecraft.item.Item; - import java.util.HashMap; import java.util.Map; import java.util.Set; +import net.minecraft.item.Item; -public class ItemMetaRegistry -{ +public class ItemMetaRegistry { private Map> registry; private boolean compactTopLevel; - public ItemMetaRegistry () { + public ItemMetaRegistry() { registry = new HashMap>(); } - public ItemMetaRegistry (boolean compactTopLevel) { + public ItemMetaRegistry(boolean compactTopLevel) { this(); this.compactTopLevel = compactTopLevel; } - public void register (Item item, int meta, E entry) { + public void register(Item item, int meta, E entry) { Map metamap = registry.get(item); if (metamap == null) { metamap = new HashMap(); @@ -30,48 +28,41 @@ public class ItemMetaRegistry metamap.put(meta, entry); } - public E getEntry (Item item, int meta) { + public E getEntry(Item item, int meta) { Map metamap = registry.get(item); - if (metamap == null) - return null; + if (metamap == null) return null; return metamap.get(meta); } - public void remove (Item item, int meta) { + public void remove(Item item, int meta) { Map metamap = registry.get(item); - if (metamap == null) - return; + if (metamap == null) return; metamap.remove(meta); - if (compactTopLevel && metamap.isEmpty()) - registry.remove(item); + if (compactTopLevel && metamap.isEmpty()) registry.remove(item); } - public void clear (Item item) { + public void clear(Item item) { Map metamap = registry.get(item); - if (metamap == null) - return; + if (metamap == null) return; metamap.clear(); - if (compactTopLevel) - registry.remove(item); + if (compactTopLevel) registry.remove(item); } - public void clear () { - if (compactTopLevel) - registry.clear(); + public void clear() { + if (compactTopLevel) registry.clear(); else { - for (Item item : registry.keySet()) - clear(item); + for (Item item : registry.keySet()) clear(item); } } - public Set>> entrySet () { + public Set>> entrySet() { return registry.entrySet(); } - public Set> entrySet (Item item) { + public Set> entrySet(Item item) { Map metamap = registry.get(item); if (metamap == null) { metamap = new HashMap(); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelper.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelper.java index cc8d8c3..b719972 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelper.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelper.java @@ -10,8 +10,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -public class RenderHelper -{ +public class RenderHelper { public static final int YNEG = 0; public static final int YPOS = 1; public static final int ZNEG = 2; @@ -22,12 +21,12 @@ public class RenderHelper public static final int FULL_BRIGHTNESS = 15728880; private static final float normMap[][] = { - { 0, -1, 0 }, - { 0, 1, 0 }, - { 0, 0, -1 }, - { 0, 0, 1 }, - { -1, 0, 0 }, - { 1, 0, 0 }, + {0, -1, 0}, + {0, 1, 0}, + {0, 0, -1}, + {0, 0, 1}, + {-1, 0, 0}, + {1, 0, 0}, }; public RenderHelperState state = new RenderHelperState(); @@ -39,10 +38,10 @@ public class RenderHelper public static RenderHelper instance = new RenderHelper(); - public static void calculateBaseColor (float[] target, int color) { - float r = (float)(color >> 16 & 255) / 255f; - float g = (float)(color >> 8 & 255) / 255f; - float b = (float)(color & 255) / 255f; + public static void calculateBaseColor(float[] target, int color) { + float r = (float) (color >> 16 & 255) / 255f; + float g = (float) (color >> 8 & 255) / 255f; + float b = (float) (color & 255) / 255f; if (EntityRenderer.anaglyphEnable) { float gray = (r * 30f + g * 59f + b * 11f) / 100f; @@ -59,34 +58,40 @@ public class RenderHelper target[2] = b; } - public static void scaleColor (float[] target, float[] source, float scale) { + public static void scaleColor(float[] target, float[] source, float scale) { target[0] = source[0] * scale; target[1] = source[1] * scale; target[2] = source[2] * scale; } - public static void setTessellatorColor (Tessellator tessellator, float[] color) { + public static void setTessellatorColor(Tessellator tessellator, float[] color) { tessellator.setColorOpaque_F(color[0], color[1], color[2]); } - public void renderEmptyPlane (int x, int y, int z) { + public void renderEmptyPlane(int x, int y, int z) { state.setRenderBounds(0, 0, 0, 0, 0, 0); llHelper.drawFace(RenderHelper.YNEG, x, y, z, Blocks.dirt.getIcon(0, 0)); } - public void setRenderBounds (double xMin, double yMin, double zMin, double xMax, double yMax, double zMax) { + public void setRenderBounds(double xMin, double yMin, double zMin, double xMax, double yMax, double zMax) { state.setRenderBounds(xMin, yMin, zMin, xMax, yMax, zMax); } - public void setRenderBounds (double[] bound) { + public void setRenderBounds(double[] bound) { state.setRenderBounds(bound[0], bound[1], bound[2], bound[3], bound[4], bound[5]); } - public void setRenderBounds (Block block) { - setRenderBounds(block.getBlockBoundsMinX(), block.getBlockBoundsMinY(), block.getBlockBoundsMinZ(), block.getBlockBoundsMaxX(), block.getBlockBoundsMaxY(), block.getBlockBoundsMaxZ()); + public void setRenderBounds(Block block) { + setRenderBounds( + block.getBlockBoundsMinX(), + block.getBlockBoundsMinY(), + block.getBlockBoundsMinZ(), + block.getBlockBoundsMaxX(), + block.getBlockBoundsMaxY(), + block.getBlockBoundsMaxZ()); } - public void setColorAndBrightness (IBlockAccess blockAccess, Block block, int x, int y, int z) { + public void setColorAndBrightness(IBlockAccess blockAccess, Block block, int x, int y, int z) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(block.getMixedBrightnessForBlock(blockAccess, x, y, z)); @@ -94,7 +99,7 @@ public class RenderHelper setTessellatorColor(tessellator, colorScratch); } - public void renderBlock (IBlockAccess blockAccess, Block block, int meta) { + public void renderBlock(IBlockAccess blockAccess, Block block, int meta) { calculateBaseColor(colorScratch, block.getRenderColor(meta)); float r = colorScratch[0]; float g = colorScratch[1]; @@ -108,7 +113,7 @@ public class RenderHelper renderFace(XPOS, blockAccess, block, block.getIcon(5, meta), r, g, b); } - public void renderBlock (IBlockAccess blockAccess, Block block, int x, int y, int z) { + public void renderBlock(IBlockAccess blockAccess, Block block, int x, int y, int z) { calculateBaseColor(colorScratch, block.colorMultiplier(blockAccess, x, y, z)); float r = colorScratch[0]; float g = colorScratch[1]; @@ -122,38 +127,68 @@ public class RenderHelper renderFace(XPOS, blockAccess, block, x, y, z, block.getIcon(blockAccess, x, y, z, 5), r, g, b); } - public void renderFace (int face, IBlockAccess blockAccess, Block block, IIcon icon, int meta) { + public void renderFace(int face, IBlockAccess blockAccess, Block block, IIcon icon, int meta) { calculateBaseColor(colorScratch, block.getRenderColor(meta)); renderFaceColorMult(face, blockAccess, block, 0, 0, 0, icon, colorScratch[0], colorScratch[1], colorScratch[2]); } - public void renderFace (int face, IBlockAccess blockAccess, Block block, IIcon icon, float r, float g, float b) { + public void renderFace(int face, IBlockAccess blockAccess, Block block, IIcon icon, float r, float g, float b) { renderFaceColorMult(face, blockAccess, block, 0, 0, 0, icon, r, g, b); } - public void renderFace (int face, IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon) { + public void renderFace(int face, IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon) { calculateBaseColor(colorScratch, block.colorMultiplier(blockAccess, x, y, z)); renderFace(face, blockAccess, block, x, y, z, icon, colorScratch[0], colorScratch[1], colorScratch[2]); } - public void renderFace (int face, IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { - if (Minecraft.isAmbientOcclusionEnabled() && blockAccess != null && block.getLightValue(blockAccess, x, y, z) == 0) + public void renderFace( + int face, + IBlockAccess blockAccess, + Block block, + int x, + int y, + int z, + IIcon icon, + float r, + float g, + float b) { + if (Minecraft.isAmbientOcclusionEnabled() + && blockAccess != null + && block.getLightValue(blockAccess, x, y, z) == 0) renderFaceAOPartial(face, blockAccess, block, x, y, z, icon, r, g, b); - else - renderFaceColorMult(face, blockAccess, block, x, y, z, icon, r, g, b); + else renderFaceColorMult(face, blockAccess, block, x, y, z, icon, r, g, b); } - public void renderFaceColorMult (int face, IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + public void renderFaceColorMult( + int face, + IBlockAccess blockAccess, + Block block, + int x, + int y, + int z, + IIcon icon, + float r, + float g, + float b) { setupColorMult(face, blockAccess, block, x, y, z, r, g, b); face = RenderHelperState.FACE_BY_FACE_ROTATION[face][state.rotateTransform]; llHelper.drawFace(face, x, y, z, icon); - if (blockAccess == null) - Tessellator.instance.draw(); + if (blockAccess == null) Tessellator.instance.draw(); } - public void renderFaceAOPartial (int face, IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) { + public void renderFaceAOPartial( + int face, + IBlockAccess blockAccess, + Block block, + int x, + int y, + int z, + IIcon icon, + float r, + float g, + float b) { state.enableAO = true; face = RenderHelperState.FACE_BY_FACE_ROTATION[face][state.rotateTransform]; @@ -184,34 +219,102 @@ public class RenderHelper state.enableAO = false; } - public void renderPartialFace (int face, IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon, double uMin, double vMin, double uMax, double vMax) { + public void renderPartialFace( + int face, + IBlockAccess blockAccess, + Block block, + int x, + int y, + int z, + IIcon icon, + double uMin, + double vMin, + double uMax, + double vMax) { calculateBaseColor(colorScratch, block.colorMultiplier(blockAccess, x, y, z)); - renderPartialFace(face, blockAccess, block, x, y, z, icon, uMin, vMin, uMax, vMax, colorScratch[0], colorScratch[1], colorScratch[2]); + renderPartialFace( + face, + blockAccess, + block, + x, + y, + z, + icon, + uMin, + vMin, + uMax, + vMax, + colorScratch[0], + colorScratch[1], + colorScratch[2]); } - public void renderPartialFace (int face, IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon, double uMin, double vMin, double uMax, double vMax, float r, float g, float b) { - if (Minecraft.isAmbientOcclusionEnabled() && blockAccess != null && block.getLightValue(blockAccess, x, y, z) == 0) + public void renderPartialFace( + int face, + IBlockAccess blockAccess, + Block block, + int x, + int y, + int z, + IIcon icon, + double uMin, + double vMin, + double uMax, + double vMax, + float r, + float g, + float b) { + if (Minecraft.isAmbientOcclusionEnabled() + && blockAccess != null + && block.getLightValue(blockAccess, x, y, z) == 0) renderPartialFaceAOPartial(face, blockAccess, block, x, y, z, icon, uMin, vMin, uMax, vMax, r, g, b); - else - renderPartialFaceColorMult(face, blockAccess, block, x, y, z, icon, uMin, vMin, uMax, vMax, r, g, b); + else renderPartialFaceColorMult(face, blockAccess, block, x, y, z, icon, uMin, vMin, uMax, vMax, r, g, b); } - public void renderPartialFaceColorMult (int face, IIcon icon, double uMin, double vMin, double uMax, double vMax, float r, float g, float b) { + public void renderPartialFaceColorMult( + int face, IIcon icon, double uMin, double vMin, double uMax, double vMax, float r, float g, float b) { setupColorMult(face, r, g, b); renderPartialFace(face, icon, uMin, vMin, uMax, vMax); Tessellator.instance.draw(); } - public void renderPartialFaceColorMult (int face, IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon, double uMin, double vMin, double uMax, double vMax, float r, float g, float b) { + public void renderPartialFaceColorMult( + int face, + IBlockAccess blockAccess, + Block block, + int x, + int y, + int z, + IIcon icon, + double uMin, + double vMin, + double uMax, + double vMax, + float r, + float g, + float b) { setupColorMult(face, blockAccess, block, x, y, z, r, g, b); renderPartialFace(face, x, y, z, icon, uMin, vMin, uMax, vMax); - if (blockAccess == null) - Tessellator.instance.draw(); + if (blockAccess == null) Tessellator.instance.draw(); } - public void renderPartialFaceAOPartial (int face, IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon, double uMin, double vMin, double uMax, double vMax, float r, float g, float b) { + public void renderPartialFaceAOPartial( + int face, + IBlockAccess blockAccess, + Block block, + int x, + int y, + int z, + IIcon icon, + double uMin, + double vMin, + double uMax, + double vMax, + float r, + float g, + float b) { state.enableAO = true; switch (RenderHelperState.FACE_BY_FACE_ROTATION[face][state.rotateTransform]) { @@ -239,22 +342,23 @@ public class RenderHelper state.enableAO = false; } - public void renderPartialFace (int face, IIcon icon, double uMin, double vMin, double uMax, double vMax) { + public void renderPartialFace(int face, IIcon icon, double uMin, double vMin, double uMax, double vMax) { state.enableAO = false; face = RenderHelperState.FACE_BY_FACE_ROTATION[face][state.rotateTransform]; llHelper.drawPartialFace(face, 0, 0, 0, icon, uMin, vMin, uMax, vMax); } - public void renderPartialFace (int face, double x, double y, double z, IIcon icon, double uMin, double vMin, double uMax, double vMax) { + public void renderPartialFace( + int face, double x, double y, double z, IIcon icon, double uMin, double vMin, double uMax, double vMax) { face = RenderHelperState.FACE_BY_FACE_ROTATION[face][state.rotateTransform]; llHelper.drawPartialFace(face, x, y, z, icon, uMin, vMin, uMax, vMax); } - public void renderCrossedSquares (Block block, int meta) { + public void renderCrossedSquares(Block block, int meta) { renderCrossedSquares(block, meta, getBlockIconFromSideAndMetadata(block, 0, meta)); } - public void renderCrossedSquares (Block block, int meta, IIcon icon) { + public void renderCrossedSquares(Block block, int meta, IIcon icon) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(FULL_BRIGHTNESS); @@ -270,15 +374,20 @@ public class RenderHelper tessellator.draw(); - if (lighting) - GL11.glEnable(GL11.GL_LIGHTING); + if (lighting) GL11.glEnable(GL11.GL_LIGHTING); } - public void renderCrossedSquares (IBlockAccess blockAccess, Block block, int x, int y, int z) { - renderCrossedSquares(blockAccess, block, x, y, z, getBlockIconFromSideAndMetadata(block, 0, blockAccess.getBlockMetadata(x, y, z))); + public void renderCrossedSquares(IBlockAccess blockAccess, Block block, int x, int y, int z) { + renderCrossedSquares( + blockAccess, + block, + x, + y, + z, + getBlockIconFromSideAndMetadata(block, 0, blockAccess.getBlockMetadata(x, y, z))); } - public void renderCrossedSquares (IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon) { + public void renderCrossedSquares(IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(block.getMixedBrightnessForBlock(blockAccess, x, y, z)); @@ -288,8 +397,7 @@ public class RenderHelper drawCrossedSquares(icon, x, y, z, 1.0F); } - public void drawCrossedSquares(IIcon icon, double x, double y, double z, float scale) - { + public void drawCrossedSquares(IIcon icon, double x, double y, double z, float scale) { Tessellator tessellator = Tessellator.instance; x += state.renderOffsetX; @@ -301,7 +409,7 @@ public class RenderHelper double vMin = icon.getInterpolatedV(16 - state.renderMaxY * 16.0D); double vMax = icon.getInterpolatedV(16 - state.renderMinY * 16.0D); - double d7 = 0.45D * (double)scale; + double d7 = 0.45D * (double) scale; double xMin = x + 0.5D - d7; double xMax = x + 0.5D + d7; double yMin = y + state.renderMinY * scale; @@ -328,8 +436,7 @@ public class RenderHelper tessellator.addVertexWithUV(xMin, yMax, zMax, uMax, vMin); } - public void drawCrossedSquaresBounded(IIcon icon, double x, double y, double z, float scale) - { + public void drawCrossedSquaresBounded(IIcon icon, double x, double y, double z, float scale) { Tessellator tessellator = Tessellator.instance; x += state.renderOffsetX; @@ -387,7 +494,7 @@ public class RenderHelper tessellator.addVertexWithUV(xNP, yMax, zNP, uNP, vMin); } - private void setupColorMult (int face, float r, float g, float b) { + private void setupColorMult(int face, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; float[] norm = normMap[face]; float scale = state.getColorMult(face); @@ -399,7 +506,8 @@ public class RenderHelper state.enableAO = false; } - private void setupColorMult (int face, IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { + private void setupColorMult( + int face, IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; float[] norm = normMap[face]; float scale = state.getColorMult(face); @@ -408,19 +516,30 @@ public class RenderHelper tessellator.startDrawingQuads(); tessellator.setColorOpaque_F(r, g, b); tessellator.setNormal(norm[0], norm[1], norm[2]); - } - else { + } else { int brightX = x; int brightY = y; int brightZ = z; switch (face) { - case YNEG: brightY = (state.renderMinY > 0) ? y : y - 1; break; - case YPOS: brightY = (state.renderMaxY < 1) ? y : y + 1; break; - case ZNEG: brightZ = (state.renderMinZ > 0) ? z : z - 1; break; - case ZPOS: brightZ = (state.renderMaxZ < 1) ? z : z + 1; break; - case XNEG: brightX = (state.renderMinX > 0) ? x : x - 1; break; - case XPOS: brightX = (state.renderMaxX < 1) ? x : x + 1; break; + case YNEG: + brightY = (state.renderMinY > 0) ? y : y - 1; + break; + case YPOS: + brightY = (state.renderMaxY < 1) ? y : y + 1; + break; + case ZNEG: + brightZ = (state.renderMinZ > 0) ? z : z - 1; + break; + case ZPOS: + brightZ = (state.renderMaxZ < 1) ? z : z + 1; + break; + case XNEG: + brightX = (state.renderMinX > 0) ? x : x - 1; + break; + case XPOS: + brightX = (state.renderMaxX < 1) ? x : x + 1; + break; } tessellator.setColorOpaque_F(scale * r, scale * g, scale * b); @@ -430,13 +549,15 @@ public class RenderHelper state.enableAO = false; } - private IIcon getBlockIconFromSideAndMetadata (Block block, int side, int meta) { + private IIcon getBlockIconFromSideAndMetadata(Block block, int side, int meta) { return getIconSafe(block.getIcon(side, meta)); } - private IIcon getIconSafe (IIcon icon) { + private IIcon getIconSafe(IIcon icon) { if (icon == null) - return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno"); + return ((TextureMap) + Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)) + .getAtlasSprite("missingno"); return icon; } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperAO.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperAO.java index 4d3937b..fd19de9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperAO.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperAO.java @@ -5,8 +5,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; -public class RenderHelperAO -{ +public class RenderHelperAO { private RenderHelperState state; private int aoBrightnessXYNI; @@ -103,11 +102,12 @@ public class RenderHelperAO private float aoLightValueScratchXYZIPN; private float aoLightValueScratchXYZIPP; - public RenderHelperAO (RenderHelperState state) { + public RenderHelperAO(RenderHelperState state) { this.state = state; } - public void setupYNegAOPartial (IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { + public void setupYNegAOPartial( + IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); @@ -119,9 +119,11 @@ public class RenderHelperAO boolean blocksGrassYZNN = !blockAccess.getBlock(x, yGrass, z - 1).getCanBlockGrass(); if (state.renderMinY > 0) - setupAOBrightnessYNeg(blockAccess, block, x, y, z, blocksGrassXYPN, blocksGrassXYNN, blocksGrassYZNP, blocksGrassYZNN); + setupAOBrightnessYNeg( + blockAccess, block, x, y, z, blocksGrassXYPN, blocksGrassXYNN, blocksGrassYZNP, blocksGrassYZNN); - setupAOBrightnessYPos(blockAccess, block, x, y - 1, z, blocksGrassXYPN, blocksGrassXYNN, blocksGrassYZNP, blocksGrassYZNN); + setupAOBrightnessYPos( + blockAccess, block, x, y - 1, z, blocksGrassXYPN, blocksGrassXYNN, blocksGrassYZNP, blocksGrassYZNN); float yClamp = MathHelper.clamp_float((float) state.renderMinY, 0, 1); mixAOBrightnessLightValueY(yClamp, 1 - yClamp); @@ -131,25 +133,77 @@ public class RenderHelperAO blockBrightness = block.getMixedBrightnessForBlock(blockAccess, x, y - 1, z); float aoOpposingBlock = blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(); - float aoXYZNNP = (aoLightValueScratchXYNI + aoLightValueScratchXYZNIP + aoOpposingBlock + aoLightValueScratchYZIP) / 4.0F; - float aoXYZPNP = (aoOpposingBlock + aoLightValueScratchYZIP + aoLightValueScratchXYPI + aoLightValueScratchXYZPIP) / 4.0F; - float aoXYZPNN = (aoLightValueScratchYZIN + aoOpposingBlock + aoLightValueScratchXYZPIN + aoLightValueScratchXYPI) / 4.0F; - float aoXYZNNN = (aoLightValueScratchXYZNIN + aoLightValueScratchXYNI + aoLightValueScratchYZIN + aoOpposingBlock) / 4.0F; + float aoXYZNNP = + (aoLightValueScratchXYNI + aoLightValueScratchXYZNIP + aoOpposingBlock + aoLightValueScratchYZIP) + / 4.0F; + float aoXYZPNP = + (aoOpposingBlock + aoLightValueScratchYZIP + aoLightValueScratchXYPI + aoLightValueScratchXYZPIP) + / 4.0F; + float aoXYZPNN = + (aoLightValueScratchYZIN + aoOpposingBlock + aoLightValueScratchXYZPIN + aoLightValueScratchXYPI) + / 4.0F; + float aoXYZNNN = + (aoLightValueScratchXYZNIN + aoLightValueScratchXYNI + aoLightValueScratchYZIN + aoOpposingBlock) + / 4.0F; - float aoTR = (float)((double)aoXYZNNP * state.renderMinX * (1.0D - state.renderMaxZ) + (double)aoXYZPNP * state.renderMinX * state.renderMaxZ + (double)aoXYZPNN * (1.0D - state.renderMinX) * state.renderMaxZ + (double)aoXYZNNN * (1.0D - state.renderMinX) * (1.0D - state.renderMaxZ)); - float aoTL = (float)((double)aoXYZNNP * state.renderMinX * (1.0D - state.renderMinZ) + (double)aoXYZPNP * state.renderMinX * state.renderMinZ + (double)aoXYZPNN * (1.0D - state.renderMinX) * state.renderMinZ + (double)aoXYZNNN * (1.0D - state.renderMinX) * (1.0D - state.renderMinZ)); - float aoBL = (float)((double)aoXYZNNP * state.renderMaxX * (1.0D - state.renderMinZ) + (double)aoXYZPNP * state.renderMaxX * state.renderMinZ + (double)aoXYZPNN * (1.0D - state.renderMaxX) * state.renderMinZ + (double)aoXYZNNN * (1.0D - state.renderMaxX) * (1.0D - state.renderMinZ)); - float aoBR = (float)((double)aoXYZNNP * state.renderMaxX * (1.0D - state.renderMaxZ) + (double)aoXYZPNP * state.renderMaxX * state.renderMaxZ + (double)aoXYZPNN * (1.0D - state.renderMaxX) * state.renderMaxZ + (double)aoXYZNNN * (1.0D - state.renderMaxX) * (1.0D - state.renderMaxZ)); + float aoTR = (float) ((double) aoXYZNNP * state.renderMinX * (1.0D - state.renderMaxZ) + + (double) aoXYZPNP * state.renderMinX * state.renderMaxZ + + (double) aoXYZPNN * (1.0D - state.renderMinX) * state.renderMaxZ + + (double) aoXYZNNN * (1.0D - state.renderMinX) * (1.0D - state.renderMaxZ)); + float aoTL = (float) ((double) aoXYZNNP * state.renderMinX * (1.0D - state.renderMinZ) + + (double) aoXYZPNP * state.renderMinX * state.renderMinZ + + (double) aoXYZPNN * (1.0D - state.renderMinX) * state.renderMinZ + + (double) aoXYZNNN * (1.0D - state.renderMinX) * (1.0D - state.renderMinZ)); + float aoBL = (float) ((double) aoXYZNNP * state.renderMaxX * (1.0D - state.renderMinZ) + + (double) aoXYZPNP * state.renderMaxX * state.renderMinZ + + (double) aoXYZPNN * (1.0D - state.renderMaxX) * state.renderMinZ + + (double) aoXYZNNN * (1.0D - state.renderMaxX) * (1.0D - state.renderMinZ)); + float aoBR = (float) ((double) aoXYZNNP * state.renderMaxX * (1.0D - state.renderMaxZ) + + (double) aoXYZPNP * state.renderMaxX * state.renderMaxZ + + (double) aoXYZPNN * (1.0D - state.renderMaxX) * state.renderMaxZ + + (double) aoXYZNNN * (1.0D - state.renderMaxX) * (1.0D - state.renderMaxZ)); int brXYZNNP = getAOBrightness(aoBrightnessXYNI, aoBrightnessXYZNIP, aoBrightnessYZIP, blockBrightness); int brXYZPNP = getAOBrightness(aoBrightnessYZIP, aoBrightnessXYPI, aoBrightnessXYZPIP, blockBrightness); int brXYZPNN = getAOBrightness(aoBrightnessYZIN, aoBrightnessXYZPIN, aoBrightnessXYPI, blockBrightness); int brXYZNNN = getAOBrightness(aoBrightnessXYZNIN, aoBrightnessXYNI, aoBrightnessYZIN, blockBrightness); - state.brightnessTopRight = mixAOBrightness(brXYZNNP, brXYZNNN, brXYZPNN, brXYZPNP, state.renderMaxX * (1.0D - state.renderMaxZ), (1.0D - state.renderMaxX) * (1.0D - state.renderMaxZ), (1.0D - state.renderMaxX) * state.renderMaxZ, state.renderMaxX * state.renderMaxZ); - state.brightnessTopLeft = mixAOBrightness(brXYZNNP, brXYZNNN, brXYZPNN, brXYZPNP, state.renderMaxX * (1.0D - state.renderMinZ), (1.0D - state.renderMaxX) * (1.0D - state.renderMinZ), (1.0D - state.renderMaxX) * state.renderMinZ, state.renderMaxX * state.renderMinZ); - state.brightnessBottomLeft = mixAOBrightness(brXYZNNP, brXYZNNN, brXYZPNN, brXYZPNP, state.renderMinX * (1.0D - state.renderMinZ), (1.0D - state.renderMinX) * (1.0D - state.renderMinZ), (1.0D - state.renderMinX) * state.renderMinZ, state.renderMinX * state.renderMinZ); - state.brightnessBottomRight = mixAOBrightness(brXYZNNP, brXYZNNN, brXYZPNN, brXYZPNP, state.renderMinX * (1.0D - state.renderMaxZ), (1.0D - state.renderMinX) * (1.0D - state.renderMaxZ), (1.0D - state.renderMinX) * state.renderMaxZ, state.renderMinX * state.renderMaxZ); + state.brightnessTopRight = mixAOBrightness( + brXYZNNP, + brXYZNNN, + brXYZPNN, + brXYZPNP, + state.renderMaxX * (1.0D - state.renderMaxZ), + (1.0D - state.renderMaxX) * (1.0D - state.renderMaxZ), + (1.0D - state.renderMaxX) * state.renderMaxZ, + state.renderMaxX * state.renderMaxZ); + state.brightnessTopLeft = mixAOBrightness( + brXYZNNP, + brXYZNNN, + brXYZPNN, + brXYZPNP, + state.renderMaxX * (1.0D - state.renderMinZ), + (1.0D - state.renderMaxX) * (1.0D - state.renderMinZ), + (1.0D - state.renderMaxX) * state.renderMinZ, + state.renderMaxX * state.renderMinZ); + state.brightnessBottomLeft = mixAOBrightness( + brXYZNNP, + brXYZNNN, + brXYZPNN, + brXYZPNP, + state.renderMinX * (1.0D - state.renderMinZ), + (1.0D - state.renderMinX) * (1.0D - state.renderMinZ), + (1.0D - state.renderMinX) * state.renderMinZ, + state.renderMinX * state.renderMinZ); + state.brightnessBottomRight = mixAOBrightness( + brXYZNNP, + brXYZNNN, + brXYZPNN, + brXYZPNP, + state.renderMinX * (1.0D - state.renderMaxZ), + (1.0D - state.renderMinX) * (1.0D - state.renderMaxZ), + (1.0D - state.renderMinX) * state.renderMaxZ, + state.renderMinX * state.renderMaxZ); state.setColor(r * state.colorMultYNeg, g * state.colorMultYNeg, b * state.colorMultYNeg); state.scaleColor(state.colorTopLeft, aoTL); @@ -158,12 +212,12 @@ public class RenderHelperAO state.scaleColor(state.colorTopRight, aoTR); } - public void setupYPosAOPartial (IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { + public void setupYPosAOPartial( + IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (state.renderMaxY >= 1.0D) - ++y; + if (state.renderMaxY >= 1.0D) ++y; aoBrightnessXYNP = block.getMixedBrightnessForBlock(blockAccess, x - 1, y, z); aoBrightnessXYPP = block.getMixedBrightnessForBlock(blockAccess, x + 1, y, z); @@ -208,33 +262,56 @@ public class RenderHelperAO aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(blockAccess, x + 1, y, z + 1); } - if (state.renderMaxY >= 1.0D) - --y; + if (state.renderMaxY >= 1.0D) --y; int blockBrightness = block.getMixedBrightnessForBlock(blockAccess, x, y, z); if (state.renderMaxY >= 1.0D || !blockAccess.getBlock(x, y + 1, z).isOpaqueCube()) blockBrightness = block.getMixedBrightnessForBlock(blockAccess, x, y + 1, z); float aoOpposingBlock = blockAccess.getBlock(x, y + 1, z).getAmbientOcclusionLightValue(); - float aoXYZNPN = (aoLightValueScratchXYZNPP + aoLightValueScratchXYNP + aoLightValueScratchYZPP + aoOpposingBlock) / 4.0F; // TR - float aoXYZNPP = (aoLightValueScratchYZPP + aoOpposingBlock + aoLightValueScratchXYZPPP + aoLightValueScratchXYPP) / 4.0F; // TL - float aoXYZPPP = (aoOpposingBlock + aoLightValueScratchYZPN + aoLightValueScratchXYPP + aoLightValueScratchXYZPPN) / 4.0F; // BL - float aoXYZPPN = (aoLightValueScratchXYNP + aoLightValueScratchXYZNPN + aoOpposingBlock + aoLightValueScratchYZPN) / 4.0F; // BR + float aoXYZNPN = + (aoLightValueScratchXYZNPP + aoLightValueScratchXYNP + aoLightValueScratchYZPP + aoOpposingBlock) + / 4.0F; // TR + float aoXYZNPP = + (aoLightValueScratchYZPP + aoOpposingBlock + aoLightValueScratchXYZPPP + aoLightValueScratchXYPP) + / 4.0F; // TL + float aoXYZPPP = + (aoOpposingBlock + aoLightValueScratchYZPN + aoLightValueScratchXYPP + aoLightValueScratchXYZPPN) + / 4.0F; // BL + float aoXYZPPN = + (aoLightValueScratchXYNP + aoLightValueScratchXYZNPN + aoOpposingBlock + aoLightValueScratchYZPN) + / 4.0F; // BR - float aoTL = (float)((double)aoXYZPPP * state.renderMaxX * (1.0D - state.renderMaxZ) + (double)aoXYZNPP * state.renderMaxX * state.renderMaxZ + (double)aoXYZNPN * (1.0D - state.renderMaxX) * state.renderMaxZ + (double)aoXYZPPN * (1.0D - state.renderMaxX) * (1.0D - state.renderMaxZ)); - float aoBL = (float)((double)aoXYZPPP * state.renderMaxX * (1.0D - state.renderMinZ) + (double)aoXYZNPP * state.renderMaxX * state.renderMinZ + (double)aoXYZNPN * (1.0D - state.renderMaxX) * state.renderMinZ + (double)aoXYZPPN * (1.0D - state.renderMaxX) * (1.0D - state.renderMinZ)); - float aoBR = (float)((double)aoXYZPPP * state.renderMinX * (1.0D - state.renderMinZ) + (double)aoXYZNPP * state.renderMinX * state.renderMinZ + (double)aoXYZNPN * (1.0D - state.renderMinX) * state.renderMinZ + (double)aoXYZPPN * (1.0D - state.renderMinX) * (1.0D - state.renderMinZ)); - float aoTR = (float)((double)aoXYZPPP * state.renderMinX * (1.0D - state.renderMaxZ) + (double)aoXYZNPP * state.renderMinX * state.renderMaxZ + (double)aoXYZNPN * (1.0D - state.renderMinX) * state.renderMaxZ + (double)aoXYZPPN * (1.0D - state.renderMinX) * (1.0D - state.renderMaxZ)); + float aoTL = (float) ((double) aoXYZPPP * state.renderMaxX * (1.0D - state.renderMaxZ) + + (double) aoXYZNPP * state.renderMaxX * state.renderMaxZ + + (double) aoXYZNPN * (1.0D - state.renderMaxX) * state.renderMaxZ + + (double) aoXYZPPN * (1.0D - state.renderMaxX) * (1.0D - state.renderMaxZ)); + float aoBL = (float) ((double) aoXYZPPP * state.renderMaxX * (1.0D - state.renderMinZ) + + (double) aoXYZNPP * state.renderMaxX * state.renderMinZ + + (double) aoXYZNPN * (1.0D - state.renderMaxX) * state.renderMinZ + + (double) aoXYZPPN * (1.0D - state.renderMaxX) * (1.0D - state.renderMinZ)); + float aoBR = (float) ((double) aoXYZPPP * state.renderMinX * (1.0D - state.renderMinZ) + + (double) aoXYZNPP * state.renderMinX * state.renderMinZ + + (double) aoXYZNPN * (1.0D - state.renderMinX) * state.renderMinZ + + (double) aoXYZPPN * (1.0D - state.renderMinX) * (1.0D - state.renderMinZ)); + float aoTR = (float) ((double) aoXYZPPP * state.renderMinX * (1.0D - state.renderMaxZ) + + (double) aoXYZNPP * state.renderMinX * state.renderMaxZ + + (double) aoXYZNPN * (1.0D - state.renderMinX) * state.renderMaxZ + + (double) aoXYZPPN * (1.0D - state.renderMinX) * (1.0D - state.renderMaxZ)); int brXYZPPN = getAOBrightness(aoBrightnessXYNP, aoBrightnessXYZNPP, aoBrightnessYZPP, blockBrightness); int brXYZNPN = getAOBrightness(aoBrightnessYZPP, aoBrightnessXYPP, aoBrightnessXYZPPP, blockBrightness); int brXYZNPP = getAOBrightness(aoBrightnessYZPN, aoBrightnessXYZPPN, aoBrightnessXYPP, blockBrightness); int brXYZPPP = getAOBrightness(aoBrightnessXYZNPN, aoBrightnessXYNP, aoBrightnessYZPN, blockBrightness); - state.brightnessTopLeft = mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, state.renderMaxZ, state.renderMaxX); - state.brightnessBottomLeft = mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, state.renderMinZ, state.renderMaxX); - state.brightnessBottomRight = mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, state.renderMinZ, state.renderMinX); - state.brightnessTopRight = mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, state.renderMaxZ, state.renderMinX); + state.brightnessTopLeft = + mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, state.renderMaxZ, state.renderMaxX); + state.brightnessBottomLeft = + mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, state.renderMinZ, state.renderMaxX); + state.brightnessBottomRight = + mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, state.renderMinZ, state.renderMinX); + state.brightnessTopRight = + mixAOBrightness(brXYZPPP, brXYZPPN, brXYZNPN, brXYZNPP, state.renderMaxZ, state.renderMinX); state.setColor(r * state.colorMultYPos, g * state.colorMultYPos, b * state.colorMultYPos); state.scaleColor(state.colorTopLeft, aoTL); @@ -243,7 +320,8 @@ public class RenderHelperAO state.scaleColor(state.colorTopRight, aoTR); } - public void setupZNegAOPartial (IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { + public void setupZNegAOPartial( + IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); @@ -255,9 +333,11 @@ public class RenderHelperAO boolean blocksGrassYZNN = !blockAccess.getBlock(x, y - 1, zGrass).getCanBlockGrass(); if (state.renderMinZ > 0) - setupAOBrightnessZNeg(blockAccess, block, x, y, z, blocksGrassXZPN, blocksGrassXZNN, blocksGrassYZPN, blocksGrassYZNN); + setupAOBrightnessZNeg( + blockAccess, block, x, y, z, blocksGrassXZPN, blocksGrassXZNN, blocksGrassYZPN, blocksGrassYZNN); - setupAOBrightnessZPos(blockAccess, block, x, y, z - 1, blocksGrassXZPN, blocksGrassXZNN, blocksGrassYZPN, blocksGrassYZNN); + setupAOBrightnessZPos( + blockAccess, block, x, y, z - 1, blocksGrassXZPN, blocksGrassXZNN, blocksGrassYZPN, blocksGrassYZNN); float zClamp = MathHelper.clamp_float((float) state.renderMinZ, 0, 1); mixAOBrightnessLightValueZ(zClamp, 1 - zClamp); @@ -267,25 +347,77 @@ public class RenderHelperAO blockBrightness = block.getMixedBrightnessForBlock(blockAccess, x, y, z - 1); float aoOpposingBlock = blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(); - float aoXYZNPN = (aoLightValueScratchXZNI + aoLightValueScratchXYZNPI + aoOpposingBlock + aoLightValueScratchYZPI) / 4.0F; - float aoXYZPPN = (aoOpposingBlock + aoLightValueScratchYZPI + aoLightValueScratchXZPI + aoLightValueScratchXYZPPI) / 4.0F; - float aoXYZPNN = (aoLightValueScratchYZNI + aoOpposingBlock + aoLightValueScratchXYZPNI + aoLightValueScratchXZPI) / 4.0F; - float aoXYZNNN = (aoLightValueScratchXYZNNI + aoLightValueScratchXZNI + aoLightValueScratchYZNI + aoOpposingBlock) / 4.0F; + float aoXYZNPN = + (aoLightValueScratchXZNI + aoLightValueScratchXYZNPI + aoOpposingBlock + aoLightValueScratchYZPI) + / 4.0F; + float aoXYZPPN = + (aoOpposingBlock + aoLightValueScratchYZPI + aoLightValueScratchXZPI + aoLightValueScratchXYZPPI) + / 4.0F; + float aoXYZPNN = + (aoLightValueScratchYZNI + aoOpposingBlock + aoLightValueScratchXYZPNI + aoLightValueScratchXZPI) + / 4.0F; + float aoXYZNNN = + (aoLightValueScratchXYZNNI + aoLightValueScratchXZNI + aoLightValueScratchYZNI + aoOpposingBlock) + / 4.0F; - float aoTL = (float)((double)aoXYZNPN * state.renderMaxY * (1.0D - state.renderMinX) + (double)aoXYZPPN * state.renderMaxY * state.renderMinX + (double)aoXYZPNN * (1.0D - state.renderMaxY) * state.renderMinX + (double)aoXYZNNN * (1.0D - state.renderMaxY) * (1.0D - state.renderMinX)); - float aoBL = (float)((double)aoXYZNPN * state.renderMaxY * (1.0D - state.renderMaxX) + (double)aoXYZPPN * state.renderMaxY * state.renderMaxX + (double)aoXYZPNN * (1.0D - state.renderMaxY) * state.renderMaxX + (double)aoXYZNNN * (1.0D - state.renderMaxY) * (1.0D - state.renderMaxX)); - float aoBR = (float)((double)aoXYZNPN * state.renderMinY * (1.0D - state.renderMaxX) + (double)aoXYZPPN * state.renderMinY * state.renderMaxX + (double)aoXYZPNN * (1.0D - state.renderMinY) * state.renderMaxX + (double)aoXYZNNN * (1.0D - state.renderMinY) * (1.0D - state.renderMaxX)); - float aoTR = (float)((double)aoXYZNPN * state.renderMinY * (1.0D - state.renderMinX) + (double)aoXYZPPN * state.renderMinY * state.renderMinX + (double)aoXYZPNN * (1.0D - state.renderMinY) * state.renderMinX + (double)aoXYZNNN * (1.0D - state.renderMinY) * (1.0D - state.renderMinX)); + float aoTL = (float) ((double) aoXYZNPN * state.renderMaxY * (1.0D - state.renderMinX) + + (double) aoXYZPPN * state.renderMaxY * state.renderMinX + + (double) aoXYZPNN * (1.0D - state.renderMaxY) * state.renderMinX + + (double) aoXYZNNN * (1.0D - state.renderMaxY) * (1.0D - state.renderMinX)); + float aoBL = (float) ((double) aoXYZNPN * state.renderMaxY * (1.0D - state.renderMaxX) + + (double) aoXYZPPN * state.renderMaxY * state.renderMaxX + + (double) aoXYZPNN * (1.0D - state.renderMaxY) * state.renderMaxX + + (double) aoXYZNNN * (1.0D - state.renderMaxY) * (1.0D - state.renderMaxX)); + float aoBR = (float) ((double) aoXYZNPN * state.renderMinY * (1.0D - state.renderMaxX) + + (double) aoXYZPPN * state.renderMinY * state.renderMaxX + + (double) aoXYZPNN * (1.0D - state.renderMinY) * state.renderMaxX + + (double) aoXYZNNN * (1.0D - state.renderMinY) * (1.0D - state.renderMaxX)); + float aoTR = (float) ((double) aoXYZNPN * state.renderMinY * (1.0D - state.renderMinX) + + (double) aoXYZPPN * state.renderMinY * state.renderMinX + + (double) aoXYZPNN * (1.0D - state.renderMinY) * state.renderMinX + + (double) aoXYZNNN * (1.0D - state.renderMinY) * (1.0D - state.renderMinX)); int brXYZNPN = getAOBrightness(aoBrightnessXZNI, aoBrightnessXYZNPI, aoBrightnessYZPI, blockBrightness); int brXYZPPN = getAOBrightness(aoBrightnessYZPI, aoBrightnessXZPI, aoBrightnessXYZPPI, blockBrightness); int brXYZPNN = getAOBrightness(aoBrightnessYZNI, aoBrightnessXYZPNI, aoBrightnessXZPI, blockBrightness); int brXYZNNN = getAOBrightness(aoBrightnessXYZNNI, aoBrightnessXZNI, aoBrightnessYZNI, blockBrightness); - state.brightnessTopLeft = mixAOBrightness(brXYZNPN, brXYZPPN, brXYZPNN, brXYZNNN, state.renderMaxY * (1.0D - state.renderMinX), state.renderMaxY * state.renderMinX, (1.0D - state.renderMaxY) * state.renderMinX, (1.0D - state.renderMaxY) * (1.0D - state.renderMinX)); - state.brightnessBottomLeft = mixAOBrightness(brXYZNPN, brXYZPPN, brXYZPNN, brXYZNNN, state.renderMaxY * (1.0D - state.renderMaxX), state.renderMaxY * state.renderMaxX, (1.0D - state.renderMaxY) * state.renderMaxX, (1.0D - state.renderMaxY) * (1.0D - state.renderMaxX)); - state.brightnessBottomRight = mixAOBrightness(brXYZNPN, brXYZPPN, brXYZPNN, brXYZNNN, state.renderMinY * (1.0D - state.renderMaxX), state.renderMinY * state.renderMaxX, (1.0D - state.renderMinY) * state.renderMaxX, (1.0D - state.renderMinY) * (1.0D - state.renderMaxX)); - state.brightnessTopRight = mixAOBrightness(brXYZNPN, brXYZPPN, brXYZPNN, brXYZNNN, state.renderMinY * (1.0D - state.renderMinX), state.renderMinY * state.renderMinX, (1.0D - state.renderMinY) * state.renderMinX, (1.0D - state.renderMinY) * (1.0D - state.renderMinX)); + state.brightnessTopLeft = mixAOBrightness( + brXYZNPN, + brXYZPPN, + brXYZPNN, + brXYZNNN, + state.renderMaxY * (1.0D - state.renderMinX), + state.renderMaxY * state.renderMinX, + (1.0D - state.renderMaxY) * state.renderMinX, + (1.0D - state.renderMaxY) * (1.0D - state.renderMinX)); + state.brightnessBottomLeft = mixAOBrightness( + brXYZNPN, + brXYZPPN, + brXYZPNN, + brXYZNNN, + state.renderMaxY * (1.0D - state.renderMaxX), + state.renderMaxY * state.renderMaxX, + (1.0D - state.renderMaxY) * state.renderMaxX, + (1.0D - state.renderMaxY) * (1.0D - state.renderMaxX)); + state.brightnessBottomRight = mixAOBrightness( + brXYZNPN, + brXYZPPN, + brXYZPNN, + brXYZNNN, + state.renderMinY * (1.0D - state.renderMaxX), + state.renderMinY * state.renderMaxX, + (1.0D - state.renderMinY) * state.renderMaxX, + (1.0D - state.renderMinY) * (1.0D - state.renderMaxX)); + state.brightnessTopRight = mixAOBrightness( + brXYZNPN, + brXYZPPN, + brXYZPNN, + brXYZNNN, + state.renderMinY * (1.0D - state.renderMinX), + state.renderMinY * state.renderMinX, + (1.0D - state.renderMinY) * state.renderMinX, + (1.0D - state.renderMinY) * (1.0D - state.renderMinX)); state.setColor(r * state.colorMultZNeg, g * state.colorMultZNeg, b * state.colorMultZNeg); state.scaleColor(state.colorTopLeft, aoTL); @@ -294,7 +426,8 @@ public class RenderHelperAO state.scaleColor(state.colorTopRight, aoTR); } - public void setupZPosAOPartial (IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { + public void setupZPosAOPartial( + IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); @@ -306,9 +439,11 @@ public class RenderHelperAO boolean blocksGrassYZNP = !blockAccess.getBlock(x, y - 1, zGrass).getCanBlockGrass(); if (state.renderMaxZ < 1) - setupAOBrightnessZPos(blockAccess, block, x, y, z, blocksGrassXZPP, blocksGrassXZNP, blocksGrassYZPP, blocksGrassYZNP); + setupAOBrightnessZPos( + blockAccess, block, x, y, z, blocksGrassXZPP, blocksGrassXZNP, blocksGrassYZPP, blocksGrassYZNP); - setupAOBrightnessZNeg(blockAccess, block, x, y, z + 1, blocksGrassXZPP, blocksGrassXZNP, blocksGrassYZPP, blocksGrassYZNP); + setupAOBrightnessZNeg( + blockAccess, block, x, y, z + 1, blocksGrassXZPP, blocksGrassXZNP, blocksGrassYZPP, blocksGrassYZNP); float zClamp = MathHelper.clamp_float((float) state.renderMaxZ, 0, 1); mixAOBrightnessLightValueZ(zClamp, 1 - zClamp); @@ -318,25 +453,77 @@ public class RenderHelperAO blockBrightness = block.getMixedBrightnessForBlock(blockAccess, x, y, z + 1); float aoOpposingBlock = blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(); - float aoXYZNPP = (aoLightValueScratchXZNI + aoLightValueScratchXYZNPI + aoOpposingBlock + aoLightValueScratchYZPI) / 4.0F; - float aoXYZPPP = (aoOpposingBlock + aoLightValueScratchYZPI + aoLightValueScratchXZPI + aoLightValueScratchXYZPPI) / 4.0F; - float aoXYZPNP = (aoLightValueScratchYZNI + aoOpposingBlock + aoLightValueScratchXYZPNI + aoLightValueScratchXZPI) / 4.0F; - float aoXYZNNP = (aoLightValueScratchXYZNNI + aoLightValueScratchXZNI + aoLightValueScratchYZNI + aoOpposingBlock) / 4.0F; + float aoXYZNPP = + (aoLightValueScratchXZNI + aoLightValueScratchXYZNPI + aoOpposingBlock + aoLightValueScratchYZPI) + / 4.0F; + float aoXYZPPP = + (aoOpposingBlock + aoLightValueScratchYZPI + aoLightValueScratchXZPI + aoLightValueScratchXYZPPI) + / 4.0F; + float aoXYZPNP = + (aoLightValueScratchYZNI + aoOpposingBlock + aoLightValueScratchXYZPNI + aoLightValueScratchXZPI) + / 4.0F; + float aoXYZNNP = + (aoLightValueScratchXYZNNI + aoLightValueScratchXZNI + aoLightValueScratchYZNI + aoOpposingBlock) + / 4.0F; - float aoTL = (float)((double)aoXYZNPP * state.renderMaxY * (1.0D - state.renderMinX) + (double)aoXYZPPP * state.renderMaxY * state.renderMinX + (double)aoXYZPNP * (1.0D - state.renderMaxY) * state.renderMinX + (double)aoXYZNNP * (1.0D - state.renderMaxY) * (1.0D - state.renderMinX)); - float aoBL = (float)((double)aoXYZNPP * state.renderMinY * (1.0D - state.renderMinX) + (double)aoXYZPPP * state.renderMinY * state.renderMinX + (double)aoXYZPNP * (1.0D - state.renderMinY) * state.renderMinX + (double)aoXYZNNP * (1.0D - state.renderMinY) * (1.0D - state.renderMinX)); - float aoBR = (float)((double)aoXYZNPP * state.renderMinY * (1.0D - state.renderMaxX) + (double)aoXYZPPP * state.renderMinY * state.renderMaxX + (double)aoXYZPNP * (1.0D - state.renderMinY) * state.renderMaxX + (double)aoXYZNNP * (1.0D - state.renderMinY) * (1.0D - state.renderMaxX)); - float aoTR = (float)((double)aoXYZNPP * state.renderMaxY * (1.0D - state.renderMaxX) + (double)aoXYZPPP * state.renderMaxY * state.renderMaxX + (double)aoXYZPNP * (1.0D - state.renderMaxY) * state.renderMaxX + (double)aoXYZNNP * (1.0D - state.renderMaxY) * (1.0D - state.renderMaxX)); + float aoTL = (float) ((double) aoXYZNPP * state.renderMaxY * (1.0D - state.renderMinX) + + (double) aoXYZPPP * state.renderMaxY * state.renderMinX + + (double) aoXYZPNP * (1.0D - state.renderMaxY) * state.renderMinX + + (double) aoXYZNNP * (1.0D - state.renderMaxY) * (1.0D - state.renderMinX)); + float aoBL = (float) ((double) aoXYZNPP * state.renderMinY * (1.0D - state.renderMinX) + + (double) aoXYZPPP * state.renderMinY * state.renderMinX + + (double) aoXYZPNP * (1.0D - state.renderMinY) * state.renderMinX + + (double) aoXYZNNP * (1.0D - state.renderMinY) * (1.0D - state.renderMinX)); + float aoBR = (float) ((double) aoXYZNPP * state.renderMinY * (1.0D - state.renderMaxX) + + (double) aoXYZPPP * state.renderMinY * state.renderMaxX + + (double) aoXYZPNP * (1.0D - state.renderMinY) * state.renderMaxX + + (double) aoXYZNNP * (1.0D - state.renderMinY) * (1.0D - state.renderMaxX)); + float aoTR = (float) ((double) aoXYZNPP * state.renderMaxY * (1.0D - state.renderMaxX) + + (double) aoXYZPPP * state.renderMaxY * state.renderMaxX + + (double) aoXYZPNP * (1.0D - state.renderMaxY) * state.renderMaxX + + (double) aoXYZNNP * (1.0D - state.renderMaxY) * (1.0D - state.renderMaxX)); int brXYZNPP = getAOBrightness(aoBrightnessXZNI, aoBrightnessXYZNPI, aoBrightnessYZPI, blockBrightness); int brXYZPPP = getAOBrightness(aoBrightnessYZPI, aoBrightnessXZPI, aoBrightnessXYZPPI, blockBrightness); int brXYZPNP = getAOBrightness(aoBrightnessYZNI, aoBrightnessXYZPNI, aoBrightnessXZPI, blockBrightness); int brXYZNNP = getAOBrightness(aoBrightnessXYZNNI, aoBrightnessXZNI, aoBrightnessYZNI, blockBrightness); - state.brightnessTopLeft = mixAOBrightness(brXYZNPP, brXYZNNP, brXYZPNP, brXYZPPP, state.renderMaxY * (1.0D - state.renderMinX), (1.0D - state.renderMaxY) * (1.0D - state.renderMinX), (1.0D - state.renderMaxY) * state.renderMinX, state.renderMaxY * state.renderMinX); - state.brightnessBottomLeft = mixAOBrightness(brXYZNPP, brXYZNNP, brXYZPNP, brXYZPPP, state.renderMinY * (1.0D - state.renderMinX), (1.0D - state.renderMinY) * (1.0D - state.renderMinX), (1.0D - state.renderMinY) * state.renderMinX, state.renderMinY * state.renderMinX); - state.brightnessBottomRight = mixAOBrightness(brXYZNPP, brXYZNNP, brXYZPNP, brXYZPPP, state.renderMinY * (1.0D - state.renderMaxX), (1.0D - state.renderMinY) * (1.0D - state.renderMaxX), (1.0D - state.renderMinY) * state.renderMaxX, state.renderMinY * state.renderMaxX); - state.brightnessTopRight = mixAOBrightness(brXYZNPP, brXYZNNP, brXYZPNP, brXYZPPP, state.renderMaxY * (1.0D - state.renderMaxX), (1.0D - state.renderMaxY) * (1.0D - state.renderMaxX), (1.0D - state.renderMaxY) * state.renderMaxX, state.renderMaxY * state.renderMaxX); + state.brightnessTopLeft = mixAOBrightness( + brXYZNPP, + brXYZNNP, + brXYZPNP, + brXYZPPP, + state.renderMaxY * (1.0D - state.renderMinX), + (1.0D - state.renderMaxY) * (1.0D - state.renderMinX), + (1.0D - state.renderMaxY) * state.renderMinX, + state.renderMaxY * state.renderMinX); + state.brightnessBottomLeft = mixAOBrightness( + brXYZNPP, + brXYZNNP, + brXYZPNP, + brXYZPPP, + state.renderMinY * (1.0D - state.renderMinX), + (1.0D - state.renderMinY) * (1.0D - state.renderMinX), + (1.0D - state.renderMinY) * state.renderMinX, + state.renderMinY * state.renderMinX); + state.brightnessBottomRight = mixAOBrightness( + brXYZNPP, + brXYZNNP, + brXYZPNP, + brXYZPPP, + state.renderMinY * (1.0D - state.renderMaxX), + (1.0D - state.renderMinY) * (1.0D - state.renderMaxX), + (1.0D - state.renderMinY) * state.renderMaxX, + state.renderMinY * state.renderMaxX); + state.brightnessTopRight = mixAOBrightness( + brXYZNPP, + brXYZNNP, + brXYZPNP, + brXYZPPP, + state.renderMaxY * (1.0D - state.renderMaxX), + (1.0D - state.renderMaxY) * (1.0D - state.renderMaxX), + (1.0D - state.renderMaxY) * state.renderMaxX, + state.renderMaxY * state.renderMaxX); state.setColor(r * state.colorMultZPos, g * state.colorMultZPos, b * state.colorMultZPos); state.scaleColor(state.colorTopLeft, aoTL); @@ -345,7 +532,8 @@ public class RenderHelperAO state.scaleColor(state.colorTopRight, aoTR); } - public void setupXNegAOPartial (IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { + public void setupXNegAOPartial( + IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); @@ -357,9 +545,11 @@ public class RenderHelperAO boolean blocksGrassXZNP = !blockAccess.getBlock(xGrass, y, z + 1).getCanBlockGrass(); if (state.renderMinX > 0) - setupAOBrightnessXNeg(blockAccess, block, x, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + setupAOBrightnessXNeg( + blockAccess, block, x, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); - setupAOBrightnessXPos(blockAccess, block, x - 1, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + setupAOBrightnessXPos( + blockAccess, block, x - 1, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); float xClamp = MathHelper.clamp_float((float) state.renderMinX, 0, 1); mixAOBrightnessLightValueX(xClamp, 1 - xClamp); @@ -369,25 +559,77 @@ public class RenderHelperAO blockBrightness = block.getMixedBrightnessForBlock(blockAccess, x - 1, y, z); float aoOpposingBlock = blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(); - float aoXYZNNP = (aoLightValueScratchXYIN + aoLightValueScratchXYZINP + aoOpposingBlock + aoLightValueScratchXZIP) / 4.0F; - float aoXYZNPP = (aoOpposingBlock + aoLightValueScratchXZIP + aoLightValueScratchXYIP + aoLightValueScratchXYZIPP) / 4.0F; - float aoXYZNPN = (aoLightValueScratchXZIN + aoOpposingBlock + aoLightValueScratchXYZIPN + aoLightValueScratchXYIP) / 4.0F; - float aoXYZNNN = (aoLightValueScratchXYZINN + aoLightValueScratchXYIN + aoLightValueScratchXZIN + aoOpposingBlock) / 4.0F; + float aoXYZNNP = + (aoLightValueScratchXYIN + aoLightValueScratchXYZINP + aoOpposingBlock + aoLightValueScratchXZIP) + / 4.0F; + float aoXYZNPP = + (aoOpposingBlock + aoLightValueScratchXZIP + aoLightValueScratchXYIP + aoLightValueScratchXYZIPP) + / 4.0F; + float aoXYZNPN = + (aoLightValueScratchXZIN + aoOpposingBlock + aoLightValueScratchXYZIPN + aoLightValueScratchXYIP) + / 4.0F; + float aoXYZNNN = + (aoLightValueScratchXYZINN + aoLightValueScratchXYIN + aoLightValueScratchXZIN + aoOpposingBlock) + / 4.0F; - float aoTL = (float)((double)aoXYZNPP * state.renderMaxY * state.renderMaxZ + (double)aoXYZNPN * state.renderMaxY * (1.0D - state.renderMaxZ) + (double)aoXYZNNN * (1.0D - state.renderMaxY) * (1.0D - state.renderMaxZ) + (double)aoXYZNNP * (1.0D - state.renderMaxY) * state.renderMaxZ); - float aoBL = (float)((double)aoXYZNPP * state.renderMaxY * state.renderMinZ + (double)aoXYZNPN * state.renderMaxY * (1.0D - state.renderMinZ) + (double)aoXYZNNN * (1.0D - state.renderMaxY) * (1.0D - state.renderMinZ) + (double)aoXYZNNP * (1.0D - state.renderMaxY) * state.renderMinZ); - float aoBR = (float)((double)aoXYZNPP * state.renderMinY * state.renderMinZ + (double)aoXYZNPN * state.renderMinY * (1.0D - state.renderMinZ) + (double)aoXYZNNN * (1.0D - state.renderMinY) * (1.0D - state.renderMinZ) + (double)aoXYZNNP * (1.0D - state.renderMinY) * state.renderMinZ); - float aoTR = (float)((double)aoXYZNPP * state.renderMinY * state.renderMaxZ + (double)aoXYZNPN * state.renderMinY * (1.0D - state.renderMaxZ) + (double)aoXYZNNN * (1.0D - state.renderMinY) * (1.0D - state.renderMaxZ) + (double)aoXYZNNP * (1.0D - state.renderMinY) * state.renderMaxZ); + float aoTL = (float) ((double) aoXYZNPP * state.renderMaxY * state.renderMaxZ + + (double) aoXYZNPN * state.renderMaxY * (1.0D - state.renderMaxZ) + + (double) aoXYZNNN * (1.0D - state.renderMaxY) * (1.0D - state.renderMaxZ) + + (double) aoXYZNNP * (1.0D - state.renderMaxY) * state.renderMaxZ); + float aoBL = (float) ((double) aoXYZNPP * state.renderMaxY * state.renderMinZ + + (double) aoXYZNPN * state.renderMaxY * (1.0D - state.renderMinZ) + + (double) aoXYZNNN * (1.0D - state.renderMaxY) * (1.0D - state.renderMinZ) + + (double) aoXYZNNP * (1.0D - state.renderMaxY) * state.renderMinZ); + float aoBR = (float) ((double) aoXYZNPP * state.renderMinY * state.renderMinZ + + (double) aoXYZNPN * state.renderMinY * (1.0D - state.renderMinZ) + + (double) aoXYZNNN * (1.0D - state.renderMinY) * (1.0D - state.renderMinZ) + + (double) aoXYZNNP * (1.0D - state.renderMinY) * state.renderMinZ); + float aoTR = (float) ((double) aoXYZNPP * state.renderMinY * state.renderMaxZ + + (double) aoXYZNPN * state.renderMinY * (1.0D - state.renderMaxZ) + + (double) aoXYZNNN * (1.0D - state.renderMinY) * (1.0D - state.renderMaxZ) + + (double) aoXYZNNP * (1.0D - state.renderMinY) * state.renderMaxZ); int brXYZNNP = getAOBrightness(aoBrightnessXYIN, aoBrightnessXYZINP, aoBrightnessXZIP, blockBrightness); int brXYZNPP = getAOBrightness(aoBrightnessXZIP, aoBrightnessXYIP, aoBrightnessXYZIPP, blockBrightness); int brXYZNPN = getAOBrightness(aoBrightnessXZIN, aoBrightnessXYZIPN, aoBrightnessXYIP, blockBrightness); int brXYZNNN = getAOBrightness(aoBrightnessXYZINN, aoBrightnessXYIN, aoBrightnessXZIN, blockBrightness); - state.brightnessTopLeft = mixAOBrightness(brXYZNPP, brXYZNPN, brXYZNNN, brXYZNNP, state.renderMaxY * state.renderMaxZ, state.renderMaxY * (1.0D - state.renderMaxZ), (1.0D - state.renderMaxY) * (1.0D - state.renderMaxZ), (1.0D - state.renderMaxY) * state.renderMaxZ); - state.brightnessBottomLeft = mixAOBrightness(brXYZNPP, brXYZNPN, brXYZNNN, brXYZNNP, state.renderMaxY * state.renderMinZ, state.renderMaxY * (1.0D - state.renderMinZ), (1.0D - state.renderMaxY) * (1.0D - state.renderMinZ), (1.0D - state.renderMaxY) * state.renderMinZ); - state.brightnessBottomRight = mixAOBrightness(brXYZNPP, brXYZNPN, brXYZNNN, brXYZNNP, state.renderMinY * state.renderMinZ, state.renderMinY * (1.0D - state.renderMinZ), (1.0D - state.renderMinY) * (1.0D - state.renderMinZ), (1.0D - state.renderMinY) * state.renderMinZ); - state.brightnessTopRight = mixAOBrightness(brXYZNPP, brXYZNPN, brXYZNNN, brXYZNNP, state.renderMinY * state.renderMaxZ, state.renderMinY * (1.0D - state.renderMaxZ), (1.0D - state.renderMinY) * (1.0D - state.renderMaxZ), (1.0D - state.renderMinY) * state.renderMaxZ); + state.brightnessTopLeft = mixAOBrightness( + brXYZNPP, + brXYZNPN, + brXYZNNN, + brXYZNNP, + state.renderMaxY * state.renderMaxZ, + state.renderMaxY * (1.0D - state.renderMaxZ), + (1.0D - state.renderMaxY) * (1.0D - state.renderMaxZ), + (1.0D - state.renderMaxY) * state.renderMaxZ); + state.brightnessBottomLeft = mixAOBrightness( + brXYZNPP, + brXYZNPN, + brXYZNNN, + brXYZNNP, + state.renderMaxY * state.renderMinZ, + state.renderMaxY * (1.0D - state.renderMinZ), + (1.0D - state.renderMaxY) * (1.0D - state.renderMinZ), + (1.0D - state.renderMaxY) * state.renderMinZ); + state.brightnessBottomRight = mixAOBrightness( + brXYZNPP, + brXYZNPN, + brXYZNNN, + brXYZNNP, + state.renderMinY * state.renderMinZ, + state.renderMinY * (1.0D - state.renderMinZ), + (1.0D - state.renderMinY) * (1.0D - state.renderMinZ), + (1.0D - state.renderMinY) * state.renderMinZ); + state.brightnessTopRight = mixAOBrightness( + brXYZNPP, + brXYZNPN, + brXYZNNN, + brXYZNNP, + state.renderMinY * state.renderMaxZ, + state.renderMinY * (1.0D - state.renderMaxZ), + (1.0D - state.renderMinY) * (1.0D - state.renderMaxZ), + (1.0D - state.renderMinY) * state.renderMaxZ); state.setColor(r * state.colorMultXNeg, g * state.colorMultXNeg, b * state.colorMultXNeg); state.scaleColor(state.colorTopLeft, aoTL); @@ -396,7 +638,8 @@ public class RenderHelperAO state.scaleColor(state.colorTopRight, aoTR); } - public void setupXPosAOPartial (IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { + public void setupXPosAOPartial( + IBlockAccess blockAccess, Block block, int x, int y, int z, float r, float g, float b) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); @@ -408,9 +651,11 @@ public class RenderHelperAO boolean blocksGrassXZNP = !blockAccess.getBlock(xGrass, y, z + 1).getCanBlockGrass(); if (state.renderMaxX < 1) - setupAOBrightnessXPos(blockAccess, block, x, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + setupAOBrightnessXPos( + blockAccess, block, x, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); - setupAOBrightnessXNeg(blockAccess, block, x + 1, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + setupAOBrightnessXNeg( + blockAccess, block, x + 1, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); float xClamp = MathHelper.clamp_float((float) state.renderMaxX, 0, 1); mixAOBrightnessLightValueX(xClamp, 1 - xClamp); @@ -420,25 +665,77 @@ public class RenderHelperAO blockBrightness = block.getMixedBrightnessForBlock(blockAccess, x + 1, y, z); float aoOpposingBlock = blockAccess.getBlock(x + 1, y, z).getAmbientOcclusionLightValue(); - float aoXYZPNP = (aoLightValueScratchXYIN + aoLightValueScratchXYZINP + aoOpposingBlock + aoLightValueScratchXZIP) / 4.0F; - float aoXYZPNN = (aoLightValueScratchXYZINN + aoLightValueScratchXYIN + aoLightValueScratchXZIN + aoOpposingBlock) / 4.0F; - float aoXYZPPN = (aoLightValueScratchXZIN + aoOpposingBlock + aoLightValueScratchXYZIPN + aoLightValueScratchXYIP) / 4.0F; - float aoXYZPPP = (aoOpposingBlock + aoLightValueScratchXZIP + aoLightValueScratchXYIP + aoLightValueScratchXYZIPP) / 4.0F; + float aoXYZPNP = + (aoLightValueScratchXYIN + aoLightValueScratchXYZINP + aoOpposingBlock + aoLightValueScratchXZIP) + / 4.0F; + float aoXYZPNN = + (aoLightValueScratchXYZINN + aoLightValueScratchXYIN + aoLightValueScratchXZIN + aoOpposingBlock) + / 4.0F; + float aoXYZPPN = + (aoLightValueScratchXZIN + aoOpposingBlock + aoLightValueScratchXYZIPN + aoLightValueScratchXYIP) + / 4.0F; + float aoXYZPPP = + (aoOpposingBlock + aoLightValueScratchXZIP + aoLightValueScratchXYIP + aoLightValueScratchXYZIPP) + / 4.0F; - float aoTL = (float)((double)aoXYZPNP * (1.0D - state.renderMinY) * state.renderMaxZ + (double)aoXYZPNN * (1.0D - state.renderMinY) * (1.0D - state.renderMaxZ) + (double)aoXYZPPN * state.renderMinY * (1.0D - state.renderMaxZ) + (double)aoXYZPPP * state.renderMinY * state.renderMaxZ); - float aoBL = (float)((double)aoXYZPNP * (1.0D - state.renderMinY) * state.renderMinZ + (double)aoXYZPNN * (1.0D - state.renderMinY) * (1.0D - state.renderMinZ) + (double)aoXYZPPN * state.renderMinY * (1.0D - state.renderMinZ) + (double)aoXYZPPP * state.renderMinY * state.renderMinZ); - float aoBR = (float)((double)aoXYZPNP * (1.0D - state.renderMaxY) * state.renderMinZ + (double)aoXYZPNN * (1.0D - state.renderMaxY) * (1.0D - state.renderMinZ) + (double)aoXYZPPN * state.renderMaxY * (1.0D - state.renderMinZ) + (double)aoXYZPPP * state.renderMaxY * state.renderMinZ); - float aoTR = (float)((double)aoXYZPNP * (1.0D - state.renderMaxY) * state.renderMaxZ + (double)aoXYZPNN * (1.0D - state.renderMaxY) * (1.0D - state.renderMaxZ) + (double)aoXYZPPN * state.renderMaxY * (1.0D - state.renderMaxZ) + (double)aoXYZPPP * state.renderMaxY * state.renderMaxZ); + float aoTL = (float) ((double) aoXYZPNP * (1.0D - state.renderMinY) * state.renderMaxZ + + (double) aoXYZPNN * (1.0D - state.renderMinY) * (1.0D - state.renderMaxZ) + + (double) aoXYZPPN * state.renderMinY * (1.0D - state.renderMaxZ) + + (double) aoXYZPPP * state.renderMinY * state.renderMaxZ); + float aoBL = (float) ((double) aoXYZPNP * (1.0D - state.renderMinY) * state.renderMinZ + + (double) aoXYZPNN * (1.0D - state.renderMinY) * (1.0D - state.renderMinZ) + + (double) aoXYZPPN * state.renderMinY * (1.0D - state.renderMinZ) + + (double) aoXYZPPP * state.renderMinY * state.renderMinZ); + float aoBR = (float) ((double) aoXYZPNP * (1.0D - state.renderMaxY) * state.renderMinZ + + (double) aoXYZPNN * (1.0D - state.renderMaxY) * (1.0D - state.renderMinZ) + + (double) aoXYZPPN * state.renderMaxY * (1.0D - state.renderMinZ) + + (double) aoXYZPPP * state.renderMaxY * state.renderMinZ); + float aoTR = (float) ((double) aoXYZPNP * (1.0D - state.renderMaxY) * state.renderMaxZ + + (double) aoXYZPNN * (1.0D - state.renderMaxY) * (1.0D - state.renderMaxZ) + + (double) aoXYZPPN * state.renderMaxY * (1.0D - state.renderMaxZ) + + (double) aoXYZPPP * state.renderMaxY * state.renderMaxZ); int brXYZPNP = getAOBrightness(aoBrightnessXYIN, aoBrightnessXYZINP, aoBrightnessXZIP, blockBrightness); int brXYZPNN = getAOBrightness(aoBrightnessXZIP, aoBrightnessXYIP, aoBrightnessXYZIPP, blockBrightness); int brXYZPPN = getAOBrightness(aoBrightnessXZIN, aoBrightnessXYZIPN, aoBrightnessXYIP, blockBrightness); int brXYZPPP = getAOBrightness(aoBrightnessXYZINN, aoBrightnessXYIN, aoBrightnessXZIN, blockBrightness); - state.brightnessTopLeft = mixAOBrightness(brXYZPNP, brXYZPPP, brXYZPPN, brXYZPNN, (1.0D - state.renderMinY) * state.renderMaxZ, (1.0D - state.renderMinY) * (1.0D - state.renderMaxZ), state.renderMinY * (1.0D - state.renderMaxZ), state.renderMinY * state.renderMaxZ); - state.brightnessBottomLeft = mixAOBrightness(brXYZPNP, brXYZPPP, brXYZPPN, brXYZPNN, (1.0D - state.renderMinY) * state.renderMinZ, (1.0D - state.renderMinY) * (1.0D - state.renderMinZ), state.renderMinY * (1.0D - state.renderMinZ), state.renderMinY * state.renderMinZ); - state.brightnessBottomRight = mixAOBrightness(brXYZPNP, brXYZPPP, brXYZPPN, brXYZPNN, (1.0D - state.renderMaxY) * state.renderMinZ, (1.0D - state.renderMaxY) * (1.0D - state.renderMinZ), state.renderMaxY * (1.0D - state.renderMinZ), state.renderMaxY * state.renderMinZ); - state.brightnessTopRight = mixAOBrightness(brXYZPNP, brXYZPPP, brXYZPPN, brXYZPNN, (1.0D - state.renderMaxY) * state.renderMaxZ, (1.0D - state.renderMaxY) * (1.0D - state.renderMaxZ), state.renderMaxY * (1.0D - state.renderMaxZ), state.renderMaxY * state.renderMaxZ); + state.brightnessTopLeft = mixAOBrightness( + brXYZPNP, + brXYZPPP, + brXYZPPN, + brXYZPNN, + (1.0D - state.renderMinY) * state.renderMaxZ, + (1.0D - state.renderMinY) * (1.0D - state.renderMaxZ), + state.renderMinY * (1.0D - state.renderMaxZ), + state.renderMinY * state.renderMaxZ); + state.brightnessBottomLeft = mixAOBrightness( + brXYZPNP, + brXYZPPP, + brXYZPPN, + brXYZPNN, + (1.0D - state.renderMinY) * state.renderMinZ, + (1.0D - state.renderMinY) * (1.0D - state.renderMinZ), + state.renderMinY * (1.0D - state.renderMinZ), + state.renderMinY * state.renderMinZ); + state.brightnessBottomRight = mixAOBrightness( + brXYZPNP, + brXYZPPP, + brXYZPPN, + brXYZPNN, + (1.0D - state.renderMaxY) * state.renderMinZ, + (1.0D - state.renderMaxY) * (1.0D - state.renderMinZ), + state.renderMaxY * (1.0D - state.renderMinZ), + state.renderMaxY * state.renderMinZ); + state.brightnessTopRight = mixAOBrightness( + brXYZPNP, + brXYZPPP, + brXYZPPN, + brXYZPNN, + (1.0D - state.renderMaxY) * state.renderMaxZ, + (1.0D - state.renderMaxY) * (1.0D - state.renderMaxZ), + state.renderMaxY * (1.0D - state.renderMaxZ), + state.renderMaxY * state.renderMaxZ); state.setColor(r * state.colorMultXPos, g * state.colorMultXPos, b * state.colorMultXPos); state.scaleColor(state.colorTopLeft, aoTL); @@ -447,7 +744,16 @@ public class RenderHelperAO state.scaleColor(state.colorTopRight, aoTR); } - private void setupAOBrightnessYNeg (IBlockAccess blockAccess, Block block, int x, int y, int z, boolean bgXP, boolean bgXN, boolean bgZP, boolean bgZN) { + private void setupAOBrightnessYNeg( + IBlockAccess blockAccess, + Block block, + int x, + int y, + int z, + boolean bgXP, + boolean bgXN, + boolean bgZP, + boolean bgZN) { aoLightValueScratchXYNN = blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(); aoLightValueScratchYZNN = blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(); aoLightValueScratchYZNP = blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(); @@ -487,7 +793,16 @@ public class RenderHelperAO } } - private void setupAOBrightnessYPos (IBlockAccess blockAccess, Block block, int x, int y, int z, boolean bgXP, boolean bgXN, boolean bgZP, boolean bgZN) { + private void setupAOBrightnessYPos( + IBlockAccess blockAccess, + Block block, + int x, + int y, + int z, + boolean bgXP, + boolean bgXN, + boolean bgZP, + boolean bgZN) { aoLightValueScratchXYNP = blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(); aoLightValueScratchYZPN = blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(); aoLightValueScratchYZPP = blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(); @@ -527,7 +842,16 @@ public class RenderHelperAO } } - private void setupAOBrightnessZNeg (IBlockAccess blockAccess, Block block, int x, int y, int z, boolean bgXP, boolean bgXN, boolean bgYP, boolean bgYN) { + private void setupAOBrightnessZNeg( + IBlockAccess blockAccess, + Block block, + int x, + int y, + int z, + boolean bgXP, + boolean bgXN, + boolean bgYP, + boolean bgYN) { aoLightValueScratchXZNN = blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(); aoLightValueScratchYZNN = blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(); aoLightValueScratchYZPN = blockAccess.getBlock(x, y + 1, z).getAmbientOcclusionLightValue(); @@ -567,7 +891,16 @@ public class RenderHelperAO } } - private void setupAOBrightnessZPos (IBlockAccess blockAccess, Block block, int x, int y, int z, boolean bgXP, boolean bgXN, boolean bgYP, boolean bgYN) { + private void setupAOBrightnessZPos( + IBlockAccess blockAccess, + Block block, + int x, + int y, + int z, + boolean bgXP, + boolean bgXN, + boolean bgYP, + boolean bgYN) { aoLightValueScratchXZNP = blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(); aoLightValueScratchXZPP = blockAccess.getBlock(x + 1, y, z).getAmbientOcclusionLightValue(); aoLightValueScratchYZNP = blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(); @@ -607,7 +940,16 @@ public class RenderHelperAO } } - private void setupAOBrightnessXNeg (IBlockAccess blockAccess, Block block, int x, int y, int z, boolean bgYP, boolean bgYN, boolean bgZN, boolean bgZP) { + private void setupAOBrightnessXNeg( + IBlockAccess blockAccess, + Block block, + int x, + int y, + int z, + boolean bgYP, + boolean bgYN, + boolean bgZN, + boolean bgZP) { aoLightValueScratchXYNN = blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(); aoLightValueScratchXZNN = blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(); aoLightValueScratchXZNP = blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(); @@ -647,7 +989,16 @@ public class RenderHelperAO } } - private void setupAOBrightnessXPos (IBlockAccess blockAccess, Block block, int x, int y, int z, boolean bgYP, boolean bgYN, boolean bgZN, boolean bgZP) { + private void setupAOBrightnessXPos( + IBlockAccess blockAccess, + Block block, + int x, + int y, + int z, + boolean bgYP, + boolean bgYN, + boolean bgZN, + boolean bgZP) { aoLightValueScratchXYPN = blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(); aoLightValueScratchXZPN = blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(); aoLightValueScratchXZPP = blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(); @@ -687,7 +1038,7 @@ public class RenderHelperAO } } - private void mixAOBrightnessLightValueY (float fMin, float fMax) { + private void mixAOBrightnessLightValueY(float fMin, float fMax) { if (fMin == 1 && fMax == 0) { aoLightValueScratchXYNI = aoLightValueScratchXYNN; aoLightValueScratchYZIN = aoLightValueScratchYZNN; @@ -706,8 +1057,7 @@ public class RenderHelperAO aoBrightnessXYZNIP = aoBrightnessXYZNNP; aoBrightnessXYZPIN = aoBrightnessXYZPNN; aoBrightnessXYZPIP = aoBrightnessXYZPNP; - } - else if (fMin == 0 && fMax == 1) { + } else if (fMin == 0 && fMax == 1) { aoLightValueScratchXYNI = aoLightValueScratchXYNP; aoLightValueScratchYZIN = aoLightValueScratchYZPN; aoLightValueScratchYZIP = aoLightValueScratchYZPP; @@ -725,8 +1075,7 @@ public class RenderHelperAO aoBrightnessXYZNIP = aoBrightnessXYZNPP; aoBrightnessXYZPIN = aoBrightnessXYZPPN; aoBrightnessXYZPIP = aoBrightnessXYZPPP; - } - else { + } else { aoLightValueScratchXYNI = aoLightValueScratchXYNN * fMin + aoLightValueScratchXYNP * fMax; aoLightValueScratchYZIN = aoLightValueScratchYZNN * fMin + aoLightValueScratchYZPN * fMax; aoLightValueScratchYZIP = aoLightValueScratchYZNP * fMin + aoLightValueScratchYZPP * fMax; @@ -747,7 +1096,7 @@ public class RenderHelperAO } } - private void mixAOBrightnessLightValueZ (float fMin, float fMax) { + private void mixAOBrightnessLightValueZ(float fMin, float fMax) { if (fMin == 1 && fMax == 0) { aoLightValueScratchXZNI = aoLightValueScratchXZNN; aoLightValueScratchYZNI = aoLightValueScratchYZNN; @@ -766,8 +1115,7 @@ public class RenderHelperAO aoBrightnessXYZNPI = aoBrightnessXYZNPN; aoBrightnessXYZPNI = aoBrightnessXYZPNN; aoBrightnessXYZPPI = aoBrightnessXYZPPN; - } - else if (fMin == 0 && fMax == 1) { + } else if (fMin == 0 && fMax == 1) { aoLightValueScratchXZNI = aoLightValueScratchXZNP; aoLightValueScratchYZNI = aoLightValueScratchYZNP; aoLightValueScratchYZPI = aoLightValueScratchYZPP; @@ -785,8 +1133,7 @@ public class RenderHelperAO aoBrightnessXYZNPI = aoBrightnessXYZNPP; aoBrightnessXYZPNI = aoBrightnessXYZPNP; aoBrightnessXYZPPI = aoBrightnessXYZPPP; - } - else { + } else { aoLightValueScratchXZNI = aoLightValueScratchXZNN * fMin + aoLightValueScratchXZNP * fMax; aoLightValueScratchYZNI = aoLightValueScratchYZNN * fMin + aoLightValueScratchYZNP * fMax; aoLightValueScratchYZPI = aoLightValueScratchYZPN * fMin + aoLightValueScratchYZPP * fMax; @@ -807,7 +1154,7 @@ public class RenderHelperAO } } - private void mixAOBrightnessLightValueX (float fMin, float fMax) { + private void mixAOBrightnessLightValueX(float fMin, float fMax) { if (fMin == 1 && fMax == 0) { aoLightValueScratchXYIN = aoLightValueScratchXYNN; aoLightValueScratchXZIN = aoLightValueScratchXZNN; @@ -826,8 +1173,7 @@ public class RenderHelperAO aoBrightnessXYZINP = aoBrightnessXYZNNP; aoBrightnessXYZIPN = aoBrightnessXYZNPN; aoBrightnessXYZIPP = aoBrightnessXYZNPP; - } - else if (fMin == 0 && fMax == 1) { + } else if (fMin == 0 && fMax == 1) { aoLightValueScratchXYIN = aoLightValueScratchXYPN; aoLightValueScratchXZIN = aoLightValueScratchXZPN; aoLightValueScratchXZIP = aoLightValueScratchXZPP; @@ -845,8 +1191,7 @@ public class RenderHelperAO aoBrightnessXYZINP = aoBrightnessXYZPNP; aoBrightnessXYZIPN = aoBrightnessXYZPPN; aoBrightnessXYZIPP = aoBrightnessXYZPPP; - } - else { + } else { aoLightValueScratchXYIN = aoLightValueScratchXYNN * fMin + aoLightValueScratchXYPN * fMax; aoLightValueScratchXZIN = aoLightValueScratchXZNN * fMin + aoLightValueScratchXZPN * fMax; aoLightValueScratchXZIP = aoLightValueScratchXZNP * fMin + aoLightValueScratchXZPP * fMax; @@ -867,45 +1212,57 @@ public class RenderHelperAO } } - public static int getAOBrightness (int com1, int com2, int com3, int base) { - if (com1 == 0) - com1 = base; - if (com2 == 0) - com2 = base; - if (com3 == 0) - com3 = base; + public static int getAOBrightness(int com1, int com2, int com3, int base) { + if (com1 == 0) com1 = base; + if (com2 == 0) com2 = base; + if (com3 == 0) com3 = base; return com1 + com2 + com3 + base >> 2 & 16711935; } - public static int mixAOBrightness (int part1, int part2, int part3, int part4, double weight1, double weight2, double weight3, double weight4) { - int brightSky = (int)((part1 >> 16 & 255) * weight1 + (part2 >> 16 & 255) * weight2 + (part3 >> 16 & 255) * weight3 + (part4 >> 16 & 255) * weight4) & 255; - int brightBlk = (int)((part1 & 255) * weight1 + (part2 & 255) * weight2 + (part3 & 255) * weight3 + (part4 & 255) * weight4) & 255; + public static int mixAOBrightness( + int part1, + int part2, + int part3, + int part4, + double weight1, + double weight2, + double weight3, + double weight4) { + int brightSky = (int) ((part1 >> 16 & 255) * weight1 + + (part2 >> 16 & 255) * weight2 + + (part3 >> 16 & 255) * weight3 + + (part4 >> 16 & 255) * weight4) + & 255; + int brightBlk = (int) ((part1 & 255) * weight1 + + (part2 & 255) * weight2 + + (part3 & 255) * weight3 + + (part4 & 255) * weight4) + & 255; return brightSky << 16 | brightBlk; } - public static int mixAOBrightness (int brightTL, int brightBL, int brightBR, int brightTR, double lerpTB, double lerpLR) { + public static int mixAOBrightness( + int brightTL, int brightBL, int brightBR, int brightTR, double lerpTB, double lerpLR) { double brightSkyL = (brightTL >> 16 & 255) * (1 - lerpTB) + (brightBL >> 16 & 255) * lerpTB; double brightSkyR = (brightTR >> 16 & 255) * (1 - lerpTB) + (brightBR >> 16 & 255) * lerpTB; - int brightSky = (int)(brightSkyL * (1 - lerpLR) + brightSkyR * lerpLR) & 255; + int brightSky = (int) (brightSkyL * (1 - lerpLR) + brightSkyR * lerpLR) & 255; double brightBlkL = (brightTL & 255) * (1 - lerpTB) + (brightBL & 255) * lerpTB; double brightBlkR = (brightTR & 255) * (1 - lerpTB) + (brightBR & 255) * lerpTB; - int brightBlk = (int)(brightBlkL * (1 - lerpLR) + brightBlkR * lerpLR) & 255; + int brightBlk = (int) (brightBlkL * (1 - lerpLR) + brightBlkR * lerpLR) & 255; return brightSky << 16 | brightBlk; } - public static int mixAOBrightness (int brightMin, int brightMax, float fMin, float fMax) { - if (brightMin == 0) - return 0; - if (brightMax == 0) - return 0; + public static int mixAOBrightness(int brightMin, int brightMax, float fMin, float fMax) { + if (brightMin == 0) return 0; + if (brightMax == 0) return 0; float brightSky = (brightMin >> 16 & 255) * fMin + (brightMax >> 16 & 255) * fMax; float brightBlk = (brightMin & 255) * fMin + (brightMax & 255) * fMax; - return ((int)brightSky & 255) << 16 | ((int)brightBlk & 255); + return ((int) brightSky & 255) << 16 | ((int) brightBlk & 255); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperLL.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperLL.java index d0cf366..3064925 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperLL.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperLL.java @@ -3,8 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.util; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; -public class RenderHelperLL -{ +public class RenderHelperLL { private static final int TL = 0; private static final int BL = 1; private static final int BR = 2; @@ -18,36 +17,41 @@ public class RenderHelperLL private static final int MAXZ = 5; private static final int xyzuvMap[][][] = { - { // Y-NEG - { 0, 2, 5, 0, 2 }, - { 0, 2, 4, 0, 3 }, - { 1, 2, 4, 1, 3 }, - { 1, 2, 5, 1, 2 } - }, { // Y-POS - { 1, 3, 5, 0, 2 }, - { 1, 3, 4, 0, 3 }, - { 0, 3, 4, 1, 3 }, - { 0, 3, 5, 1, 2 } - }, { // Z-NEG - { 0, 3, 4, 0, 2 }, - { 1, 3, 4, 1, 2 }, - { 1, 2, 4, 1, 3 }, - { 0, 2, 4, 0, 3 } - }, { // Z-POS - { 0, 3, 5, 0, 2 }, - { 0, 2, 5, 0, 3 }, - { 1, 2, 5, 1, 3 }, - { 1, 3, 5, 1, 2 } - }, { // X-NEG - { 0, 3, 5, 0, 2 }, - { 0, 3, 4, 1, 2 }, - { 0, 2, 4, 1, 3 }, - { 0, 2, 5, 0, 3 } - }, { // X-POS - { 1, 2, 5, 0, 2 }, - { 1, 2, 4, 1, 2 }, - { 1, 3, 4, 1, 3 }, - { 1, 3, 5, 0, 3 } + { // Y-NEG + {0, 2, 5, 0, 2}, + {0, 2, 4, 0, 3}, + {1, 2, 4, 1, 3}, + {1, 2, 5, 1, 2} + }, + { // Y-POS + {1, 3, 5, 0, 2}, + {1, 3, 4, 0, 3}, + {0, 3, 4, 1, 3}, + {0, 3, 5, 1, 2} + }, + { // Z-NEG + {0, 3, 4, 0, 2}, + {1, 3, 4, 1, 2}, + {1, 2, 4, 1, 3}, + {0, 2, 4, 0, 3} + }, + { // Z-POS + {0, 3, 5, 0, 2}, + {0, 2, 5, 0, 3}, + {1, 2, 5, 1, 3}, + {1, 3, 5, 1, 2} + }, + { // X-NEG + {0, 3, 5, 0, 2}, + {0, 3, 4, 1, 2}, + {0, 2, 4, 1, 3}, + {0, 2, 5, 0, 3} + }, + { // X-POS + {1, 2, 5, 0, 2}, + {1, 2, 4, 1, 2}, + {1, 3, 4, 1, 3}, + {1, 3, 5, 0, 3} }, }; @@ -66,11 +70,11 @@ public class RenderHelperLL // x-min, x-max, y-min, y-max, z-min, z-max private double[] xyz = new double[6]; - public RenderHelperLL (RenderHelperState state) { + public RenderHelperLL(RenderHelperState state) { this.state = state; } - public void drawFace (int face, double x, double y, double z, IIcon icon) { + public void drawFace(int face, double x, double y, double z, IIcon icon) { boolean flip = state.flipTexture; switch (face) { @@ -80,14 +84,14 @@ public class RenderHelperLL break; case RenderHelper.ZNEG: case RenderHelper.ZPOS: - if (state.rotateTransform == RenderHelperState.ROTATE180 || state.rotateTransform == RenderHelperState.ROTATE90) - state.flipTexture = !state.flipTexture; + if (state.rotateTransform == RenderHelperState.ROTATE180 + || state.rotateTransform == RenderHelperState.ROTATE90) state.flipTexture = !state.flipTexture; drawFaceZ(face, x, y, z, icon); break; case RenderHelper.XNEG: case RenderHelper.XPOS: - if (state.rotateTransform == RenderHelperState.ROTATE180 || state.rotateTransform == RenderHelperState.ROTATE270) - state.flipTexture = !state.flipTexture; + if (state.rotateTransform == RenderHelperState.ROTATE180 + || state.rotateTransform == RenderHelperState.ROTATE270) state.flipTexture = !state.flipTexture; drawFaceX(face, x, y, z, icon); break; } @@ -95,12 +99,11 @@ public class RenderHelperLL state.flipTexture = flip; } - private void drawFaceY (int face, double x, double y, double z, IIcon icon) { - if (icon == null) - return; + private void drawFaceY(int face, double x, double y, double z, IIcon icon) { + if (icon == null) return; - int rangeX = (int)(Math.ceil(state.renderMaxX + state.shiftU) - Math.floor(state.renderMinX + state.shiftU)); - int rangeZ = (int)(Math.ceil(state.renderMaxZ + state.shiftV) - Math.floor(state.renderMinZ + state.shiftV)); + int rangeX = (int) (Math.ceil(state.renderMaxX + state.shiftU) - Math.floor(state.renderMinX + state.shiftU)); + int rangeZ = (int) (Math.ceil(state.renderMaxZ + state.shiftV) - Math.floor(state.renderMinZ + state.shiftV)); setXYZ(x, y, z); if (state.renderFromInside) { @@ -108,18 +111,16 @@ public class RenderHelperLL xyz[MAXX] = z + state.renderMinX; } - int rotate = (face == RenderHelper.YNEG) ? state.uvRotate[RenderHelper.YNEG] : state.uvRotate[RenderHelper.YPOS]; + int rotate = + (face == RenderHelper.YNEG) ? state.uvRotate[RenderHelper.YNEG] : state.uvRotate[RenderHelper.YPOS]; if (rangeX <= 1 && rangeZ <= 1) { if (face == RenderHelper.YNEG) setFaceYNegUV(icon, state.renderMinX, state.renderMinZ, state.renderMaxX, state.renderMaxZ); - else - setFaceYPosUV(icon, state.renderMinX, state.renderMinZ, state.renderMaxX, state.renderMaxZ); + else setFaceYPosUV(icon, state.renderMinX, state.renderMinZ, state.renderMaxX, state.renderMaxZ); - if (state.enableAO) - renderXYZUVAO(xyzuvMap[face], state.uvRotate[face]); - else - renderXYZUV(xyzuvMap[face], state.uvRotate[face]); + if (state.enableAO) renderXYZUVAO(xyzuvMap[face], state.uvRotate[face]); + else renderXYZUV(xyzuvMap[face], state.uvRotate[face]); return; } @@ -166,36 +167,45 @@ public class RenderHelperLL } } - private void setFaceYNegUV (IIcon icon, double minX, double minZ, double maxX, double maxZ) { + private void setFaceYNegUV(IIcon icon, double minX, double minZ, double maxX, double maxZ) { int rotate = state.uvRotate[RenderHelper.YNEG]; if (rotate == RenderHelperState.ROTATE0) setUV(icon, minX + state.shiftU, maxX + state.shiftU, maxZ + state.shiftV, minZ + state.shiftV); if (rotate == RenderHelperState.ROTATE90) setUV(icon, 1 - maxZ + state.shiftU, 1 - minZ + state.shiftU, minX + state.shiftV, maxX + state.shiftV); if (rotate == RenderHelperState.ROTATE180) - setUV(icon, 1 - minX + state.shiftU, 1 - maxX + state.shiftU, 1 - maxZ + state.shiftV, 1 - minZ + state.shiftV); + setUV( + icon, + 1 - minX + state.shiftU, + 1 - maxX + state.shiftU, + 1 - maxZ + state.shiftV, + 1 - minZ + state.shiftV); if (rotate == RenderHelperState.ROTATE270) setUV(icon, maxZ + state.shiftU, minZ + state.shiftU, 1 - minX + state.shiftV, 1 - maxX + state.shiftV); } - private void setFaceYPosUV (IIcon icon, double minX, double minZ, double maxX, double maxZ) { + private void setFaceYPosUV(IIcon icon, double minX, double minZ, double maxX, double maxZ) { int rotate = state.uvRotate[RenderHelper.YPOS]; if (rotate == RenderHelperState.ROTATE0) setUV(icon, maxX + state.shiftU, minX + state.shiftU, maxZ + state.shiftV, minZ + state.shiftV); if (rotate == RenderHelperState.ROTATE90) setUV(icon, maxZ + state.shiftU, minZ + state.shiftU, 1 - maxX + state.shiftV, 1 - minX + state.shiftV); if (rotate == RenderHelperState.ROTATE180) - setUV(icon, 1 - maxX + state.shiftU, 1 - minX + state.shiftU, 1 - maxZ + state.shiftV, 1 - minZ + state.shiftV); + setUV( + icon, + 1 - maxX + state.shiftU, + 1 - minX + state.shiftU, + 1 - maxZ + state.shiftV, + 1 - minZ + state.shiftV); if (rotate == RenderHelperState.ROTATE270) setUV(icon, 1 - maxZ + state.shiftU, 1 - minZ + state.shiftU, maxX + state.shiftV, minX + state.shiftV); } - private void drawFaceZ (int face, double x, double y, double z, IIcon icon) { - if (icon == null) - return; + private void drawFaceZ(int face, double x, double y, double z, IIcon icon) { + if (icon == null) return; - int rangeX = (int)(Math.ceil(state.renderMaxX + state.shiftU) - Math.floor(state.renderMinX + state.shiftU)); - int rangeY = (int)(Math.ceil(state.renderMaxY + state.shiftV) - Math.floor(state.renderMinY + state.shiftV)); + int rangeX = (int) (Math.ceil(state.renderMaxX + state.shiftU) - Math.floor(state.renderMinX + state.shiftU)); + int rangeY = (int) (Math.ceil(state.renderMaxY + state.shiftV) - Math.floor(state.renderMinY + state.shiftV)); setXYZ(x, y, z); if (state.renderFromInside) { @@ -211,15 +221,11 @@ public class RenderHelperLL maxX = state.renderMinX; } - if (face == RenderHelper.ZNEG) - setFaceZNegUV(icon, minX, state.renderMinY, maxX, state.renderMaxY); - else - setFaceZPosUV(icon, minX, state.renderMinY, maxX, state.renderMaxY); + if (face == RenderHelper.ZNEG) setFaceZNegUV(icon, minX, state.renderMinY, maxX, state.renderMaxY); + else setFaceZPosUV(icon, minX, state.renderMinY, maxX, state.renderMaxY); - if (state.enableAO) - renderXYZUVAO(xyzuvMap[face], state.uvRotate[face]); - else - renderXYZUV(xyzuvMap[face], state.uvRotate[face]); + if (state.enableAO) renderXYZUVAO(xyzuvMap[face], state.uvRotate[face]); + else renderXYZUV(xyzuvMap[face], state.uvRotate[face]); return; } @@ -231,7 +237,7 @@ public class RenderHelperLL setupUVPoints(uStart, vStart, uStop, vStop, rangeX, rangeY, icon); setupAOBrightnessLerp(state.renderMinX, state.renderMaxX, state.renderMinY, state.renderMaxY, rangeX, rangeY); - //int rotate = (face == 2) ? state.uvRotate[2] : state.uvRotate[3]; + // int rotate = (face == 2) ? state.uvRotate[2] : state.uvRotate[3]; for (int ix = 0; ix < rangeX; ix++) { xyz[MAXX] = xyz[MINX] + maxUDiv[ix] - minUDiv[ix]; @@ -245,10 +251,8 @@ public class RenderHelperLL state.brightnessBottomLeft = brightnessLerp[ix][iy + 1]; state.brightnessBottomRight = brightnessLerp[ix + 1][iy + 1]; - if (state.flipTexture) - setUV(icon, 1 - minUDiv[ix], 1 - maxUDiv[ix], 1 - maxVDiv[iy], 1 - minVDiv[iy]); - else - setUV(icon, minUDiv[ix], maxUDiv[ix], 1 - maxVDiv[iy], 1 - minVDiv[iy]); + if (state.flipTexture) setUV(icon, 1 - minUDiv[ix], 1 - maxUDiv[ix], 1 - maxVDiv[iy], 1 - minVDiv[iy]); + else setUV(icon, minUDiv[ix], maxUDiv[ix], 1 - maxVDiv[iy], 1 - minVDiv[iy]); /*switch (rotate) { case RenderHelperState.ROTATE90: @@ -273,7 +277,7 @@ public class RenderHelperLL } } - private void setFaceZNegUV (IIcon icon, double minX, double minY, double maxX, double maxY) { + private void setFaceZNegUV(IIcon icon, double minX, double minY, double maxX, double maxY) { int rotate = state.uvRotate[RenderHelper.ZNEG]; if (rotate == RenderHelperState.ROTATE0) setUV(icon, maxX + state.shiftU, minX + state.shiftU, 1 - maxY + state.shiftV, 1 - minY + state.shiftV); @@ -285,7 +289,7 @@ public class RenderHelperLL setUV(icon, minY + state.shiftU, maxY + state.shiftU, 1 - minX + state.shiftV, 1 - maxX + state.shiftV); } - private void setFaceZPosUV (IIcon icon, double minX, double minY, double maxX, double maxY) { + private void setFaceZPosUV(IIcon icon, double minX, double minY, double maxX, double maxY) { int rotate = state.uvRotate[RenderHelper.ZPOS]; if (rotate == RenderHelperState.ROTATE0) setUV(icon, minX + state.shiftU, maxX + state.shiftU, 1 - maxY + state.shiftV, 1 - minY + state.shiftV); @@ -297,12 +301,11 @@ public class RenderHelperLL setUV(icon, 1 - minY + state.shiftU, 1 - maxY + state.shiftU, minX + state.shiftV, maxX + state.shiftV); } - private void drawFaceX (int face, double x, double y, double z, IIcon icon) { - if (icon == null) - return; - - int rangeZ = (int)(Math.ceil(state.renderMaxZ + state.shiftU) - Math.floor(state.renderMinZ + state.shiftU)); - int rangeY = (int)(Math.ceil(state.renderMaxY + state.shiftV) - Math.floor(state.renderMinY + state.shiftV)); + private void drawFaceX(int face, double x, double y, double z, IIcon icon) { + if (icon == null) return; + + int rangeZ = (int) (Math.ceil(state.renderMaxZ + state.shiftU) - Math.floor(state.renderMinZ + state.shiftU)); + int rangeY = (int) (Math.ceil(state.renderMaxY + state.shiftV) - Math.floor(state.renderMinY + state.shiftV)); setXYZ(x, y, z); if (state.renderFromInside) { @@ -318,15 +321,11 @@ public class RenderHelperLL maxZ = state.renderMinZ; } - if (face == RenderHelper.XNEG) - setFaceXNegUV(icon, minZ, state.renderMinY, maxZ, state.renderMaxY); - else - setFaceXPosUV(icon, minZ, state.renderMinY, maxZ, state.renderMaxY); + if (face == RenderHelper.XNEG) setFaceXNegUV(icon, minZ, state.renderMinY, maxZ, state.renderMaxY); + else setFaceXPosUV(icon, minZ, state.renderMinY, maxZ, state.renderMaxY); - if (state.enableAO) - renderXYZUVAO(xyzuvMap[face], state.uvRotate[face]); - else - renderXYZUV(xyzuvMap[face], state.uvRotate[face]); + if (state.enableAO) renderXYZUVAO(xyzuvMap[face], state.uvRotate[face]); + else renderXYZUV(xyzuvMap[face], state.uvRotate[face]); return; } @@ -350,10 +349,8 @@ public class RenderHelperLL state.brightnessBottomLeft = brightnessLerp[iz][iy + 1]; state.brightnessBottomRight = brightnessLerp[iz + 1][iy + 1]; - if (state.flipTexture) - setUV(icon, 1 - minUDiv[iz], 1 - maxUDiv[iz], 1 - maxVDiv[iy], 1 - minVDiv[iy]); - else - setUV(icon, minUDiv[iz], maxUDiv[iz], 1 - maxVDiv[iy], 1 - minVDiv[iy]); + if (state.flipTexture) setUV(icon, 1 - minUDiv[iz], 1 - maxUDiv[iz], 1 - maxVDiv[iy], 1 - minVDiv[iy]); + else setUV(icon, minUDiv[iz], maxUDiv[iz], 1 - maxVDiv[iy], 1 - minVDiv[iy]); renderXYZUVAO(xyzuvMap[face], state.uvRotate[face]); @@ -363,7 +360,7 @@ public class RenderHelperLL } } - private void setFaceXNegUV (IIcon icon, double minZ, double minY, double maxZ, double maxY) { + private void setFaceXNegUV(IIcon icon, double minZ, double minY, double maxZ, double maxY) { int rotate = state.uvRotate[RenderHelper.XNEG]; if (rotate == RenderHelperState.ROTATE0) setUV(icon, maxZ + state.shiftU, minZ + state.shiftU, 1 - maxY + state.shiftV, 1 - minY + state.shiftV); @@ -375,7 +372,7 @@ public class RenderHelperLL setUV(icon, 1 - minY + state.shiftU, 1 - maxY + state.shiftU, maxZ + state.shiftV, minZ + state.shiftV); } - private void setFaceXPosUV (IIcon icon, double minZ, double minY, double maxZ, double maxY) { + private void setFaceXPosUV(IIcon icon, double minZ, double minY, double maxZ, double maxY) { int rotate = state.uvRotate[RenderHelper.XPOS]; if (rotate == RenderHelperState.ROTATE0) setUV(icon, minZ + state.shiftU, maxZ + state.shiftU, 1 - minY + state.shiftV, 1 - maxY + state.shiftV); @@ -387,22 +384,21 @@ public class RenderHelperLL setUV(icon, maxY + state.shiftU, minY + state.shiftU, 1 - maxZ + state.shiftV, 1 - minZ + state.shiftV); } - public void drawPartialFace (int face, double x, double y, double z, IIcon icon, double uMin, double vMin, double uMax, double vMax) { + public void drawPartialFace( + int face, double x, double y, double z, IIcon icon, double uMin, double vMin, double uMax, double vMax) { setXYZ(x, y, z); setUV(icon, uMin, uMax, vMin, vMax); - if (state.enableAO) - renderXYZUVAO(xyzuvMap[face], state.uvRotate[face]); - else - renderXYZUV(xyzuvMap[face], state.uvRotate[face]); + if (state.enableAO) renderXYZUVAO(xyzuvMap[face], state.uvRotate[face]); + else renderXYZUV(xyzuvMap[face], state.uvRotate[face]); } - private void setupUVPoints (double uStart, double vStart, double uStop, double vStop, int rangeU, int rangeV, IIcon icon) { + private void setupUVPoints( + double uStart, double vStart, double uStop, double vStop, int rangeU, int rangeV, IIcon icon) { if (rangeU <= 1) { minUDiv[0] = uStart; maxUDiv[0] = uStop; - } - else { + } else { minUDiv[0] = uStart; maxUDiv[0] = 1; for (int i = 1; i < rangeU - 1; i++) { @@ -416,8 +412,7 @@ public class RenderHelperLL if (rangeV <= 1) { minVDiv[0] = vStart; maxVDiv[0] = vStop; - } - else { + } else { minVDiv[0] = vStart; maxVDiv[0] = 1; for (int i = 1; i < rangeV - 1; i++) { @@ -429,48 +424,48 @@ public class RenderHelperLL } } - private void setupAOBrightnessLerp (double left, double right, double top, double bottom, int rangeLR, int rangeTB) { + private void setupAOBrightnessLerp(double left, double right, double top, double bottom, int rangeLR, int rangeTB) { double diffLR = right - left; double diffTB = bottom - top; double posLR = 0; for (int lr = 0; lr <= rangeLR; lr++) { - float lerpLR = (float)(posLR / diffLR); + float lerpLR = (float) (posLR / diffLR); - int brightTop = RenderHelperAO.mixAOBrightness(state.brightnessTopLeft, state.brightnessTopRight, 1 - lerpLR, lerpLR); - int brightBottom = RenderHelperAO.mixAOBrightness(state.brightnessBottomLeft, state.brightnessBottomRight, 1 - lerpLR, lerpLR); + int brightTop = RenderHelperAO.mixAOBrightness( + state.brightnessTopLeft, state.brightnessTopRight, 1 - lerpLR, lerpLR); + int brightBottom = RenderHelperAO.mixAOBrightness( + state.brightnessBottomLeft, state.brightnessBottomRight, 1 - lerpLR, lerpLR); double posTB = 0; for (int tb = 0; tb <= rangeTB; tb++) { - float lerpTB = (float)(posTB / diffTB); + float lerpTB = (float) (posTB / diffTB); brightnessLerp[lr][tb] = RenderHelperAO.mixAOBrightness(brightTop, brightBottom, 1 - lerpTB, lerpTB); - if (tb < rangeTB) - posTB += maxVDiv[tb] - minVDiv[tb]; + if (tb < rangeTB) posTB += maxVDiv[tb] - minVDiv[tb]; } - if (lr < rangeLR) - posLR += maxUDiv[lr] - minUDiv[lr]; + if (lr < rangeLR) posLR += maxUDiv[lr] - minUDiv[lr]; } } - private void setUV (IIcon icon, double uMin, double uMax, double vMin, double vMax) { + private void setUV(IIcon icon, double uMin, double uMax, double vMin, double vMax) { uv[0] = icon.getInterpolatedU(uMin * 16); uv[1] = icon.getInterpolatedU(uMax * 16); uv[2] = icon.getInterpolatedV(vMin * 16); uv[3] = icon.getInterpolatedV(vMax * 16); } - private void setUV (double uMin, double uMax, double vMin, double vMax) { + private void setUV(double uMin, double uMax, double vMin, double vMax) { uv[0] = uMin; uv[1] = uMax; uv[2] = vMin; uv[3] = vMax; } - private void setXYZ (double x, double y, double z) { + private void setXYZ(double x, double y, double z) { xyz[0] = x + state.renderOffsetX + state.renderMinX; xyz[1] = x + state.renderOffsetX + state.renderMaxX; xyz[2] = y + state.renderOffsetY + state.renderMinY; @@ -479,7 +474,7 @@ public class RenderHelperLL xyz[5] = z + state.renderOffsetZ + state.renderMaxZ; } - private void renderXYZUV (int[][] index, int uvRotate) { + private void renderXYZUV(int[][] index, int uvRotate) { Tessellator tessellator = Tessellator.instance; int[] tl = index[TL]; @@ -505,7 +500,7 @@ public class RenderHelperLL tessellator.addVertexWithUV(xyz[tr[0]], xyz[tr[1]], xyz[tr[2]], utr, vtr); } - private void renderXYZUVAO (int[][] index, int uvRotate) { + private void renderXYZUVAO(int[][] index, int uvRotate) { Tessellator tessellator = Tessellator.instance; int[] tl = index[TL]; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperState.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperState.java index 05fcf08..2a0facb 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperState.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperState.java @@ -1,28 +1,27 @@ package com.jaquadro.minecraft.storagedrawers.util; -public class RenderHelperState -{ +public class RenderHelperState { public static final int ROTATE0 = 0; public static final int ROTATE90 = 1; public static final int ROTATE180 = 2; public static final int ROTATE270 = 3; public static final int[][] ROTATION_BY_FACE_FACE = { - { 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 2, 3, 1 }, - { 0, 0, 2, 0, 1, 3 }, - { 0, 0, 1, 3, 0, 2 }, - { 0, 0, 3, 1, 2, 0 }, + {0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0}, + {0, 0, 0, 2, 3, 1}, + {0, 0, 2, 0, 1, 3}, + {0, 0, 1, 3, 0, 2}, + {0, 0, 3, 1, 2, 0}, }; public static final int[][] FACE_BY_FACE_ROTATION = { - { 0, 0, 0, 0 }, - { 1, 1, 1, 1 }, - { 2, 5, 3, 4 }, - { 3, 4, 2, 5 }, - { 4, 2, 5, 3 }, - { 5, 3, 4, 2 }, + {0, 0, 0, 0}, + {1, 1, 1, 1}, + {2, 5, 3, 4}, + {3, 4, 2, 5}, + {4, 2, 5, 3}, + {5, 3, 4, 2}, }; public double renderMinX; @@ -67,11 +66,11 @@ public class RenderHelperState private final double[] scratchIn = new double[3]; private final double[] scratchOut = new double[3]; - public RenderHelperState () { + public RenderHelperState() { resetColorMult(); } - public void setRenderBounds (double xMin, double yMin, double zMin, double xMax, double yMax, double zMax) { + public void setRenderBounds(double xMin, double yMin, double zMin, double xMax, double yMax, double zMax) { renderMinX = xMin; renderMinY = yMin; renderMinZ = zMin; @@ -79,26 +78,24 @@ public class RenderHelperState renderMaxY = yMax; renderMaxZ = zMax; - if (rotateTransform != 0) - transformRenderBound(rotateTransform); + if (rotateTransform != 0) transformRenderBound(rotateTransform); } - public void setRenderOffset (double xOffset, double yOffset, double zOffset) { + public void setRenderOffset(double xOffset, double yOffset, double zOffset) { renderOffsetX = xOffset; renderOffsetY = yOffset; renderOffsetZ = zOffset; - if (rotateTransform != 0) - transformRenderOffset(rotateTransform); + if (rotateTransform != 0) transformRenderOffset(rotateTransform); } - public void clearRenderOffset () { + public void clearRenderOffset() { renderOffsetX = 0; renderOffsetY = 0; renderOffsetZ = 0; } - public void setColorMult (float yPos, float z, float x, float yNeg) { + public void setColorMult(float yPos, float z, float x, float yNeg) { colorMultYNeg = yNeg; colorMultYPos = yPos; colorMultZNeg = z; @@ -107,7 +104,7 @@ public class RenderHelperState colorMultXPos = x; } - public void resetColorMult () { + public void resetColorMult() { colorMultYNeg = 0.5f; colorMultYPos = 1.0f; colorMultZNeg = 0.8f; @@ -116,37 +113,44 @@ public class RenderHelperState colorMultXPos = 0.6f; } - public float getColorMult (int side) { + public float getColorMult(int side) { switch (side) { - case 0: return colorMultYNeg; - case 1: return colorMultYPos; - case 2: return colorMultZNeg; - case 3: return colorMultZPos; - case 4: return colorMultXNeg; - case 5: return colorMultXPos; - default: return 0; + case 0: + return colorMultYNeg; + case 1: + return colorMultYPos; + case 2: + return colorMultZNeg; + case 3: + return colorMultZPos; + case 4: + return colorMultXNeg; + case 5: + return colorMultXPos; + default: + return 0; } } - public void setTextureOffset (float u, float v) { + public void setTextureOffset(float u, float v) { shiftU = u; shiftV = v; } - public void resetTextureOffset () { + public void resetTextureOffset() { shiftU = 0; shiftV = 0; } - public void setUVRotation (int face, int rotation) { + public void setUVRotation(int face, int rotation) { uvRotate[face] = rotation; } - public void clearUVRotation (int face) { + public void clearUVRotation(int face) { uvRotate[face] = 0; } - public void setColor (float r, float g, float b) { + public void setColor(float r, float g, float b) { colorTopLeft[0] = r; colorTopLeft[1] = g; colorTopLeft[2] = b; @@ -164,12 +168,11 @@ public class RenderHelperState colorTopRight[2] = b; } - public void scaleColor (float[] color, float scale) { - for (int i = 0; i < color.length; i++) - color[i] *= scale; + public void scaleColor(float[] color, float scale) { + for (int i = 0; i < color.length; i++) color[i] *= scale; } - public void setRotateTransform (int faceFrom, int faceTo) { + public void setRotateTransform(int faceFrom, int faceTo) { rotateTransform = ROTATION_BY_FACE_FACE[faceFrom][faceTo]; if (rotateTransform != 0) { transformRenderBound(rotateTransform); @@ -177,7 +180,7 @@ public class RenderHelperState } } - public void undoRotateTransform () { + public void undoRotateTransform() { if (rotateTransform != 0) { transformRenderBound(4 - rotateTransform); transformRenderOffset(4 - rotateTransform); @@ -185,11 +188,11 @@ public class RenderHelperState clearRotateTransform(); } - public void clearRotateTransform () { + public void clearRotateTransform() { rotateTransform = 0; } - private void transformRenderOffset (int rotation) { + private void transformRenderOffset(int rotation) { double scratch; switch (rotation) { case ROTATE90: @@ -209,7 +212,7 @@ public class RenderHelperState } } - private void transformRenderBound (int rotation) { + private void transformRenderBound(int rotation) { scratchIn[0] = renderMinX; scratchIn[1] = renderMinY; scratchIn[2] = renderMinZ; @@ -239,14 +242,14 @@ public class RenderHelperState } } - public void transformCoord (double x, double y, double z, double[] coordCout, int rotation) { + public void transformCoord(double x, double y, double z, double[] coordCout, int rotation) { scratchIn[0] = x; scratchIn[1] = y; scratchIn[2] = z; transformCoord(scratchIn, coordCout, rotation); } - public void transformCoord (double[] coordIn, double[] coordOut, int rotation) { + public void transformCoord(double[] coordIn, double[] coordOut, int rotation) { coordOut[1] = coordIn[1]; switch (rotation) { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/UniqueMetaIdentifier.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/UniqueMetaIdentifier.java index 2cbf2e8..aad1003 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/UniqueMetaIdentifier.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/UniqueMetaIdentifier.java @@ -8,124 +8,106 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -public final class UniqueMetaIdentifier -{ +public final class UniqueMetaIdentifier { public final String modId; public final String name; public final int meta; private GameRegistry.UniqueIdentifier cachedUID; - public UniqueMetaIdentifier (String modId, String name) { + public UniqueMetaIdentifier(String modId, String name) { this.modId = modId; this.name = name; this.meta = OreDictionary.WILDCARD_VALUE; } - public UniqueMetaIdentifier (String modId, String name, int meta) { + public UniqueMetaIdentifier(String modId, String name, int meta) { this.modId = modId; this.name = name; this.meta = meta; } - public UniqueMetaIdentifier (String qualifiedName, int meta) { + public UniqueMetaIdentifier(String qualifiedName, int meta) { String[] parts = qualifiedName.split(":"); this.modId = parts[0]; this.name = parts[1]; this.meta = meta; } - public UniqueMetaIdentifier (String compoundName) { + public UniqueMetaIdentifier(String compoundName) { String[] parts1 = compoundName.split(";"); String[] parts2 = parts1[0].split(":"); this.modId = parts2[0]; - if (parts2.length >= 2) - this.name = parts2[1]; - else - this.name = ""; + if (parts2.length >= 2) this.name = parts2[1]; + else this.name = ""; - if (parts1.length >= 2) - this.meta = Integer.parseInt(parts1[1]); - else if (parts2.length > 2) - this.meta = Integer.parseInt(parts2[parts2.length - 1]); - else - this.meta = OreDictionary.WILDCARD_VALUE; + if (parts1.length >= 2) this.meta = Integer.parseInt(parts1[1]); + else if (parts2.length > 2) this.meta = Integer.parseInt(parts2[parts2.length - 1]); + else this.meta = OreDictionary.WILDCARD_VALUE; } - public UniqueMetaIdentifier (String compoundName, char separator) { + public UniqueMetaIdentifier(String compoundName, char separator) { String[] parts1 = compoundName.split("[ ]*" + separator + "[ ]*"); String[] parts2 = parts1[0].split(":"); this.modId = parts2[0]; - if (parts2.length >= 2) - this.name = parts2[1]; - else - this.name = ""; + if (parts2.length >= 2) this.name = parts2[1]; + else this.name = ""; - if (parts1.length >= 2) - this.meta = Integer.parseInt(parts1[1]); - else - this.meta = OreDictionary.WILDCARD_VALUE; + if (parts1.length >= 2) this.meta = Integer.parseInt(parts1[1]); + else this.meta = OreDictionary.WILDCARD_VALUE; } - public GameRegistry.UniqueIdentifier getUniqueIdentifier () { - if (cachedUID == null) - cachedUID = new GameRegistry.UniqueIdentifier(modId + ":" + name); + public GameRegistry.UniqueIdentifier getUniqueIdentifier() { + if (cachedUID == null) cachedUID = new GameRegistry.UniqueIdentifier(modId + ":" + name); return cachedUID; } - public Block getBlock () { + public Block getBlock() { return GameRegistry.findBlock(modId, name); } - public Item getItem () { + public Item getItem() { return GameRegistry.findItem(modId, name); } @Override - public boolean equals (Object obj) { - if (obj == null) - return false; - if (obj.getClass() != getClass()) - return false; + public boolean equals(Object obj) { + if (obj == null) return false; + if (obj.getClass() != getClass()) return false; final UniqueMetaIdentifier other = (UniqueMetaIdentifier) obj; - return Objects.equal(modId, other.modId) - && Objects.equal(name, other.name) - && meta == other.meta; + return Objects.equal(modId, other.modId) && Objects.equal(name, other.name) && meta == other.meta; } @Override - public int hashCode () { + public int hashCode() { return Objects.hashCode(modId, name) ^ (meta * 37); } @Override - public String toString () { + public String toString() { return String.format("%s:%s;%d", modId, name, meta); } - public static UniqueMetaIdentifier createFor (ItemStack itemStack) { - if (itemStack.getItem() == null) - return null; + public static UniqueMetaIdentifier createFor(ItemStack itemStack) { + if (itemStack.getItem() == null) return null; String name = GameData.getItemRegistry().getNameForObject(itemStack.getItem()); return new UniqueMetaIdentifier(name, itemStack.getItemDamage()); } - public static UniqueMetaIdentifier createFor (Block block, int meta) { - if (block == null) - return null; + public static UniqueMetaIdentifier createFor(Block block, int meta) { + if (block == null) return null; String name = GameData.getBlockRegistry().getNameForObject(block); return new UniqueMetaIdentifier(name, meta); } - public static UniqueMetaIdentifier createFor (Block block) { - if (block == null) - return null; + public static UniqueMetaIdentifier createFor(Block block) { + if (block == null) return null; String name = GameData.getBlockRegistry().getNameForObject(block); return new UniqueMetaIdentifier(name); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/UniqueMetaRegistry.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/UniqueMetaRegistry.java index 6bc3c24..92377d8 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/UniqueMetaRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/UniqueMetaRegistry.java @@ -1,55 +1,48 @@ package com.jaquadro.minecraft.storagedrawers.util; -import net.minecraftforge.oredict.OreDictionary; - import java.util.HashMap; import java.util.Map; import java.util.Set; +import net.minecraftforge.oredict.OreDictionary; -public class UniqueMetaRegistry -{ +public class UniqueMetaRegistry { private Map registry; - public UniqueMetaRegistry () { + public UniqueMetaRegistry() { registry = new HashMap(); } - public void register (UniqueMetaIdentifier id, E entry) { + public void register(UniqueMetaIdentifier id, E entry) { registry.put(id, entry); } - public E getEntry (UniqueMetaIdentifier id) { - if (id == null) - return null; + public E getEntry(UniqueMetaIdentifier id) { + if (id == null) return null; - if (registry.containsKey(id)) - return registry.get(id); + if (registry.containsKey(id)) return registry.get(id); if (id.meta != OreDictionary.WILDCARD_VALUE) { id = new UniqueMetaIdentifier(id.modId, id.name); - if (registry.containsKey(id)) - return registry.get(id); + if (registry.containsKey(id)) return registry.get(id); if (!id.name.isEmpty()) { id = new UniqueMetaIdentifier(id.modId); - if (registry.containsKey(id)) - return registry.get(id); + if (registry.containsKey(id)) return registry.get(id); } } return null; } - public void remove (UniqueMetaIdentifier id) { - if (id != null) - registry.remove(id); + public void remove(UniqueMetaIdentifier id) { + if (id != null) registry.remove(id); } - public Set> entrySet () { + public Set> entrySet() { return registry.entrySet(); } - public void clear () { + public void clear() { registry.clear(); } }