From 6083517e84e63487a647c88ec1ad7e5398eaefb7 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 29 Jan 2023 12:07:00 -0800 Subject: [PATCH] [ci skip] spotlessApply with the new settings --- dependencies.gradle | 2 +- .../storagedrawers/StorageDrawers.java | 8 +- .../api/IStorageDrawersApi.java | 1 + .../storagedrawers/api/StorageDrawersApi.java | 1 + .../api/config/IAddonConfig.java | 5 +- .../api/config/IBlockConfig.java | 1 + .../api/config/IIntegrationConfig.java | 1 + .../api/config/IUserConfig.java | 1 + .../api/event/DrawerPopulatedEvent.java | 5 +- .../api/inventory/IDrawerInventory.java | 3 +- .../api/inventory/IInventoryAdapter.java | 1 + .../api/inventory/SlotType.java | 1 + .../api/pack/BlockConfiguration.java | 1 + .../api/pack/ExtendedDataResolver.java | 1 + .../api/pack/IExtendedDataResolver.java | 1 + .../storagedrawers/api/pack/IPackBlock.java | 1 + .../api/pack/IPackBlockFactory.java | 1 + .../api/pack/IPackDataResolver.java | 1 + .../api/pack/StandardDataResolver.java | 1 + .../api/registry/IIngredientHandler.java | 7 +- .../api/registry/IRecipeHandler.java | 16 +- .../api/registry/IRecipeHandlerRegistry.java | 1 + .../api/registry/IRenderRegistry.java | 1 + .../api/registry/IWailaRegistry.java | 1 + .../api/registry/IWailaTooltipHandler.java | 1 + .../api/render/IRenderLabel.java | 4 +- .../api/security/ISecurityProvider.java | 1 + .../storagedrawers/api/storage/IDrawer.java | 47 +- .../api/storage/IDrawerGroup.java | 1 + .../api/storage/IDrawerGroupInteractive.java | 1 + .../api/storage/IFractionalDrawer.java | 15 +- .../api/storage/INetworked.java | 3 +- .../api/storage/IPriorityGroup.java | 1 + .../api/storage/ISmartGroup.java | 5 +- .../api/storage/attribute/ILockable.java | 8 +- .../api/storage/attribute/IProtectable.java | 11 +- .../api/storage/attribute/ISealable.java | 6 +- .../api/storage/attribute/IShroudable.java | 6 +- .../api/storage/attribute/IVoidable.java | 1 + .../api/storage/attribute/LockAttribute.java | 1 + .../block/BlockCompDrawers.java | 25 +- .../storagedrawers/block/BlockController.java | 39 +- .../storagedrawers/block/BlockDrawers.java | 232 +++--- .../block/BlockDrawersCustom.java | 26 +- .../block/BlockFramingTable.java | 33 +- .../storagedrawers/block/BlockSlave.java | 15 +- .../storagedrawers/block/BlockTrim.java | 14 +- .../storagedrawers/block/BlockTrimCustom.java | 16 +- .../storagedrawers/block/DataResolver.java | 10 +- .../block/IExtendedBlockClickHandler.java | 14 +- .../block/pack/BlockDrawersPack.java | 18 +- .../block/pack/BlockSortingDrawersPack.java | 18 +- .../block/pack/BlockSortingTrimPack.java | 16 +- .../block/pack/BlockTrimPack.java | 16 +- .../block/tile/BaseTileEntity.java | 12 +- .../storagedrawers/block/tile/BlockCoord.java | 1 + .../block/tile/TileEntityController.java | 60 +- .../block/tile/TileEntityDrawers.java | 66 +- .../block/tile/TileEntityDrawersComp.java | 134 ++-- .../block/tile/TileEntityDrawersStandard.java | 1 + .../block/tile/TileEntityFramingTable.java | 6 +- .../block/tile/TileEntitySlave.java | 17 +- .../block/tile/TileEntityTrim.java | 1 + .../storagedrawers/client/gui/GuiDrawers.java | 77 +- .../storagedrawers/client/gui/GuiFraming.java | 22 +- .../client/renderer/ControllerRenderer.java | 29 +- .../renderer/DrawersCustomRenderer.java | 20 +- .../client/renderer/DrawersItemRenderer.java | 17 +- .../client/renderer/DrawersRenderer.java | 134 ++-- .../client/renderer/FramingTableRenderer.java | 15 +- .../client/renderer/GLUtil.java | 4 +- .../client/renderer/ModularBoxRenderer.java | 247 +++--- .../client/renderer/PanelBoxRenderer.java | 220 ++++-- .../client/renderer/RenderUtil.java | 748 +++++++++--------- .../client/renderer/StorageRenderItem.java | 6 +- .../renderer/TileEntityDrawersRenderer.java | 151 ++-- .../renderer/TileEntityFramingRenderer.java | 38 +- .../client/renderer/TrimCustomRenderer.java | 20 +- .../client/renderer/TrimItemRender.java | 7 +- .../renderer/common/CommonDrawerRenderer.java | 32 +- .../common/CommonFramingRenderer.java | 101 +-- .../renderer/common/CommonTrimRenderer.java | 6 +- .../config/CompTierRegistry.java | 6 +- .../storagedrawers/config/ConfigManager.java | 351 ++++---- .../storagedrawers/config/ModConfigGui.java | 10 +- .../config/OreDictRegistry.java | 30 +- .../config/RecipeHandlerRegistry.java | 13 +- .../storagedrawers/config/RenderRegistry.java | 6 +- .../storagedrawers/config/WailaRegistry.java | 6 +- .../minecraft/storagedrawers/core/Api.java | 1 + .../storagedrawers/core/ClientProxy.java | 9 +- .../storagedrawers/core/CommonProxy.java | 1 + .../core/ForgeEventHandler.java | 6 +- .../storagedrawers/core/ModBlocks.java | 31 +- .../storagedrawers/core/ModCreativeTabs.java | 12 +- .../storagedrawers/core/ModGuiFactory.java | 7 +- .../storagedrawers/core/ModItems.java | 7 +- .../storagedrawers/core/ModRecipes.java | 728 ++++++++--------- .../core/api/BlockRegistry.java | 35 +- .../storagedrawers/core/api/PackFactory.java | 17 +- .../storagedrawers/core/api/PackRecipes.java | 144 ++-- .../core/handlers/GuiHandler.java | 10 +- .../core/recipe/FallbackShapedOreRecipe.java | 1 + .../core/recipe/TemplateRecipe.java | 7 +- .../integration/AppliedEnergistics.java | 23 +- .../integration/ChiselIntegrationModule.java | 10 +- .../integration/GTNHIntegrationModule.java | 4 +- .../integration/IntegrationModule.java | 4 +- .../integration/IntegrationRegistry.java | 13 +- .../integration/MineTweaker.java | 4 +- .../integration/NotEnoughItems.java | 2 + .../integration/RefinedRelocation.java | 170 ++-- .../integration/Thaumcraft.java | 42 +- .../integration/ThermalExpansion.java | 402 +++++----- .../integration/ThermalFoundation.java | 32 +- .../storagedrawers/integration/Waila.java | 84 +- .../ae2/DrawerExternalStorageHandler.java | 7 +- .../integration/ae2/DrawerMEInventory.java | 16 +- .../ae2/IStorageBusMonitorFactory.java | 1 + .../integration/ae2/IngredientHandler.java | 7 +- .../integration/ae2/ShapedRecipeHandler.java | 5 +- .../ae2/ShapelessRecipeHandler.java | 5 +- .../integration/gtnh/ModRecipes.java | 621 ++++++++------- .../integration/minetweaker/Compaction.java | 17 +- .../minetweaker/OreDictionaryBlacklist.java | 11 +- .../minetweaker/OreDictionaryWhitelist.java | 5 +- .../NEIStorageDrawersConfig.java | 15 +- .../BlockSortingCompDrawers.java | 15 +- .../BlockSortingDrawers.java | 17 +- .../refinedrelocation/BlockSortingTrim.java | 13 +- .../refinedrelocation/DrawerFilter.java | 4 +- .../DrawerSortingInventory.java | 15 +- .../ItemSortingCompDrawers.java | 10 +- .../refinedrelocation/ItemSortingDrawers.java | 16 +- .../refinedrelocation/ItemSortingTrim.java | 10 +- .../refinedrelocation/ItemUpgradeSorting.java | 31 +- .../SortingBlockRegistry.java | 2 + .../TileSortingDrawersComp.java | 4 +- .../TileSortingDrawersStandard.java | 4 +- .../refinedrelocation/TileSortingTrim.java | 3 +- .../CoFHSecurityProvider.java | 1 + .../inventory/ContainerDrawers.java | 46 +- .../inventory/ContainerDrawers1.java | 6 +- .../inventory/ContainerDrawers2.java | 6 +- .../inventory/ContainerDrawers4.java | 6 +- .../inventory/ContainerDrawersComp.java | 6 +- .../inventory/ContainerFramingTable.java | 46 +- .../inventory/ISideManager.java | 1 + .../inventory/InventoryContainerProxy.java | 1 + .../inventory/InventoryStack.java | 1 + .../inventory/InventoryStorage.java | 11 +- .../inventory/InventoryUpgrade.java | 16 +- .../inventory/SlotCraftResult.java | 17 +- .../inventory/SlotRestricted.java | 1 + .../storagedrawers/inventory/SlotStorage.java | 1 + .../storagedrawers/inventory/SlotUpgrade.java | 4 +- .../inventory/StorageInventory.java | 6 +- .../storagedrawers/item/ItemBasicDrawers.java | 6 +- .../storagedrawers/item/ItemCompDrawers.java | 33 +- .../storagedrawers/item/ItemController.java | 24 +- .../item/ItemCustomDrawers.java | 31 +- .../storagedrawers/item/ItemCustomTrim.java | 24 +- .../storagedrawers/item/ItemDrawers.java | 42 +- .../storagedrawers/item/ItemFramingTable.java | 15 +- .../storagedrawers/item/ItemPersonalKey.java | 21 +- .../storagedrawers/item/ItemShroudKey.java | 14 +- .../storagedrawers/item/ItemTape.java | 31 +- .../storagedrawers/item/ItemTrim.java | 4 +- .../storagedrawers/item/ItemUpgrade.java | 16 +- .../item/ItemUpgradeCreative.java | 14 +- .../item/ItemUpgradeDowngrade.java | 11 +- .../storagedrawers/item/ItemUpgradeLock.java | 14 +- .../item/ItemUpgradeRedstone.java | 14 +- .../item/ItemUpgradeStatus.java | 14 +- .../storagedrawers/item/ItemUpgradeVoid.java | 12 +- .../item/pack/ItemDrawersPack.java | 4 +- .../item/pack/ItemSortingDrawersPack.java | 10 +- .../item/pack/ItemSortingTrimPack.java | 10 +- .../item/pack/ItemTrimPack.java | 4 +- .../network/BlockClickMessage.java | 32 +- .../network/CountUpdateMessage.java | 14 +- .../security/DefaultSecurityProvider.java | 1 + .../security/SecurityManager.java | 1 + .../security/SecurityRegistry.java | 4 +- .../storage/BaseDrawerData.java | 19 +- .../storage/CompDrawerData.java | 8 +- .../storage/DefaultStorageProvider.java | 11 +- .../storagedrawers/storage/DrawerData.java | 10 +- .../storage/ICentralInventory.java | 6 +- .../storage/IStorageProvider.java | 1 + .../storage/IUpgradeProvider.java | 1 + .../util/ItemMetaListRegistry.java | 5 +- .../storagedrawers/util/ItemMetaRegistry.java | 2 + .../storagedrawers/util/RenderHelper.java | 140 +--- .../storagedrawers/util/RenderHelperAO.java | 423 +++++----- .../storagedrawers/util/RenderHelperLL.java | 124 ++- .../util/RenderHelperState.java | 21 +- .../util/UniqueMetaIdentifier.java | 9 +- .../util/UniqueMetaRegistry.java | 2 + 199 files changed, 3768 insertions(+), 3551 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index a8d9bd8..ed9539f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-76-GTNH:api') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.33:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.254:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.2.6-GTNH:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:waila:1.5.18:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:Avaritia:1.30:dev') {transitive=false} diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java index 45f05e9..27b4433 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java @@ -1,5 +1,9 @@ package com.jaquadro.minecraft.storagedrawers; +import java.io.File; + +import net.minecraftforge.common.MinecraftForge; + import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; import com.jaquadro.minecraft.storagedrawers.config.*; import com.jaquadro.minecraft.storagedrawers.core.*; @@ -9,6 +13,7 @@ import com.jaquadro.minecraft.storagedrawers.integration.IntegrationRegistry; import com.jaquadro.minecraft.storagedrawers.network.BlockClickMessage; import com.jaquadro.minecraft.storagedrawers.network.CountUpdateMessage; import com.jaquadro.minecraft.storagedrawers.security.SecurityRegistry; + import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; @@ -20,8 +25,6 @@ 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; @Mod( modid = StorageDrawers.MOD_ID, @@ -30,6 +33,7 @@ import net.minecraftforge.common.MinecraftForge; 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"; 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 55d1745..ffe2512 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java @@ -8,6 +8,7 @@ import com.jaquadro.minecraft.storagedrawers.api.registry.IRenderRegistry; import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaRegistry; public interface IStorageDrawersApi { + /** * Recipe handlers are used to make custom recipes compatible with compacting drawers. */ 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 016b19e..d4612d4 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java @@ -4,6 +4,7 @@ package com.jaquadro.minecraft.storagedrawers.api; * Entry point for the public API. */ public class StorageDrawersApi { + private static IStorageDrawersApi instance; public static final String VERSION = "1.7.10-1.2.0"; 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 55356ab..8bcac5f 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,6 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.api.config; public interface IAddonConfig { + /** * Gets whether the user has configured a preference for addon packs to hide their blocks and items from Vanilla * creative tabs. @@ -13,8 +14,8 @@ public interface IAddonConfig { boolean showAddonItemsVanilla(); /** - * Gets whether the user has configured a preference for addon packs to provide their blocks and items through - * their own vanilla tab. + * Gets whether the user has configured a preference for addon packs to provide their blocks and items through their + * own vanilla tab. */ 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 514578b..92d5cc2 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 @@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.api.config; import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; public interface IBlockConfig { + String getBlockConfigName(BlockConfiguration blockConfig); boolean isBlockEnabled(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 5739c1e..0e52761 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,6 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.api.config; public interface IIntegrationConfig { + boolean isRefinedRelocationEnabled(); boolean isChiselEnabled(); 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 bc9229b..5e51985 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 @@ -4,6 +4,7 @@ package com.jaquadro.minecraft.storagedrawers.api.config; * The main hub for user-managed mod configuration. */ public interface IUserConfig { + /** * Configuration options related to third party addon packs for Storage Drawers. */ 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 866f371..a83b0fa 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 @@ -4,12 +4,13 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import cpw.mods.fml.common.eventhandler.Event; /** - * This event is called when a drawer has been bound to a new item. This is - * and opportunity for mods to cache extended data with the drawer. + * This event is called when a drawer has been bound to a new item. This is and opportunity for mods to cache extended + * data with the drawer. * * This event is also called when the drawer is changed to empty. */ public class DrawerPopulatedEvent extends Event { + public final IDrawer drawer; public DrawerPopulatedEvent(IDrawer drawer) { 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 d0e1f41..9837846 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 @@ -4,6 +4,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; public interface IDrawerInventory extends ISidedInventory { + /** * Gets a drawer's group slot index from an IInventory slot index. * @@ -15,7 +16,7 @@ public interface IDrawerInventory extends ISidedInventory { * Gets an IInventory slot index suitable for operations for the given type. * * @param drawerSlot The index of the drawer within its group. - * @param type The type of IInventory slot to return an index for. + * @param type The type of IInventory slot to return an index for. */ int getInventorySlot(int drawerSlot, SlotType type); 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 0c7a451..8b4ad0f 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 @@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.api.inventory; import net.minecraft.item.ItemStack; public interface IInventoryAdapter { + ItemStack getInventoryStack(SlotType slotType); void setInStack(ItemStack stack); 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 8736505..753b21e 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 @@ -4,6 +4,7 @@ package com.jaquadro.minecraft.storagedrawers.api.inventory; * Classifies different IInventory slots according to how they should be used. */ 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/pack/BlockConfiguration.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java index edc6a36..68ce618 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,6 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; public enum BlockConfiguration { + BasicFull1(BlockType.Drawers, 1, false), BasicFull2(BlockType.Drawers, 2, false), BasicFull4(BlockType.Drawers, 4, false), 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 879f984..298df32 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 @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; public class ExtendedDataResolver extends StandardDataResolver implements IExtendedDataResolver { + private Block[] planks = new Block[16]; private int[] planksMeta = new int[16]; 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 0ed22bf..d9d604d 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 @@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; import net.minecraft.block.Block; public interface IExtendedDataResolver extends IPackDataResolver { + Block getBlock(BlockConfiguration blockConfig); Block getPlankBlock(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 14e3f08..63a7435 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,5 +1,6 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; 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 f0e8846..a3c1de8 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 @@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; import net.minecraft.block.Block; public interface IPackBlockFactory { + Block createBlock(BlockConfiguration blockConfig, IPackDataResolver dataResolver); /** 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 b10563b..600c705 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 @@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; import net.minecraft.creativetab.CreativeTabs; public interface IPackDataResolver { + String getPackModID(); String getBlockName(BlockConfiguration blockConfig); 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 90bacb0..588ebf7 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 @@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; import net.minecraft.creativetab.CreativeTabs; public class StandardDataResolver implements IPackDataResolver { + private String modID; private String[] unlocalizedNames; private CreativeTabs creativeTab; 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 714bc6d..c8f8bf3 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 @@ -3,11 +3,12 @@ package com.jaquadro.minecraft.storagedrawers.api.registry; import net.minecraft.item.ItemStack; /** - * Ingredient handlers are used to get ItemStacks from ingredients in custom IRecipe implementations. If you have - * registered an IRecipeHandler that returns lists of objects that aren't ItemStacks, then you will need to - * implement an ingredient handler for those objects. + * Ingredient handlers are used to get ItemStacks from ingredients in custom IRecipe implementations. If you have + * 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 { + /** * Gets an ItemStack from an object that represents an ingredient in an IRecipe. * 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 0b4fec9..3b33923 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,17 +1,18 @@ package com.jaquadro.minecraft.storagedrawers.api.registry; 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. + * 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 { + /** - * 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 - * get an ItemStack from them. + * 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 get an ItemStack from them. * * If you would prefer to return a List, return null in this method and implement {@link #getInputAsList}. * @@ -21,9 +22,8 @@ public interface IRecipeHandler { Object[] getInputAsArray(IRecipe recipe); /** - * Get the recipe ingredient list as a list of objects (usually used for shapeless recipes). - * If your list does not contain ItemStack objects, you will need to register an {@link IIngredientHandler} to - * get an ItemStack from them. + * Get the recipe ingredient list as a list of objects (usually used for shapeless recipes). If your list does not + * contain ItemStack objects, you will need to register an {@link IIngredientHandler} to get an ItemStack from them. * * If you would prefer to return an array, return null in this method and implement {@link #getInputAsArray}. * 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 8645fb3..0346567 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,6 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.api.registry; public interface IRecipeHandlerRegistry { + void registerRecipeHandler(Class clazz, IRecipeHandler handler); void registerIngredientHandler(Class clazz, IIngredientHandler handler); 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 dc605b3..bdca3c0 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 @@ -3,5 +3,6 @@ package com.jaquadro.minecraft.storagedrawers.api.registry; import com.jaquadro.minecraft.storagedrawers.api.render.IRenderLabel; 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 5cc8909..a54bf26 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,5 +1,6 @@ package com.jaquadro.minecraft.storagedrawers.api.registry; 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 acd724d..c792cc9 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 @@ -3,5 +3,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); } 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 23e0c6d..c0937a3 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 @@ -1,8 +1,10 @@ package com.jaquadro.minecraft.storagedrawers.api.render; -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import net.minecraft.tileentity.TileEntity; +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; + 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/security/ISecurityProvider.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java index 3b8e086..fa849df 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 @@ -4,6 +4,7 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IProtectable; import com.mojang.authlib.GameProfile; public interface ISecurityProvider { + String getProviderID(); boolean hasOwnership(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 d8fd3e5..a926bba 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 @@ -4,34 +4,36 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; 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. + * 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(); /** - * 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. + * 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(); /** - * Sets the type of the stored item and initializes it to the given amount. Any existing item will be replaced. + * Sets the type of the stored item and initializes it to the given amount. Any existing item will be replaced. * * @param itemPrototype An ItemStack representing the type, metadata, and tags of the item to store. - * @param amount The amount to initialize the stored item count to. + * @param amount The amount to initialize the stored item count to. * @deprecated setStoredItem may redirect its set to another IDrawer, so use setStoredItemRedir instead. */ @Deprecated 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. + * Sets the type of the stored item and initializes it to the given amount. Any existing item will be replaced. * * @param itemPrototype An ItemStack representing the type, metadata, and tags of the item to store. - * @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. + * @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); @@ -41,16 +43,16 @@ public interface IDrawer { int getStoredItemCount(); /** - * Sets the number of items stored in this drawer. Triggers syncing of inventories and client data. - * Setting a drawer's count to 0 may also result in the item type being cleared, depending in implementation. + * Sets the number of items stored in this drawer. Triggers syncing of inventories and client data. Setting a + * drawer's count to 0 may also result in the item type being cleared, depending in implementation. * * @param amount The new amount of items stored in this drawer. */ 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. + * 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(); @@ -67,17 +69,16 @@ public interface IDrawer { int getRemainingCapacity(); /** - * Gets the max stack size of the item type stored in this drawer. Convenience method. + * Gets the max stack size of the item type stored in this drawer. Convenience method. */ int getStoredItemStackSize(); /** * Gets whether or not an item of the given type and data can be stored in this drawer. * - * Stack size and available capacity are not considered. For drawers that are not empty, this - * method can allow ore-dictionary compatible items to be accepted into the drawer, as defined by what - * the drawer considers to be an equivalent item. - * For drawers that are empty, locking status is considered. + * Stack size and available capacity are not considered. For drawers that are not empty, this method can allow + * ore-dictionary compatible items to be accepted into the drawer, as defined by what the drawer considers to be an + * equivalent item. For drawers that are empty, locking status is considered. * * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item. */ @@ -86,16 +87,15 @@ public interface IDrawer { /** * Gets whether or not an item of the given type and data can be extracted from this drawer. * - * This is intended to allow outbound ore-dictionary conversions of compatible items, as defined by what - * the drawer considers to be an equivalent item. + * This is intended to allow outbound ore-dictionary conversions of compatible items, as defined by what the drawer + * considers to be an equivalent item. * * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item. */ 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. + * Gets whether or not the drawer has items. A drawer set with an item type and 0 count is not considered empty. */ boolean isEmpty(); @@ -109,7 +109,8 @@ public interface IDrawer { /** * Stores auxiliary data with this drawer, mainly for use in integration. - * @param key The key to identify the data with. + * + * @param key The key to identify the data with. * @param data The data to store. */ void setExtendedData(String key, Object data); 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 790fc52..d7c80a0 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 @@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.api.storage; import com.jaquadro.minecraft.storagedrawers.api.inventory.IDrawerInventory; public interface IDrawerGroup { + /** * Gets the number of drawers contained within this group. */ 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 fe23227..1730728 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 @@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public interface IDrawerGroupInteractive extends IDrawerGroup { + ItemStack takeItemsFromSlot(int slot, int count); int putItemsIntoSlot(int slot, ItemStack stack, int count); 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 ba47d96..d153ae7 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 @@ -1,27 +1,28 @@ 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 + * 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 { + /** * 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. + * 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(); /** - * 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. + * 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(); /** - * Gets whether or not the stored item represents the smallest granularity of material that can be stored within - * the drawer group. + * Gets whether or not the stored item represents the smallest granularity of material that can be stored within the + * drawer group. */ 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 fe5b52f..ac4524c 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,3 +1,4 @@ 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 9dd708f..44b7524 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,6 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.api.storage; public interface IPriorityGroup { + /** * Gets the list of available drawer slots in priority order. */ 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 ad6a13a..ad91d34 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 @@ -3,9 +3,10 @@ package com.jaquadro.minecraft.storagedrawers.api.storage; import net.minecraft.item.ItemStack; 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. + * 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); 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 fd6fda0..3e8df3c 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,20 +1,20 @@ package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; public interface ILockable { + /** * Gets whether or not a drawer or group is locked for the given lock attribute. */ 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. + * 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); /** - * Sets the lock state of a drawer or group for the given lock attribute. - * If canLock returns false, this is a no-op. + * 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); } 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 428ef94..0863165 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,28 +1,33 @@ package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; -import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; import java.util.UUID; +import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; + public interface IProtectable { + /** * Gets the owner of the drawer, or null if there is no owner. */ UUID getOwner(); /** - * Sets the owner of the drawer. Set to null to set no owner. + * 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); /** * Gets the provider managing security for the target. + * * @return null to use the default provider, which enforces strict owner access. */ ISecurityProvider getSecurityProvider(); /** - * Sets the provider managing security for the target. Set to null for default provider. + * 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); 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 eb9a951..ad768f3 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,14 +1,16 @@ package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; 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. + * 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(); /** * Sets whether or not the drawer is currently sealed. + * * @return false if the operation is not supported, true otherwise. */ 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 025420c..d42ad4f 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,14 +1,16 @@ package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; 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. + * Gets whether or not the drawer has the shrouded attribute. The shrouded attribute instructs the drawer to not + * render its item label. */ 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); 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 7d04516..4d51d62 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,6 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; public interface IVoidable { + /** * Gets whether or not the drawer has a voiding attribute. */ 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 f626b79..17d2642 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 @@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; import java.util.EnumSet; public enum LockAttribute { + LOCK_POPULATED, LOCK_EMPTY; 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 37e5b00..497ab2b 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java @@ -1,14 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.block; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.pack.BlockType; -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -import com.jaquadro.minecraft.storagedrawers.api.storage.INetworked; -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; @@ -20,7 +13,18 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.pack.BlockType; +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; +import com.jaquadro.minecraft.storagedrawers.api.storage.INetworked; +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; + public class BlockCompDrawers extends BlockDrawers implements INetworked { + @SideOnly(Side.CLIENT) private IIcon[] iconFront; @@ -133,9 +137,8 @@ public class BlockCompDrawers extends BlockDrawers implements INetworked { for (int i = 0; i < 3; i++) { 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); + for (int j = 1; j <= 6; 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 870fa45..bcd155c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockController.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockController.java @@ -1,17 +1,8 @@ package com.jaquadro.minecraft.storagedrawers.block; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; -import com.jaquadro.minecraft.storagedrawers.api.storage.INetworked; -import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityController; -import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; -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; @@ -26,7 +17,20 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; +import com.jaquadro.minecraft.storagedrawers.api.storage.INetworked; +import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityController; +import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; +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; + public class BlockController extends BlockContainer implements INetworked { + @SideOnly(Side.CLIENT) private IIcon iconFront; @@ -113,8 +117,8 @@ public class BlockController extends BlockContainer implements INetworked { } @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(); @@ -123,14 +127,15 @@ public class BlockController extends BlockContainer implements INetworked { if (!world.isRemote) te.toggleShroud(player.getGameProfile()); return true; } else if (item.getItem() == ModItems.upgradeLock) { - if (!world.isRemote) - te.toggleLock( - EnumSet.allOf(LockAttribute.class), LockAttribute.LOCK_POPULATED, player.getGameProfile()); + if (!world.isRemote) te.toggleLock( + EnumSet.allOf(LockAttribute.class), + LockAttribute.LOCK_POPULATED, + player.getGameProfile()); return true; } 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); 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 b594ace..2e84953 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -1,28 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.block; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; -import com.jaquadro.minecraft.storagedrawers.api.pack.BlockType; -import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -import com.jaquadro.minecraft.storagedrawers.api.storage.INetworked; -import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard; -import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; -import com.jaquadro.minecraft.storagedrawers.core.ModItems; -import com.jaquadro.minecraft.storagedrawers.core.handlers.GuiHandler; -import com.jaquadro.minecraft.storagedrawers.item.ItemPersonalKey; -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; @@ -31,6 +8,7 @@ import java.lang.reflect.Method; 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; @@ -52,12 +30,39 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.player.PlayerInteractEvent; + import org.apache.commons.compress.utils.IOUtils; import org.apache.logging.log4j.Level; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; +import com.jaquadro.minecraft.storagedrawers.api.pack.BlockType; +import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; +import com.jaquadro.minecraft.storagedrawers.api.storage.INetworked; +import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard; +import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; +import com.jaquadro.minecraft.storagedrawers.core.ModItems; +import com.jaquadro.minecraft.storagedrawers.core.handlers.GuiHandler; +import com.jaquadro.minecraft.storagedrawers.item.ItemPersonalKey; +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; + public class BlockDrawers extends BlockContainer implements IExtendedBlockClickHandler, INetworked { - private static final ResourceLocation blockConfig = - new ResourceLocation(StorageDrawers.MOD_ID + ":textures/blocks/block_config.mcmeta"); + + private static final ResourceLocation blockConfig = new ResourceLocation( + StorageDrawers.MOD_ID + ":textures/blocks/block_config.mcmeta"); public final boolean halfDepth; public final int drawerCount; @@ -269,8 +274,8 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } @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); } @@ -305,8 +310,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; @@ -334,51 +339,51 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return true; } /** - * Gee, it'd be nice if we could make all of these Items descend from one thing, almost like children - * 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 + * Gee, it'd be nice if we could make all of these Items descend from one thing, almost like children 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) { - if (!tileDrawers.addUpgrade(item)) { - player.addChatMessage(new ChatComponentTranslation("storagedrawers.msg.maxUpgrades")); - return false; - } + if (!tileDrawers.addUpgrade(item)) { + player.addChatMessage(new ChatComponentTranslation("storagedrawers.msg.maxUpgrades")); + return false; + } - world.markBlockForUpdate(x, y, z); + world.markBlockForUpdate(x, y, z); - if (player != null && !player.capabilities.isCreativeMode) { - if (--item.stackSize <= 0) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); - } + if (player != null && !player.capabilities.isCreativeMode) { + if (--item.stackSize <= 0) + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + } - return true; - } 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.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) { - tileDrawers.setIsShrouded(!tileDrawers.isShrouded()); - return true; - } else if (item.getItem() instanceof ItemPersonalKey) { - String securityKey = ((ItemPersonalKey) item.getItem()).getSecurityProviderKey(item.getItemDamage()); - ISecurityProvider provider = StorageDrawers.securityRegistry.getProvider(securityKey); + return true; + } else if (item.getItem() == ModItems.shroudKey) { + tileDrawers.setIsShrouded(!tileDrawers.isShrouded()); + return true; + } 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)) { - tileDrawers.setOwner(null); - tileDrawers.setSecurityProvider(null); - } else return false; - return true; - } else if (item.getItem() == ModItems.tape) return false; + if (tileDrawers.getOwner() == null) { + tileDrawers.setOwner(player.getPersistentID()); + tileDrawers.setSecurityProvider(provider); + } else if (SecurityManager.hasOwnership(player.getGameProfile(), tileDrawers)) { + tileDrawers.setOwner(null); + tileDrawers.setSecurityProvider(null); + } else return false; + return true; + } else if (item.getItem() == ModItems.tape) return false; } else if (item == null && player.isSneaking()) { if (tileDrawers.isSealed()) { tileDrawers.setIsSealed(false); @@ -438,8 +443,16 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH 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()); @@ -447,23 +460,14 @@ 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); + PlayerInteractEvent event = ForgeEventFactory + .onPlayerInteract(player, PlayerInteractEvent.Action.LEFT_CLICK_BLOCK, x, y, z, side, world); if (event.isCanceled()) return; } @@ -491,14 +495,13 @@ 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); } } @@ -571,8 +574,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH if (stack.stackSize > 0) { EntityItem entity = new EntityItem(world, x + ex, y + ey, z + ez, stack); if (stack.hasTagCompound()) - entity.getEntityItem() - .setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); + entity.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); world.spawnEntityInWorld(entity); } } @@ -618,8 +620,8 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH /* System.out.println("hello"); */ if (cpw.mods.fml.common.Loader.isModLoaded("Avaritia")) { try { - Class itemMatterClusterClass = - Class.forName("fox.spiteful.avaritia.items.ItemMatterCluster"); + Class itemMatterClusterClass = Class + .forName("fox.spiteful.avaritia.items.ItemMatterCluster"); Method method = itemMatterClusterClass.getMethod("makeClusters", List.class); /* May not be used */ for (int i = 0; i < tile.getDrawerCount(); i++) { @@ -632,16 +634,14 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH stacks.add(stack); } - List clusters = - (List) method.invoke(itemMatterClusterClass, stacks); + List clusters = (List) method + .invoke(itemMatterClusterClass, stacks); for (ItemStack stack : clusters) { dropStackInBatches(world, x, y, z, stack); } } break; /* switch */ - } catch (NoSuchMethodException - | InvocationTargetException - | IllegalAccessException + } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException | ClassNotFoundException e) { StorageDrawers.config.cache.breakDrawerDropMode = "default"; FMLLog.log( @@ -701,8 +701,7 @@ 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()); } } @@ -750,15 +749,8 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } @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++) { @@ -803,13 +795,12 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return super.addHitEffects(worldObj, target, effectRenderer); } - /*@Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects (World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { - TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileEntityDrawers) - return super.addDestroyEffects(world, x, y, z, meta, effectRenderer); - }*/ + /* + * @Override + * @SideOnly(Side.CLIENT) public boolean addDestroyEffects (World world, int x, int y, int z, int meta, + * EffectRenderer effectRenderer) { TileEntity tile = world.getTileEntity(x, y, z); if (tile instanceof + * TileEntityDrawers) return super.addDestroyEffects(world, x, y, z, meta, effectRenderer); } + */ @Override public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) { @@ -1012,7 +1003,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]; @@ -1048,8 +1039,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH @SideOnly(Side.CLIENT) 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())); @@ -1057,10 +1047,8 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH JsonObject entry = root.getAsJsonObject(getConfigName()); if (entry != null) { - if (entry.has("trimWidth")) - trimWidth = entry.get("trimWidth").getAsFloat(); - if (entry.has("trimDepth")) - trimDepth = entry.get("trimDepth").getAsFloat(); + if (entry.has("trimWidth")) 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(); 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 0200f33..862f54e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java @@ -1,13 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.block; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.pack.BlockType; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; -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; @@ -16,7 +10,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.pack.BlockType; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; +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; + public class BlockDrawersCustom extends BlockDrawers { + @SideOnly(Side.CLIENT) private IIcon overlayHandle; @@ -65,8 +69,8 @@ public class BlockDrawersCustom extends BlockDrawers { TileEntityDrawers tile = getTileEntity(world, x, y, z); 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 @@ -75,8 +79,8 @@ public class BlockDrawersCustom extends BlockDrawers { } @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; 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 965605b..cd6df91 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockFramingTable.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockFramingTable.java @@ -1,14 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.block; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityFramingTable; -import com.jaquadro.minecraft.storagedrawers.core.ClientProxy; -import com.jaquadro.minecraft.storagedrawers.core.ModBlocks; -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; @@ -22,9 +15,22 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityFramingTable; +import com.jaquadro.minecraft.storagedrawers.core.ClientProxy; +import com.jaquadro.minecraft.storagedrawers.core.ModBlocks; +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; + 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}}; + + 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 } }; private Random random = new Random(); @@ -55,8 +61,8 @@ public class BlockFramingTable extends BlockContainer { } @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); @@ -169,8 +175,7 @@ public class BlockFramingTable extends BlockContainer { 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; 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 1a46434..95ec7fe 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockSlave.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockSlave.java @@ -1,11 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.block; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.storage.INetworked; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntitySlave; -import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -15,7 +9,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.storage.INetworked; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntitySlave; +import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockSlave extends BlockContainer implements INetworked { + @SideOnly(Side.CLIENT) private IIcon iconSide; 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 063cb86..0909454 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockTrim.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockTrim.java @@ -1,12 +1,8 @@ package com.jaquadro.minecraft.storagedrawers.block; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -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; @@ -18,7 +14,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +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; + public class BlockTrim extends Block implements INetworked { + @SideOnly(Side.CLIENT) protected IIcon[] iconTrim; 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 6c58917..72976ca 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockTrimCustom.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockTrimCustom.java @@ -1,12 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.block; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityTrim; -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; @@ -18,7 +13,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityTrim; +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; + public class BlockTrimCustom extends BlockTrim implements ITileEntityProvider { + @SideOnly(Side.CLIENT) private IIcon defaultFace; 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 ad0bed5..c303ede 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/DataResolver.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/DataResolver.java @@ -1,17 +1,19 @@ package com.jaquadro.minecraft.storagedrawers.block; +import net.minecraft.block.Block; +import net.minecraft.block.BlockWood; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; + import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; import com.jaquadro.minecraft.storagedrawers.api.pack.BlockType; import com.jaquadro.minecraft.storagedrawers.api.pack.ExtendedDataResolver; import com.jaquadro.minecraft.storagedrawers.core.ModBlocks; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import com.jaquadro.minecraft.storagedrawers.integration.RefinedRelocation; -import net.minecraft.block.Block; -import net.minecraft.block.BlockWood; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; public class DataResolver extends ExtendedDataResolver { + private static String[] textureNames = BlockWood.field_150096_a; public DataResolver(String modID) { 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 b4a07c2..b568ecf 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/IExtendedBlockClickHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/IExtendedBlockClickHandler.java @@ -4,15 +4,7 @@ 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 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 cd4fb46..d9d7531 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 @@ -1,13 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.block.pack; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.pack.*; -import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; -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; @@ -15,7 +9,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.pack.*; +import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; +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; + public class BlockDrawersPack extends BlockDrawers implements IPackBlock { + private IPackDataResolver resolver; public BlockDrawersPack(IPackDataResolver resolver, int drawerCount, boolean halfDepth) { 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 eca10b1..4189ae2 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 @@ -1,13 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.block.pack; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.pack.*; -import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; -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; @@ -15,7 +9,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.pack.*; +import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; +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; + public class BlockSortingDrawersPack extends BlockSortingDrawers implements IPackBlock { + private IPackDataResolver resolver; public BlockSortingDrawersPack(IPackDataResolver resolver, int drawerCount, boolean halfDepth) { 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 b3e6198..e9690d2 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 @@ -1,19 +1,23 @@ package com.jaquadro.minecraft.storagedrawers.block.pack; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.pack.*; -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 com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.pack.*; +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; + public class BlockSortingTrimPack extends BlockSortingTrim implements IPackBlock { + IPackDataResolver resolver; public BlockSortingTrimPack(IPackDataResolver resolver) { 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 8a2d974..bf21d97 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 @@ -1,19 +1,23 @@ package com.jaquadro.minecraft.storagedrawers.block.pack; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.pack.*; -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 com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.pack.*; +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; + public class BlockTrimPack extends BlockTrim implements IPackBlock { + private IPackDataResolver resolver; public BlockTrimPack(IPackDataResolver resolver) { 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 6658442..4f4c7b5 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 @@ -1,13 +1,17 @@ package com.jaquadro.minecraft.storagedrawers.block.tile; +import java.util.Iterator; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + +import org.apache.logging.log4j.Level; + 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; public class BaseTileEntity extends TileEntity { + private NBTTagCompound failureSnapshot; @Override 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 fbeda1c..7c2207e 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 @@ -4,6 +4,7 @@ package com.jaquadro.minecraft.storagedrawers.block.tile; * Created by Justin on 4/25/2015. */ class BlockCoord { + private int x; private int y; private int z; 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 a11b497..32bbe1e 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 @@ -1,16 +1,7 @@ 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.security.ISecurityProvider; -import com.jaquadro.minecraft.storagedrawers.api.storage.*; -import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.*; -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.mojang.authlib.GameProfile; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; @@ -22,8 +13,20 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.inventory.IDrawerInventory; +import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; +import com.jaquadro.minecraft.storagedrawers.api.storage.*; +import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.*; +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.mojang.authlib.GameProfile; + 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; @@ -35,6 +38,7 @@ public class TileEntityController extends TileEntity private static final int[] emptySlots = new int[0]; private static class StorageRecord { + public IDrawerGroup storage; public boolean mark; public int invStorageSize; @@ -51,6 +55,7 @@ public class TileEntityController extends TileEntity } private static class SlotRecord { + public BlockCoord coord; public int slot; @@ -64,6 +69,7 @@ public class TileEntityController extends TileEntity } private Comparator slotRecordComparator = new Comparator() { + @Override public int compare(SlotRecord o1, SlotRecord o2) { return o1.priority - o2.priority; @@ -114,7 +120,7 @@ public class TileEntityController extends TileEntity 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; @@ -129,7 +135,7 @@ public class TileEntityController extends TileEntity public TileEntityController() { invSlotList.add(new SlotRecord(null, 0)); - inventorySlots = new int[] {0}; + inventorySlots = new int[] { 0 }; range = StorageDrawers.config.getControllerRange(); maxDrawers = StorageDrawers.config.getControllerMaxDrawers(); } @@ -366,8 +372,8 @@ public class TileEntityController extends TileEntity 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) { @@ -515,14 +521,12 @@ public class TileEntityController extends TileEntity record.mark = true; record.distance = depth; - BlockCoord[] neighbors = new BlockCoord[] { - new BlockCoord(coord.x() + 1, coord.y(), coord.z()), - new BlockCoord(coord.x() - 1, coord.y(), coord.z()), - new BlockCoord(coord.x(), coord.y(), coord.z() + 1), - new BlockCoord(coord.x(), coord.y(), coord.z() - 1), - new BlockCoord(coord.x(), coord.y() + 1, coord.z()), - new BlockCoord(coord.x(), coord.y() - 1, coord.z()), - }; + BlockCoord[] neighbors = new BlockCoord[] { new BlockCoord(coord.x() + 1, coord.y(), coord.z()), + new BlockCoord(coord.x() - 1, coord.y(), coord.z()), + new BlockCoord(coord.x(), coord.y(), coord.z() + 1), + new BlockCoord(coord.x(), coord.y(), coord.z() - 1), + new BlockCoord(coord.x(), coord.y() + 1, coord.z()), + new BlockCoord(coord.x(), coord.y() - 1, coord.z()), }; for (BlockCoord n : neighbors) { if (!searchDiscovered.contains(n)) { @@ -820,6 +824,7 @@ public class TileEntityController extends TileEntity } private class DrawerStackIterator implements Iterable { + private ItemStack stack; private boolean strict; private boolean insert; @@ -835,8 +840,9 @@ public class TileEntityController extends TileEntity if (this.stack == null) return new ArrayList(0).iterator(); return new Iterator() { - List primaryRecords = - drawerPrimaryLookup.getEntries(stack.getItem(), stack.getItemDamage()); + + List primaryRecords = drawerPrimaryLookup + .getEntries(stack.getItem(), stack.getItemDamage()); Iterator iter1; int index2; Integer nextSlot = null; @@ -898,7 +904,8 @@ public class TileEntityController extends TileEntity if (insert) { boolean voiding = (drawer instanceof IVoidable) ? ((IVoidable) drawer).isVoid() : false; if (!(drawer.canItemBeStored(stack) - && (drawer.isEmpty() || drawer.getRemainingCapacity() > 0 || voiding))) continue; + && (drawer.isEmpty() || drawer.getRemainingCapacity() > 0 || voiding))) + continue; } else { if (!(drawer.canItemBeExtracted(stack) && drawer.getStoredItemCount() > 0)) continue; } @@ -913,8 +920,7 @@ public class TileEntityController extends TileEntity } }; } - } - ; + }; public Iterable enumerateDrawersForInsertion(ItemStack stack, boolean strict) { return new DrawerStackIterator(stack, strict, true); 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 186475f..904ead8 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 @@ -1,5 +1,21 @@ package com.jaquadro.minecraft.storagedrawers.block.tile; +import java.util.EnumSet; +import java.util.UUID; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; +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.util.MathHelper; +import net.minecraftforge.common.util.Constants; + +import org.apache.logging.log4j.Level; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.inventory.IDrawerInventory; import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; @@ -13,35 +29,18 @@ import com.jaquadro.minecraft.storagedrawers.inventory.ISideManager; import com.jaquadro.minecraft.storagedrawers.inventory.StorageInventory; import com.jaquadro.minecraft.storagedrawers.network.CountUpdateMessage; 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.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.util.MathHelper; -import net.minecraftforge.common.util.Constants; -import org.apache.logging.log4j.Level; -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; @@ -576,8 +575,7 @@ public abstract class TileEntityDrawers extends BaseTileEntity 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); @@ -767,8 +765,15 @@ public abstract class TileEntityDrawers extends BaseTileEntity FMLLog.log( StorageDrawers.MOD_ID, Level.ERROR, - "Drawer at (" + this.xCoord + "," + this.yCoord + "," + this.zCoord + ") has no slot " + slot - + ". Drawers.length is " + drawers.length); + "Drawer at (" + this.xCoord + + "," + + this.yCoord + + "," + + this.zCoord + + ") has no slot " + + slot + + ". Drawers.length is " + + drawers.length); return; } if (drawer.getStoredItemCount() != count) { @@ -788,8 +793,12 @@ public abstract class TileEntityDrawers extends BaseTileEntity 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); } @@ -926,6 +935,7 @@ public abstract class TileEntityDrawers extends BaseTileEntity } private class DefaultSideManager implements ISideManager { + @Override 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 db2ed7a..6dad02a 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 @@ -1,5 +1,19 @@ package com.jaquadro.minecraft.storagedrawers.block.tile; +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; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.nbt.NBTTagCompound; + +import org.apache.logging.log4j.Level; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.registry.IIngredientHandler; import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandler; @@ -9,24 +23,15 @@ import com.jaquadro.minecraft.storagedrawers.config.CompTierRegistry; import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import com.jaquadro.minecraft.storagedrawers.network.CountUpdateMessage; import com.jaquadro.minecraft.storagedrawers.storage.*; + import cpw.mods.fml.common.FMLLog; 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; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.nbt.NBTTagCompound; -import org.apache.logging.log4j.Level; 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); @@ -147,20 +152,18 @@ public class TileEntityDrawersComp extends TileEntityDrawers { 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); + if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) 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); + if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) FMLLog.log( + StorageDrawers.MOD_ID, + Level.INFO, + "Picked candidate " + uTier2.toString() + " with conv=" + lookupSizeResult); populateSlot(index++, uTier2, lookupSizeResult * uCount1); } @@ -174,11 +177,10 @@ public class TileEntityDrawersComp extends TileEntityDrawers { 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); + if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) 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; @@ -188,11 +190,10 @@ public class TileEntityDrawersComp extends TileEntityDrawers { 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); + if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) 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; @@ -205,8 +206,7 @@ public class TileEntityDrawersComp extends TileEntityDrawers { // centralInventory.setStoredItem(slot, stack, 0); // getDrawer(slot).setStoredItem(stack, 0); - if (worldObj != null && worldObj.isRemote) - getWorldObj().func_147479_m(xCoord, yCoord, zCoord); // markBlockForRenderUpdate + if (worldObj != null && worldObj.isRemote) getWorldObj().func_147479_m(xCoord, yCoord, zCoord); // markBlockForRenderUpdate } private ItemStack findHigherTier(ItemStack stack) { @@ -215,11 +215,10 @@ public class TileEntityDrawersComp extends TileEntityDrawers { 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); + if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) FMLLog.log( + StorageDrawers.MOD_ID, + Level.INFO, + "Found " + record.upper.toString() + " in registry with conv=" + record.convRate); lookupSizeResult = record.convRate; return record.upper; @@ -251,12 +250,16 @@ public class TileEntityDrawersComp extends TileEntityDrawers { 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()); + 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()); break; } @@ -299,11 +302,10 @@ public class TileEntityDrawersComp extends TileEntityDrawers { 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); + if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) FMLLog.log( + StorageDrawers.MOD_ID, + Level.INFO, + "Found " + record.lower.toString() + " in registry with conv=" + record.convRate); lookupSizeResult = record.convRate; return record.lower; @@ -348,18 +350,21 @@ public class TileEntityDrawersComp extends TileEntityDrawers { candidates.add(match); 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()); - } else if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) - FMLLog.log( + if (!worldObj.isRemote && StorageDrawers.config.cache.debugTrace) FMLLog.log( StorageDrawers.MOD_ID, Level.INFO, - "Back-check failed for " + match.toString() + " size=" + lookupSizeResult + ", inverse=" + "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()); } } } @@ -481,6 +486,7 @@ public class TileEntityDrawersComp extends TileEntityDrawers { } private class CompCentralInventory implements ICentralInventory { + @Override public ItemStack getStoredItemPrototype(int slot) { return protoStack[slot]; @@ -564,8 +570,7 @@ public class TileEntityDrawersComp extends TileEntityDrawers { return Integer.MAX_VALUE / convRate[slot]; } - return protoStack[0].getItem().getItemStackLimit(protoStack[0]) - * getStackCapacity(0) + return protoStack[0].getItem().getItemStackLimit(protoStack[0]) * getStackCapacity(0) * getConversionRate(slot); } @@ -708,8 +713,12 @@ public class TileEntityDrawersComp extends TileEntityDrawers { 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); } @@ -722,6 +731,7 @@ public class TileEntityDrawersComp extends TileEntityDrawers { } private static class InventoryLookup extends InventoryCrafting { + private ItemStack[] stackList; public InventoryLookup(int width, int height) { 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 65b1442..97a7aa3 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 @@ -30,6 +30,7 @@ public class TileEntityDrawersStandard extends TileEntityDrawers { } private class StandardStorageProvider extends DefaultStorageProvider { + public StandardStorageProvider() { super(TileEntityDrawersStandard.this, TileEntityDrawersStandard.this); } 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 aa1f264..d0dbc92 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 @@ -1,7 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.block.tile; -import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom; -import com.jaquadro.minecraft.storagedrawers.block.BlockTrimCustom; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -15,7 +13,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.Constants; +import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom; +import com.jaquadro.minecraft.storagedrawers.block.BlockTrimCustom; + public class TileEntityFramingTable extends TileEntity implements IInventory { + private ItemStack[] tableItemStacks = new ItemStack[5]; private String customName; 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 03f180d..288596e 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 @@ -1,11 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.block.tile; -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.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; @@ -16,12 +12,19 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants; +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.IPriorityGroup; +import com.jaquadro.minecraft.storagedrawers.api.storage.ISmartGroup; + 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() { if (selfCoord == null) { 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 baa9bcc..05647c7 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 @@ -8,6 +8,7 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; public class TileEntityTrim extends TileEntity { + private ItemStack materialSide; private ItemStack materialTrim; 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 565174e..3a994ee 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 @@ -1,11 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.client.gui; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; -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; @@ -13,17 +9,29 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; +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.*; + 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 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; @@ -79,8 +87,7 @@ public class GuiDrawers extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String name = tileDrawers.hasCustomInventoryName() - ? tileDrawers.getInventoryName() + 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); @@ -105,20 +112,24 @@ public class GuiDrawers extends GuiContainer { 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); + 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); } } } @@ -137,10 +148,10 @@ 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() + if (slot instanceof SlotUpgrade && !((SlotUpgrade) slot).canTakeStack() && slot.xDisplayPosition == x - && slot.yDisplayPosition == y) return false; + && slot.yDisplayPosition == y) + return false; } } @@ -158,12 +169,8 @@ public class GuiDrawers extends GuiContainer { } } - /*@Override - public void func_146977_a (Slot slot) { - RenderItem ri = setItemRender(storageItemRender); - - super.func_146977_a(slot); - - setItemRender(ri); - }*/ + /* + * @Override public void func_146977_a (Slot slot) { RenderItem ri = setItemRender(storageItemRender); + * super.func_146977_a(slot); setItemRender(ri); } + */ } 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 be63a90..321a97f 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 @@ -1,20 +1,25 @@ package com.jaquadro.minecraft.storagedrawers.client.gui; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityFramingTable; -import com.jaquadro.minecraft.storagedrawers.inventory.ContainerFramingTable; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityFramingTable; +import com.jaquadro.minecraft.storagedrawers.inventory.ContainerFramingTable; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiFraming extends GuiContainer { - private static final ResourceLocation guiTextires = - new ResourceLocation(StorageDrawers.MOD_ID.toLowerCase(), "textures/gui/framing.png"); + + private static final ResourceLocation guiTextires = new ResourceLocation( + StorageDrawers.MOD_ID.toLowerCase(), + "textures/gui/framing.png"); private TileEntityFramingTable tileFramingTable; public GuiFraming(InventoryPlayer inventory, TileEntityFramingTable tileEntity) { @@ -27,8 +32,7 @@ public class GuiFraming extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - String name = tileFramingTable.hasCustomInventoryName() - ? tileFramingTable.getInventoryName() + 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); 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 392714c..850f3d1 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 @@ -1,18 +1,21 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; + +import org.lwjgl.opengl.GL11; + 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.util.RenderHelper; 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.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; -import org.lwjgl.opengl.GL11; public class ControllerRenderer implements ISimpleBlockRenderingHandler { + private static final double unit = .0625f; private ModularBoxRenderer boxRenderer = new ModularBoxRenderer(); @@ -33,8 +36,8 @@ public class ControllerRenderer implements ISimpleBlockRenderingHandler { 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); @@ -49,22 +52,22 @@ public class ControllerRenderer implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + 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; 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); 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 e01bef1..7f35ac0 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 @@ -1,28 +1,24 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; 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 net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; 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, + protected void renderBaseBlock(IBlockAccess world, TileEntityDrawers tile, int x, int y, int z, BlockDrawers block, RenderBlocks renderer) { BlockDrawersCustom custom = (BlockDrawersCustom) block; 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 2d93ae4..d868e7d 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 @@ -1,10 +1,5 @@ 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.util.RenderHelper; -import com.jaquadro.minecraft.storagedrawers.util.RenderHelperState; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; @@ -12,9 +7,17 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; + import org.lwjgl.opengl.GL11; +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.util.RenderHelper; +import com.jaquadro.minecraft.storagedrawers.util.RenderHelperState; + public class DrawersItemRenderer implements IItemRenderer { + // private RenderHelper renderHelper = new RenderHelper(); private CommonDrawerRenderer commonRender = new CommonDrawerRenderer(); private ModularBoxRenderer boxRenderer = new ModularBoxRenderer(); @@ -67,8 +70,8 @@ public class DrawersItemRenderer implements IItemRenderer { 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); 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 b510687..a8bf880 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 @@ -1,5 +1,11 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; @@ -8,13 +14,9 @@ import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; 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.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; public class DrawersRenderer implements ISimpleBlockRenderingHandler { + private static final double unit = .0625f; private ModularBoxRenderer boxRenderer = new ModularBoxRenderer(); @@ -24,36 +26,36 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + 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; renderBaseBlock(world, tile, x, y, z, block, renderer); if (renderer.overrideBlockTexture != null - && renderer.overrideBlockTexture.getIconName().startsWith("destroy_stage")) return true; + && 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.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()); @@ -62,19 +64,13 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler { return true; } - protected void renderBaseBlock( - IBlockAccess world, - TileEntityDrawers tile, - int x, - int y, - int z, - BlockDrawers block, + 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); @@ -104,8 +100,8 @@ 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) { + 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; @@ -113,8 +109,8 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler { 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(); } @@ -126,8 +122,8 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler { 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(); } @@ -144,46 +140,34 @@ 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}, - }; + private static final float[][] drawerXYWH1 = new float[][] { { 0, 0, 16, 16 }, }; - private static final float[][] drawerXYWH2 = new float[][] { - {0, 8, 16, 8}, {0, 0, 16, 8}, - }; + private static final float[][] drawerXYWH2 = new float[][] { { 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}, - }; + private static final float[][] drawerXYWH4 = new float[][] { { 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}, - }; + private static final float[][] drawerXYWH3 = new float[][] { { 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) { + 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); @@ -223,7 +207,12 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler { 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); + 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(); @@ -289,8 +278,7 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler { } else if (level >= 2) { double indXStart = xywh[0] + block.getIndStart() / unit; double indXEnd = xywh[0] + block.getIndEnd() / unit; - double indXCur = (block.getIndSteps() == 0) - ? indXEnd + double indXCur = (block.getIndSteps() == 0) ? indXEnd : getIndEnd(block, tile, i, indXStart, (block.getIndEnd() - block.getIndStart()) / unit); double indYStart = xywh[1]; 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 a0e46cc..30a20d2 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 @@ -1,17 +1,20 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.block.BlockFramingTable; import com.jaquadro.minecraft.storagedrawers.client.renderer.common.CommonFramingRenderer; import com.jaquadro.minecraft.storagedrawers.core.ClientProxy; import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.world.IBlockAccess; -import org.lwjgl.opengl.GL11; public class FramingTableRenderer implements ISimpleBlockRenderingHandler { + private CommonFramingRenderer framingRenderer = new CommonFramingRenderer(); @Override @@ -45,8 +48,8 @@ public class FramingTableRenderer implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + 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; 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 ebf209c..1cce2d2 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 @@ -2,9 +2,11 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; import java.util.ArrayList; import java.util.List; + import org.lwjgl.opengl.GL11; public final class GLUtil { + private GLUtil() {} public static List makeGLState() { @@ -14,7 +16,7 @@ public final class GLUtil { 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; } 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 b721e5a..90cab96 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 @@ -1,11 +1,13 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; -import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; import net.minecraft.block.Block; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; + 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; @@ -63,14 +65,18 @@ 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; @@ -190,8 +196,8 @@ public class ModularBoxRenderer { 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); @@ -203,58 +209,48 @@ public class ModularBoxRenderer { double zPos = zNeg + .5; renderExterior( - blockAccess, block, xBase, yBase, zBase, xNeg, yNeg, zNeg, xPos, yPos, zPos, connectedFlags, cutFlags); + 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); + 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; @@ -461,20 +457,8 @@ public class ModularBoxRenderer { } } - 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; @@ -590,15 +574,12 @@ public class ModularBoxRenderer { // 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); @@ -607,15 +588,12 @@ 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); @@ -624,15 +602,12 @@ 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); @@ -641,15 +616,12 @@ 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); @@ -658,15 +630,12 @@ 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); @@ -675,15 +644,12 @@ 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); @@ -692,15 +658,12 @@ 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); @@ -709,15 +672,12 @@ 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); @@ -728,17 +688,8 @@ 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: 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 bd191e3..c608c05 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 @@ -1,11 +1,13 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; -import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; import net.minecraft.block.Block; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; + public class PanelBoxRenderer { + public static final int FACE_YNEG = 0; public static final int FACE_YPOS = 1; public static final int FACE_ZNEG = 2; @@ -13,8 +15,7 @@ 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 + private static final int TRIM_CUT = ModularBoxRenderer.CUT_XNEG | ModularBoxRenderer.CUT_YNEG | ModularBoxRenderer.CUT_ZNEG | ModularBoxRenderer.CUT_XPOS | ModularBoxRenderer.CUT_YPOS @@ -55,19 +56,8 @@ public class PanelBoxRenderer { 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) { @@ -139,127 +129,225 @@ public class PanelBoxRenderer { } } - 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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; 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 9d17877..4a16f40 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 @@ -10,6 +10,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; public final class RenderUtil { + private static float[] colorScratch = new float[3]; private RenderUtil() {} @@ -93,62 +94,56 @@ public final class RenderUtil { 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 + 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); } - 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 + 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); } - 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 + 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); } - 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 + 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); } - 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 + 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); } - 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 + 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); } - public static void renderFaceYNegColorMult( - RenderBlocks renderer, Block block, int x, int y, int z, IIcon icon, float r, float g, float 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; Tessellator tessellator = Tessellator.instance; @@ -156,9 +151,8 @@ public final class RenderUtil { 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); @@ -166,8 +160,8 @@ public final class RenderUtil { 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) { + 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; @@ -175,9 +169,8 @@ public final class RenderUtil { 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); @@ -185,8 +178,8 @@ public final class RenderUtil { 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) { + 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; @@ -194,9 +187,8 @@ public final class RenderUtil { 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); @@ -204,8 +196,8 @@ public final class RenderUtil { 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) { + 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; @@ -213,9 +205,8 @@ public final class RenderUtil { 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); @@ -223,8 +214,8 @@ public final class RenderUtil { 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) { + 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; @@ -232,9 +223,8 @@ public final class RenderUtil { 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); @@ -242,8 +232,8 @@ public final class RenderUtil { 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) { + 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; @@ -251,9 +241,8 @@ public final class RenderUtil { 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); @@ -337,16 +326,8 @@ 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(); @@ -366,40 +347,28 @@ 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(); @@ -419,40 +388,28 @@ 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(); @@ -472,40 +429,28 @@ 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(); @@ -525,26 +470,22 @@ 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); } } @@ -665,8 +606,8 @@ 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); @@ -696,49 +637,44 @@ 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; 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 @@ -757,14 +693,14 @@ public final class RenderUtil { + (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, @@ -803,12 +739,12 @@ public final class RenderUtil { (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; @@ -828,8 +764,8 @@ public final class RenderUtil { 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); @@ -859,49 +795,44 @@ 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; 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 @@ -920,30 +851,47 @@ public final class RenderUtil { + (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; @@ -963,50 +911,60 @@ 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); + if (renderer.renderMinZ > 0) setupAOBrightnessZNeg( + renderer, + block, + x, + y, + z, + blocksGrassXZPN, + blocksGrassXZNN, + blocksGrassYZPN, + blocksGrassYZNN); setupAOBrightnessZPos( - renderer, block, x, y, z - 1, blocksGrassXZPN, blocksGrassXZNN, blocksGrassYZPN, blocksGrassYZNN); + renderer, + block, + x, + y, + z - 1, + blocksGrassXZPN, + blocksGrassXZNN, + blocksGrassYZPN, + blocksGrassYZNN); 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 @@ -1025,14 +983,14 @@ public final class RenderUtil { + (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, @@ -1071,12 +1029,12 @@ public final class RenderUtil { (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; @@ -1096,50 +1054,60 @@ public final class RenderUtil { 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); + if (renderer.renderMaxZ < 1) setupAOBrightnessZPos( + renderer, + block, + x, + y, + z, + blocksGrassXZPP, + blocksGrassXZNP, + blocksGrassYZPP, + blocksGrassYZNP); setupAOBrightnessZNeg( - renderer, block, x, y, z + 1, blocksGrassXZPP, blocksGrassXZNP, blocksGrassYZPP, blocksGrassYZNP); + renderer, + block, + x, + y, + z + 1, + blocksGrassXZPP, + blocksGrassXZNP, + blocksGrassYZPP, + blocksGrassYZNP); 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 @@ -1158,14 +1126,14 @@ public final class RenderUtil { + (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, @@ -1204,12 +1172,12 @@ public final class RenderUtil { (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; @@ -1229,50 +1197,60 @@ 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); + if (renderer.renderMinX > 0) setupAOBrightnessXNeg( + renderer, + block, + x, + y, + z, + blocksGrassXYNP, + blocksGrassXYNN, + blocksGrassXZNN, + blocksGrassXZNP); setupAOBrightnessXPos( - renderer, block, x - 1, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + renderer, + block, + x - 1, + y, + z, + blocksGrassXYNP, + blocksGrassXYNN, + blocksGrassXZNN, + blocksGrassXZNP); 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) @@ -1291,14 +1269,14 @@ public final class RenderUtil { + (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, @@ -1337,12 +1315,12 @@ public final class RenderUtil { (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; @@ -1362,50 +1340,60 @@ 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); + if (renderer.renderMaxX < 1) setupAOBrightnessXPos( + renderer, + block, + x, + y, + z, + blocksGrassXYNP, + blocksGrassXYNN, + blocksGrassXZNN, + blocksGrassXZNP); setupAOBrightnessXNeg( - renderer, block, x + 1, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + renderer, + block, + x + 1, + y, + z, + blocksGrassXYNP, + blocksGrassXYNN, + blocksGrassXZNN, + blocksGrassXZNP); 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) @@ -1424,14 +1412,14 @@ public final class RenderUtil { + (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, @@ -1470,12 +1458,12 @@ public final class RenderUtil { 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; @@ -1495,8 +1483,8 @@ 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; 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 eff813c..324b006 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 @@ -5,14 +5,16 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; 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; 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 afd5559..5ea5017 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 @@ -1,15 +1,8 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.render.IRenderLabel; -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; -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; @@ -31,24 +24,32 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.common.util.ForgeDirection; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.render.IRenderLabel; +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; +import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; +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; + @SideOnly(Side.CLIENT) 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), - Vec3.createVectorHelper(0, 1, 0), - Vec3.createVectorHelper(0, 0, -1), - Vec3.createVectorHelper(0, 0, 1), - Vec3.createVectorHelper(-1, 0, 0), - Vec3.createVectorHelper(1, 0, 0) - }; + private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation( + "textures/misc/enchanted_item_glint.png"); + + private Vec3[] dirVectors = { Vec3.createVectorHelper(0, -1, 0), Vec3.createVectorHelper(0, 1, 0), + Vec3.createVectorHelper(0, 0, -1), Vec3.createVectorHelper(0, 0, 1), Vec3.createVectorHelper(-1, 0, 0), + Vec3.createVectorHelper(1, 0, 0) }; private RenderItem itemRenderer = new RenderItem() { + private RenderBlocks renderBlocksRi = new RenderBlocks(); @Override @@ -67,19 +68,13 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer { } // The default Mojang code for item render does not handle glinted or multi-pass items gracefully in a non-UI - // setting. This modified implementation will render these items without unsightly Z-fighting. + // 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) { + 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())) { + && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(itemStack.getItem()).getRenderType())) { renderItemIntoGUIBlock(fontRenderer, texManager, itemStack, x, y, renderEffect); return; } @@ -95,8 +90,7 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer { OpenGlHelper.glBlendFunc(770, 771, 1, 0); texManager.bindTexture(loc); - IIcon icon = itemStack.getItem().requiresMultipleRenderPasses() - ? item.getIcon(itemStack, i) + IIcon icon = itemStack.getItem().requiresMultipleRenderPasses() ? item.getIcon(itemStack, i) : itemStack.getIconIndex(); if (icon == null) continue; @@ -156,23 +150,22 @@ 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 + 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); + 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()); @@ -216,17 +209,17 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer { } }; - 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(); @@ -234,14 +227,14 @@ 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(); @@ -272,16 +265,17 @@ 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) + .getLightBrightness(tile.xCoord + side.offsetX, tile.yCoord + side.offsetY, tile.zCoord + side.offsetZ) * 1.25f; if (brightness > 1) brightness = 1; @@ -366,13 +360,8 @@ 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); @@ -394,9 +383,7 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer { double zDepth = 1 / relScale - itemBlock.getBlockBoundsMaxZ(); itemDepth += zDepth * zunit; - } catch (Exception e) { - } - ; + } catch (Exception e) {} ; } switch (tile.getDirection()) { @@ -441,18 +428,12 @@ 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, + private void renderFastItem(ItemStack itemStack, TileEntityDrawers tile, int slot, ForgeDirection side, float depth, float partialTickTime) { boolean skipRenderHook = false; Block itemBlock = Block.getBlockFromItem(itemStack.getItem()); @@ -501,21 +482,17 @@ 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) { - return itemStack.getItemSpriteNumber() == 0 - && itemStack.getItem() instanceof ItemBlock - && RenderBlocks.renderItemIn3d( - Block.getBlockFromItem(itemStack.getItem()).getRenderType()); + return itemStack.getItemSpriteNumber() == 0 && itemStack.getItem() instanceof ItemBlock + && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(itemStack.getItem()).getRenderType()); } private float getXOffset(int drawerCount, int slot) { @@ -562,19 +539,19 @@ public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer { 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) { 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) { 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) { 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 70d946f..f019b40 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 @@ -1,12 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; -import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom; -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 cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; @@ -14,11 +7,23 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; + import org.lwjgl.opengl.GL11; +import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom; +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 cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class TileEntityFramingRenderer extends TileEntitySpecialRenderer { + private RenderItem itemRenderer = new RenderItem() { + @Override public byte getMiniBlockCount(ItemStack stack, byte original) { return 1; @@ -57,8 +62,8 @@ public class TileEntityFramingRenderer extends TileEntitySpecialRenderer { 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)); + ItemStack result = ItemCustomTrim + .makeItemStack(block, 1, tileTable.getStackInSlot(1), tileTable.getStackInSlot(2)); renderSlot(tileTable, x, y, z, result, 2f, 0f, .25f, 0f); } } @@ -68,16 +73,8 @@ 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) { + 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()); @@ -108,8 +105,7 @@ 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 184bbb1..a5f5085 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 @@ -1,32 +1,34 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.block.BlockTrimCustom; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityTrim; -import com.jaquadro.minecraft.storagedrawers.client.renderer.common.CommonTrimRenderer; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.block.BlockTrimCustom; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityTrim; +import com.jaquadro.minecraft.storagedrawers.client.renderer.common.CommonTrimRenderer; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + public class TrimCustomRenderer implements ISimpleBlockRenderingHandler { + private CommonTrimRenderer commonRender = new CommonTrimRenderer(); @Override 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) { + 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; 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 ac81140..66a6eae 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 @@ -1,16 +1,19 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; -import com.jaquadro.minecraft.storagedrawers.block.BlockTrimCustom; -import com.jaquadro.minecraft.storagedrawers.client.renderer.common.CommonTrimRenderer; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; +import com.jaquadro.minecraft.storagedrawers.block.BlockTrimCustom; +import com.jaquadro.minecraft.storagedrawers.client.renderer.common.CommonTrimRenderer; + public class TrimItemRender implements IItemRenderer { + private CommonTrimRenderer commonRender = new CommonTrimRenderer(); @Override 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 b087eae..cd10b0b 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,14 +1,16 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer.common; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom; import com.jaquadro.minecraft.storagedrawers.client.renderer.ModularBoxRenderer; import com.jaquadro.minecraft.storagedrawers.client.renderer.PanelBoxRenderer; import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; import com.jaquadro.minecraft.storagedrawers.util.RenderHelperState; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; public class CommonDrawerRenderer { + private PanelBoxRenderer panelRenderer = new PanelBoxRenderer(); private double depth; @@ -35,7 +37,8 @@ public class CommonDrawerRenderer { renderHelper.state.setRotateTransform(RenderHelper.ZNEG, direction); renderHelper.state.setUVRotation( - RenderHelper.YPOS, RenderHelperState.ROTATION_BY_FACE_FACE[RenderHelper.ZNEG][direction]); + RenderHelper.YPOS, + RenderHelperState.ROTATION_BY_FACE_FACE[RenderHelper.ZNEG][direction]); return renderHelper; } @@ -47,16 +50,8 @@ public class CommonDrawerRenderer { 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); @@ -108,15 +103,8 @@ 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); 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 410b6a9..b031903 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 @@ -1,62 +1,55 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer.common; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import com.jaquadro.minecraft.storagedrawers.block.BlockFramingTable; import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; import com.jaquadro.minecraft.storagedrawers.util.RenderHelperState; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; 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}, - }; + 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 }, }; - private static double[][] trimBoundsLeftZ = new double[][] { - {0, 1 - unit2, 0, unit, 1, 1}, - {unit, 1 - unit2, 0, 1, 1, 1}, - }; + private static double[][] trimBoundsLeftZ = new double[][] { { 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}, - }; + 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 }, }; - 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}, - }; + 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 }, }; - private static double[][] trimBoundsRightZ = new double[][] { - {1 - unit, 1 - unit2, 0, 1, 1, 1}, - {0, 1 - unit2, 0, 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 }, }; - 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}, - }; + 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 }, }; public void renderLeft(IBlockAccess blockAccess, int x, int y, int z, BlockFramingTable block) { renderTableBox( - blockAccess, x, y, z, block, baseBoundsLeftY, trimBoundsLeftY, trimBoundsLeftZ, trimBoundsLeftX, true); + blockAccess, + x, + y, + z, + block, + baseBoundsLeftY, + trimBoundsLeftY, + trimBoundsLeftZ, + trimBoundsLeftX, + true); renderStructure(blockAccess, x, y, z, block, true); } @@ -83,14 +76,8 @@ public class CommonFramingRenderer { 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; @@ -109,16 +96,8 @@ 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, + 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; @@ -151,8 +130,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; @@ -171,8 +150,8 @@ public class CommonFramingRenderer { 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); @@ -188,8 +167,8 @@ public class CommonFramingRenderer { 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; 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 420c28e..ba6f022 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 @@ -1,13 +1,15 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer.common; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import com.jaquadro.minecraft.storagedrawers.block.BlockTrimCustom; import com.jaquadro.minecraft.storagedrawers.client.renderer.ModularBoxRenderer; import com.jaquadro.minecraft.storagedrawers.client.renderer.PanelBoxRenderer; import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; public class CommonTrimRenderer { + private PanelBoxRenderer panelRenderer = new PanelBoxRenderer(); private double trimWidth; 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 8ab3ee1..d805594 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java @@ -1,14 +1,18 @@ 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 cpw.mods.fml.common.Loader; + public class CompTierRegistry { + public class Record { + public ItemStack upper; public ItemStack lower; public int convRate; 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 c2419ad..5bf9ec0 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ConfigManager.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ConfigManager.java @@ -1,20 +1,24 @@ package com.jaquadro.minecraft.storagedrawers.config; +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; + import com.jaquadro.minecraft.storagedrawers.api.config.IAddonConfig; import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig; import com.jaquadro.minecraft.storagedrawers.api.config.IIntegrationConfig; import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig; import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; -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 ConfigSection { + public final ConfigSection parent; public final String name; public final String lang; @@ -50,6 +54,7 @@ public class ConfigManager { } public static class ConfigCache { + public boolean enableIndicatorUpgrades; public boolean enableStorageUpgrades; public boolean enableLockUpgrades; @@ -95,6 +100,7 @@ public class ConfigManager { } private class AddonConfig implements IAddonConfig { + @Override public boolean showAddonItemsNEI() { return cache.addonShowNEI; @@ -112,6 +118,7 @@ public class ConfigManager { } private class BlockConfig implements IBlockConfig { + @Override public String getBlockConfigName(BlockConfiguration blockConfig) { switch (blockConfig) { @@ -155,6 +162,7 @@ public class ConfigManager { } private class IntegrationConfig implements IIntegrationConfig { + @Override public boolean isRefinedRelocationEnabled() { return cache.enableRefinedRelocationIntegration; @@ -172,6 +180,7 @@ public class ConfigManager { } private class UserConfig implements IUserConfig { + @Override public IAddonConfig addonConfig() { return addonConfig; @@ -201,24 +210,51 @@ 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(); @@ -245,258 +281,173 @@ public class ConfigManager { public void syncConfig() { cache.enableIndicatorUpgrades = config.get(Configuration.CATEGORY_GENERAL, "enableIndicatorUpgrades", true) - .setLanguageKey(LANG_PREFIX + "prop.enableIndicatorUpgrades") - .setRequiresMcRestart(true) - .getBoolean(); + .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(); + .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(); + .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(); + .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(); + .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(); + .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(); + .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(); + .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(); + .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(); + .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(); + .setLanguageKey(LANG_PREFIX + "prop.renderStorageUpgrades").getBoolean(); cache.creativeTabVanillaWoods = config.get(Configuration.CATEGORY_GENERAL, "creativeTabVanillaWoods", true) - .setLanguageKey(LANG_PREFIX + "prop.creativeTabVanillaWoods") - .getBoolean(); + .setLanguageKey(LANG_PREFIX + "prop.creativeTabVanillaWoods").getBoolean(); cache.enableDrawerUI = config.get(Configuration.CATEGORY_GENERAL, "enableDrawerUI", true) - .setLanguageKey(LANG_PREFIX + "prop.enableDrawerUI") - .getBoolean(); + .setLanguageKey(LANG_PREFIX + "prop.enableDrawerUI").getBoolean(); cache.enableSidedInput = config.get(Configuration.CATEGORY_GENERAL, "enableSidedInput", true) - .setLanguageKey(LANG_PREFIX + "prop.enableSidedInput") - .getBoolean(); + .setLanguageKey(LANG_PREFIX + "prop.enableSidedInput").getBoolean(); cache.enableSidedOutput = config.get(Configuration.CATEGORY_GENERAL, "enableSidedOutput", true) - .setLanguageKey(LANG_PREFIX + "prop.enableSidedOutput") - .getBoolean(); + .setLanguageKey(LANG_PREFIX + "prop.enableSidedOutput").getBoolean(); cache.enableItemConversion = config.get(Configuration.CATEGORY_GENERAL, "enableItemConversion", true) - .setLanguageKey(LANG_PREFIX + "prop.enableItemConversion") - .getBoolean(); + .setLanguageKey(LANG_PREFIX + "prop.enableItemConversion").getBoolean(); cache.enableFallbackRecipes = config.get(Configuration.CATEGORY_GENERAL, "enableFallbackRecipes", true) - .setLanguageKey(LANG_PREFIX + "prop.enableFallbackRecipes") - .setRequiresMcRestart(true) - .getBoolean(); + .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"); + .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(); + 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.breakDrawerDropMode = 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.breakDrawerDropMode = config + .get( Configuration.CATEGORY_GENERAL, "breakDrawerDropMode", "merge", "Select: default, merge, destroy and cluster. ", - new String[] {"default", "destroy", "merge", "cluster"}) - .setLanguageKey(LANG_PREFIX + "prop.breakDrawerDropMode") - .getString(); + new String[] { "default", "destroy", "merge", "cluster" }) + .setLanguageKey(LANG_PREFIX + "prop.breakDrawerDropMode").getString(); cache.enableAE2Integration = config.get(sectionIntegration.getQualifiedName(), "enableAE2", true) - .setLanguageKey(LANG_PREFIX + "integration.enableAE2") - .setRequiresMcRestart(true) - .getBoolean(); + .setLanguageKey(LANG_PREFIX + "integration.enableAE2").setRequiresMcRestart(true).getBoolean(); cache.enableWailaIntegration = config.get(sectionIntegration.getQualifiedName(), "enableWaila", true) - .setLanguageKey(LANG_PREFIX + "integration.enableWaila") - .setRequiresMcRestart(true) - .getBoolean(); + .setLanguageKey(LANG_PREFIX + "integration.enableWaila").setRequiresMcRestart(true).getBoolean(); cache.enableThaumcraftIntegration = config.get(sectionIntegration.getQualifiedName(), "enableThaumcraft", true) - .setLanguageKey(LANG_PREFIX + "integration.enableThaumcraft") - .setRequiresMcRestart(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.enableMineTweakerIntegration = config.get( - sectionIntegration.getQualifiedName(), "enableMineTweaker", true) - .setLanguageKey(LANG_PREFIX + "integration.enableMineTweaker") - .setRequiresMcRestart(true) + cache.enableThermalExpansionIntegration = config + .get(sectionIntegration.getQualifiedName(), "enableThermalExpansion", true) + .setLanguageKey(LANG_PREFIX + "integration.enableThermalExpansion").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) + 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(); + .setLanguageKey(LANG_PREFIX + "integration.enableChisel").setRequiresMcRestart(true).getBoolean(); cache.enableGTNHIntegration = config.get(sectionIntegration.getQualifiedName(), "enableGTNH", true) - .setLanguageKey(LANG_PREFIX + "integration.enableGTNH") - .setRequiresMcRestart(true) - .getBoolean(); + .setLanguageKey(LANG_PREFIX + "integration.enableGTNH").setRequiresMcRestart(true).getBoolean(); config.get(sectionBlocksFullDrawers1x1.getQualifiedName(), "enabled", true) - .setLanguageKey(LANG_PREFIX + "prop.enabled") - .setRequiresMcRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); config.get(sectionBlocksFullDrawers1x1.getQualifiedName(), "baseStorage", 32) - .setLanguageKey(LANG_PREFIX + "prop.baseStorage") - .setRequiresWorldRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.baseStorage").setRequiresWorldRestart(true); config.get(sectionBlocksFullDrawers1x1.getQualifiedName(), "recipeOutput", 1) - .setLanguageKey(LANG_PREFIX + "prop.recipeOutput") - .setRequiresMcRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); config.get(sectionBlocksFullDrawers1x2.getQualifiedName(), "enabled", true) - .setLanguageKey(LANG_PREFIX + "prop.enabled") - .setRequiresMcRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); config.get(sectionBlocksFullDrawers1x2.getQualifiedName(), "baseStorage", 16) - .setLanguageKey(LANG_PREFIX + "prop.baseStorage") - .setRequiresWorldRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.baseStorage").setRequiresWorldRestart(true); config.get(sectionBlocksFullDrawers1x2.getQualifiedName(), "recipeOutput", 2) - .setLanguageKey(LANG_PREFIX + "prop.recipeOutput") - .setRequiresMcRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); config.get(sectionBlocksFullDrawers2x2.getQualifiedName(), "enabled", true) - .setLanguageKey(LANG_PREFIX + "prop.enabled") - .setRequiresMcRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); config.get(sectionBlocksFullDrawers2x2.getQualifiedName(), "baseStorage", 8) - .setLanguageKey(LANG_PREFIX + "prop.baseStorage") - .setRequiresWorldRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.baseStorage").setRequiresWorldRestart(true); config.get(sectionBlocksFullDrawers2x2.getQualifiedName(), "recipeOutput", 4) - .setLanguageKey(LANG_PREFIX + "prop.recipeOutput") - .setRequiresMcRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); config.get(sectionBlocksHalfDrawers1x2.getQualifiedName(), "enabled", true) - .setLanguageKey(LANG_PREFIX + "prop.enabled") - .setRequiresMcRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); config.get(sectionBlocksHalfDrawers1x2.getQualifiedName(), "baseStorage", 8) - .setLanguageKey(LANG_PREFIX + "prop.baseStorage") - .setRequiresWorldRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.baseStorage").setRequiresWorldRestart(true); config.get(sectionBlocksHalfDrawers1x2.getQualifiedName(), "recipeOutput", 2) - .setLanguageKey(LANG_PREFIX + "prop.recipeOutput") - .setRequiresMcRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); config.get(sectionBlocksHalfDrawers2x2.getQualifiedName(), "enabled", true) - .setLanguageKey(LANG_PREFIX + "prop.enabled") - .setRequiresMcRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); config.get(sectionBlocksHalfDrawers2x2.getQualifiedName(), "baseStorage", 4) - .setLanguageKey(LANG_PREFIX + "prop.baseStorage") - .setRequiresWorldRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.baseStorage").setRequiresWorldRestart(true); config.get(sectionBlocksHalfDrawers2x2.getQualifiedName(), "recipeOutput", 4) - .setLanguageKey(LANG_PREFIX + "prop.recipeOutput") - .setRequiresMcRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); config.get(sectionBlocksCompDrawers.getQualifiedName(), "enabled", true) - .setLanguageKey(LANG_PREFIX + "prop.enabled") - .setRequiresMcRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.enabled").setRequiresMcRestart(true); config.get(sectionBlocksCompDrawers.getQualifiedName(), "baseStorage", 16) - .setLanguageKey(LANG_PREFIX + "prop.baseStorage") - .setRequiresWorldRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.baseStorage").setRequiresWorldRestart(true); config.get(sectionBlocksCompDrawers.getQualifiedName(), "recipeOutput", 1) - .setLanguageKey(LANG_PREFIX + "prop.recipeOutput") - .setRequiresMcRestart(true); + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); config.get(sectionBlocksController.getQualifiedName(), "enabled", true) - .setLanguageKey(LANG_PREFIX + "prop.enabled") - .setRequiresMcRestart(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") + 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); + .setLanguageKey(LANG_PREFIX + "prop.recipeOutput").setRequiresMcRestart(true); - config.get(sectionBlocksSlave.getQualifiedName(), "enabled", true) - .setLanguageKey(LANG_PREFIX + "prop.enabled") + 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(); + .setLanguageKey(LANG_PREFIX + "upgrades.level2Mult").setRequiresWorldRestart(true).getInt(); cache.level3Mult = config.get(sectionUpgrades.getQualifiedName(), "level3Mult", 3) - .setLanguageKey(LANG_PREFIX + "upgrades.level3Mult") - .setRequiresWorldRestart(true) - .getInt(); + .setLanguageKey(LANG_PREFIX + "upgrades.level3Mult").setRequiresWorldRestart(true).getInt(); cache.level4Mult = config.get(sectionUpgrades.getQualifiedName(), "level4Mult", 5) - .setLanguageKey(LANG_PREFIX + "upgrades.level4Mult") - .setRequiresWorldRestart(true) - .getInt(); + .setLanguageKey(LANG_PREFIX + "upgrades.level4Mult").setRequiresWorldRestart(true).getInt(); cache.level5Mult = config.get(sectionUpgrades.getQualifiedName(), "level5Mult", 8) - .setLanguageKey(LANG_PREFIX + "upgrades.level5Mult") - .setRequiresWorldRestart(true) - .getInt(); + .setLanguageKey(LANG_PREFIX + "upgrades.level5Mult").setRequiresWorldRestart(true).getInt(); cache.level6Mult = config.get(sectionUpgrades.getQualifiedName(), "level6Mult", 13) - .setLanguageKey(LANG_PREFIX + "upgrades.level6Mult") - .setRequiresWorldRestart(true) - .getInt(); + .setLanguageKey(LANG_PREFIX + "upgrades.level6Mult").setRequiresWorldRestart(true).getInt(); cache.addonShowNEI = config.get(sectionAddons.getQualifiedName(), "showBlocksInNEI", true) - .setLanguageKey(LANG_PREFIX + "addons.showNEI") - .setRequiresWorldRestart(true) - .getBoolean(); + .setLanguageKey(LANG_PREFIX + "addons.showNEI").setRequiresWorldRestart(true).getBoolean(); cache.addonShowVanilla = config.get(sectionAddons.getQualifiedName(), "showBlocksInCreative", true) - .setLanguageKey(LANG_PREFIX + "addons.showCreative") - .setRequiresWorldRestart(true) - .getBoolean(); + .setLanguageKey(LANG_PREFIX + "addons.showCreative").setRequiresWorldRestart(true).getBoolean(); cache.addonSeparateVanilla = config.get(sectionAddons.getQualifiedName(), "useSeparateCreativeTabs", true) - .setLanguageKey(LANG_PREFIX + "addons.separateTabs") - .setRequiresMcRestart(true) - .getBoolean(); + .setLanguageKey(LANG_PREFIX + "addons.separateTabs").setRequiresMcRestart(true).getBoolean(); getControllerRange(); getControllerMaxDrawers(); 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 98807df..c7451e1 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ModConfigGui.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/ModConfigGui.java @@ -1,14 +1,18 @@ 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 com.jaquadro.minecraft.storagedrawers.StorageDrawers; + +import cpw.mods.fml.client.config.GuiConfig; +import cpw.mods.fml.client.config.IConfigElement; + public class ModConfigGui extends GuiConfig { + public ModConfigGui(GuiScreen parent) { super(parent, getConfigElements(), StorageDrawers.MOD_ID, false, false, "Storage Drawers Configuration"); } 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 88ef36b..04c7dee 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/OreDictRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/OreDictRegistry.java @@ -1,16 +1,19 @@ package com.jaquadro.minecraft.storagedrawers.config; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry; 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; +import cpw.mods.fml.common.registry.GameData; +import cpw.mods.fml.common.registry.GameRegistry; + public class OreDictRegistry { + private Set blacklist = new HashSet(); private Set whitelist = new HashSet(); private List blacklistPrefix = new ArrayList(); @@ -53,26 +56,9 @@ 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); 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 22415e1..1bfa205 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/RecipeHandlerRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/RecipeHandlerRegistry.java @@ -1,18 +1,21 @@ 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 com.jaquadro.minecraft.storagedrawers.api.registry.IIngredientHandler; +import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandler; +import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandlerRegistry; + public class RecipeHandlerRegistry implements IRecipeHandlerRegistry { + private Map recipeRegistry = new HashMap(); private Map ingredientRegistry = new HashMap(); @@ -60,6 +63,7 @@ public class RecipeHandlerRegistry implements IRecipeHandlerRegistry { } private static class ShapedOreRecipeHandler implements IRecipeHandler { + @Override public Object[] getInputAsArray(IRecipe recipe) { return ((ShapedOreRecipe) recipe).getInput(); @@ -72,6 +76,7 @@ public class RecipeHandlerRegistry implements IRecipeHandlerRegistry { } private static class ShapedRecipeHandler implements IRecipeHandler { + @Override public Object[] getInputAsArray(IRecipe recipe) { return ((ShapedRecipes) recipe).recipeItems; @@ -84,6 +89,7 @@ public class RecipeHandlerRegistry implements IRecipeHandlerRegistry { } private static class ShapelessOreRecipeHandler implements IRecipeHandler { + @Override public Object[] getInputAsArray(IRecipe recipe) { return null; @@ -96,6 +102,7 @@ public class RecipeHandlerRegistry implements IRecipeHandlerRegistry { } private static class ShapelessRecipeHandler implements IRecipeHandler { + @Override public Object[] getInputAsArray(IRecipe recipe) { return null; 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 d9e2312..2e03d88 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/RenderRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/RenderRegistry.java @@ -1,11 +1,13 @@ 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; +import com.jaquadro.minecraft.storagedrawers.api.registry.IRenderRegistry; +import com.jaquadro.minecraft.storagedrawers.api.render.IRenderLabel; + public class RenderRegistry implements IRenderRegistry { + private List registry = new ArrayList(); @Override 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 400f5a8..f08ef8c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/config/WailaRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/config/WailaRegistry.java @@ -1,11 +1,13 @@ 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; +import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaRegistry; +import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaTooltipHandler; + public class WailaRegistry implements IWailaRegistry { + private List registry = new ArrayList(); @Override 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 6c0fd27..702be66 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/Api.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/Api.java @@ -13,6 +13,7 @@ import com.jaquadro.minecraft.storagedrawers.core.api.PackRecipes; import com.jaquadro.minecraft.storagedrawers.integration.ThermalExpansion; public class Api implements IStorageDrawersApi { + public static IStorageDrawersApi instance; private PackFactory packFactory = new PackFactory(); 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 c9b6983..273c3c1 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ClientProxy.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ClientProxy.java @@ -1,16 +1,19 @@ package com.jaquadro.minecraft.storagedrawers.core; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraftforge.client.MinecraftForgeClient; + import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersComp; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityFramingTable; import com.jaquadro.minecraft.storagedrawers.client.renderer.*; + import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraftforge.client.MinecraftForgeClient; public class ClientProxy extends CommonProxy { + public static int renderPass = 0; private DrawersItemRenderer itemRenderer = new DrawersItemRenderer(); private TrimItemRender trimItemRenderer = new TrimItemRender(); 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 ecee590..0bfc46d 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/CommonProxy.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/CommonProxy.java @@ -5,6 +5,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; public class CommonProxy { + public int drawersRenderID = -1; public int controllerRenderID = -1; public int drawersCustomRenderID = -1; 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 36eadd7..540b683 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java @@ -1,11 +1,13 @@ package com.jaquadro.minecraft.storagedrawers.core; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + public class ForgeEventHandler { + @SubscribeEvent public void playerInteracts(PlayerInteractEvent event) { if (event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK 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 454045d..2d40e1a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModBlocks.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModBlocks.java @@ -1,17 +1,20 @@ package com.jaquadro.minecraft.storagedrawers.core; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.block.*; import com.jaquadro.minecraft.storagedrawers.block.tile.*; import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import com.jaquadro.minecraft.storagedrawers.item.*; + import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; public class ModBlocks { + public static DataResolver resolver; public static BlockDrawers fullDrawers1; @@ -105,13 +108,19 @@ public class ModBlocks { getQualifiedName(halfDrawers4)); GameRegistry.registerTileEntityWithAlternatives( - TileEntityDrawersComp.class, getQualifiedName("tileDrawersComp"), getQualifiedName(compDrawers)); + TileEntityDrawersComp.class, + getQualifiedName("tileDrawersComp"), + getQualifiedName(compDrawers)); GameRegistry.registerTileEntityWithAlternatives( - TileEntityController.class, getQualifiedName("tileController"), getQualifiedName(controller)); + TileEntityController.class, + getQualifiedName("tileController"), + getQualifiedName(controller)); GameRegistry.registerTileEntityWithAlternatives( - TileEntitySlave.class, getQualifiedName("tileControllerSlave"), getQualifiedName(controllerSlave)); + TileEntitySlave.class, + getQualifiedName("tileControllerSlave"), + getQualifiedName(controllerSlave)); GameRegistry.registerTileEntity(TileEntityFramingTable.class, getQualifiedName("framingTable")); @@ -130,15 +139,15 @@ 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(); 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 1f71a07..d1945b2 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModCreativeTabs.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModCreativeTabs.java @@ -1,17 +1,21 @@ package com.jaquadro.minecraft.storagedrawers.core; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public final class ModCreativeTabs { + private ModCreativeTabs() {} public static final CreativeTabs tabStorageDrawers = new CreativeTabs("storageDrawers") { + @Override @SideOnly(Side.CLIENT) public Item getTabIconItem() { 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 98489b5..d082349 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModGuiFactory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModGuiFactory.java @@ -1,12 +1,15 @@ 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 com.jaquadro.minecraft.storagedrawers.config.ModConfigGui; +import cpw.mods.fml.client.IModGuiFactory; + public class ModGuiFactory implements IModGuiFactory { + @Override public void initialize(Minecraft minecraftInstance) {} 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 a2af9fe..9079d44 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModItems.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModItems.java @@ -1,11 +1,13 @@ package com.jaquadro.minecraft.storagedrawers.core; +import net.minecraft.item.Item; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.item.*; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.item.Item; public class ModItems { + public static Item upgradeTemplate; public static ItemUpgrade upgrade; public static ItemUpgradeStatus upgradeStatus; @@ -19,8 +21,7 @@ public class ModItems { public static ItemUpgradeDowngrade upgradeDowngrade; public void init() { - upgradeTemplate = new Item() - .setUnlocalizedName(makeName("upgradeTemplate")) + upgradeTemplate = new Item().setUnlocalizedName(makeName("upgradeTemplate")) .setTextureName(StorageDrawers.MOD_ID + ":upgrade_template") .setCreativeTab(ModCreativeTabs.tabStorageDrawers); upgrade = new ItemUpgrade(makeName("upgrade")); 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 fa3a50c..7230b87 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java @@ -2,11 +2,6 @@ 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; -import com.jaquadro.minecraft.storagedrawers.integration.GTNHIntegrationModule; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.BlockWood; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -16,6 +11,12 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.ShapedOreRecipe; +import com.jaquadro.minecraft.storagedrawers.core.recipe.FallbackShapedOreRecipe; +import com.jaquadro.minecraft.storagedrawers.core.recipe.TemplateRecipe; +import com.jaquadro.minecraft.storagedrawers.integration.ChiselIntegrationModule; +import com.jaquadro.minecraft.storagedrawers.integration.GTNHIntegrationModule; +import cpw.mods.fml.common.registry.GameRegistry; + public class ModRecipes { public void init() { @@ -29,341 +30,355 @@ public class ModRecipes { "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), + 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")); + 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")); + 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")); + 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")); + 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")); + 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))); + } + } + } + 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', - new ItemStack(Blocks.planks, 1, i), + "plankWood", 'y', "chestWood")); - if (config.isBlockEnabled("fulldrawers2")) - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(ModBlocks.fullDrawers2, config.getBlockRecipeOutput("fulldrawers2"), i), + if (config.isBlockEnabled("fulldrawers2")) GameRegistry.addRecipe( + new FallbackShapedOreRecipe( + new ItemStack(ModBlocks.fullDrawers2, config.getBlockRecipeOutput("fulldrawers2"), 0), "xyx", "xxx", "xyx", 'x', - new ItemStack(Blocks.planks, 1, i), + "plankWood", 'y', "chestWood")); - if (config.isBlockEnabled("halfdrawers2")) - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(ModBlocks.halfDrawers2, config.getBlockRecipeOutput("halfdrawers2"), i), + if (config.isBlockEnabled("halfdrawers2")) GameRegistry.addRecipe( + new FallbackShapedOreRecipe( + new ItemStack(ModBlocks.halfDrawers2, config.getBlockRecipeOutput("halfdrawers2"), 0), "xyx", "xxx", "xyx", 'x', - new ItemStack(Blocks.wooden_slab, 1, i), + "slabWood", 'y', "chestWood")); - if (config.isBlockEnabled("fulldrawers4")) - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(ModBlocks.fullDrawers4, config.getBlockRecipeOutput("fulldrawers4"), i), + if (config.isBlockEnabled("fulldrawers4")) GameRegistry.addRecipe( + new FallbackShapedOreRecipe( + new ItemStack(ModBlocks.fullDrawers4, config.getBlockRecipeOutput("fulldrawers4"), 0), "yxy", "xxx", "yxy", 'x', - new ItemStack(Blocks.planks, 1, i), + "plankWood", 'y', "chestWood")); - if (config.isBlockEnabled("halfdrawers4")) - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(ModBlocks.halfDrawers4, config.getBlockRecipeOutput("halfdrawers4"), i), + if (config.isBlockEnabled("halfdrawers4")) GameRegistry.addRecipe( + new FallbackShapedOreRecipe( + new ItemStack(ModBlocks.halfDrawers4, config.getBlockRecipeOutput("halfdrawers4"), 0), "yxy", "xxx", "yxy", 'x', - new ItemStack(Blocks.wooden_slab, 1, i), + "slabWood", 'y', "chestWood")); - if (config.isBlockEnabled("trim")) { - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(ModBlocks.trim, config.getBlockRecipeOutput("trim"), i), + if (config.isBlockEnabled("trim")) GameRegistry.addRecipe( + new FallbackShapedOreRecipe( + new ItemStack(ModBlocks.trim, config.getBlockRecipeOutput("trim"), 0), "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")); - if (config.isBlockEnabled("fulldrawers2")) - 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")); - if (config.isBlockEnabled("fulldrawers4")) - 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")); - if (config.isBlockEnabled("trim")) - GameRegistry.addRecipe(new FallbackShapedOreRecipe( - new ItemStack(ModBlocks.trim, config.getBlockRecipeOutput("trim"), 0), - "xyx", - "yyy", - "xyx", - 'x', - "stickWood", - 'y', - "plankWood")); + "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")); + 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")); - 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")); + 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")); - 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")); + 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(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx", - // 'x', "stickWood", 'y', "drawerBasic")); + // '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) { @@ -375,81 +390,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); - if (config.isBlockEnabled("fulldrawers1")) - 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")); - 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")); - 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")); - 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")); - if (config.isBlockEnabled("trim")) - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(ModBlocks.trimCustom, config.getBlockRecipeOutput("trim"), 0), - "yxy", - "xyx", - "yxy", - 'x', - "stickWood", - 'y', - "plankWood")); + if (config.isBlockEnabled("fulldrawers1")) 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")); + 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")); + 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")); + 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")); + if (config.isBlockEnabled("trim")) GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(ModBlocks.trimCustom, config.getBlockRecipeOutput("trim"), 0), + "yxy", + "xyx", + "yxy", + 'x', + "stickWood", + 'y', + "plankWood")); } RecipeSorter.register( 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 dbbb6cd..fc60c77 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 @@ -1,18 +1,19 @@ package com.jaquadro.minecraft.storagedrawers.core.api; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.block.Block; + 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 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>(); + + private Map> registry = new HashMap>(); + private Map> invertRegistry = new HashMap>(); public void register(BlockConfiguration config, IExtendedDataResolver resolver) { for (int i = 0; i < 16; i++) { @@ -29,7 +30,8 @@ public class BlockRegistry { } uniq.register( - UniqueMetaIdentifier.createFor(plankBlock, plankMeta), UniqueMetaIdentifier.createFor(block, meta)); + UniqueMetaIdentifier.createFor(plankBlock, plankMeta), + UniqueMetaIdentifier.createFor(block, meta)); UniqueMetaRegistry blockReg = invertRegistry.get(config); if (blockReg == null) { @@ -38,7 +40,8 @@ public class BlockRegistry { } blockReg.register( - UniqueMetaIdentifier.createFor(block, meta), UniqueMetaIdentifier.createFor(plankBlock, plankMeta)); + UniqueMetaIdentifier.createFor(block, meta), + UniqueMetaIdentifier.createFor(plankBlock, plankMeta)); } public Block getBlock(BlockConfiguration config, Block plankBlock, int plankMeta) { @@ -57,11 +60,8 @@ public class BlockRegistry { 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; @@ -71,11 +71,8 @@ public class BlockRegistry { 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; 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 31af821..70d333b 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 @@ -1,5 +1,9 @@ package com.jaquadro.minecraft.storagedrawers.core.api; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; import com.jaquadro.minecraft.storagedrawers.api.pack.IExtendedDataResolver; @@ -18,13 +22,12 @@ import com.jaquadro.minecraft.storagedrawers.item.pack.ItemDrawersPack; import com.jaquadro.minecraft.storagedrawers.item.pack.ItemSortingDrawersPack; import com.jaquadro.minecraft.storagedrawers.item.pack.ItemSortingTrimPack; import com.jaquadro.minecraft.storagedrawers.item.pack.ItemTrimPack; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; public class PackFactory implements IPackBlockFactory { + @Override public Block createBlock(BlockConfiguration blockConfig, IPackDataResolver dataResolver) { switch (blockConfig.getBlockType()) { @@ -32,10 +35,10 @@ public class PackFactory implements IPackBlockFactory { 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)); + if (IntegrationRegistry.instance().isModLoaded("RefinedRelocation")) return new BlockSortingDrawersPack( + dataResolver, + blockConfig.getDrawerCount(), + blockConfig.isHalfDepth()).setConfigName(getConfigName(blockConfig)); return null; case Trim: return new BlockTrimPack(dataResolver); 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 b28c90d..9ef4372 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 @@ -2,20 +2,23 @@ package com.jaquadro.minecraft.storagedrawers.core.api; import static com.jaquadro.minecraft.storagedrawers.StorageDrawers.*; +import net.minecraft.block.Block; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig; import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; import com.jaquadro.minecraft.storagedrawers.api.pack.IExtendedDataResolver; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.ShapedOreRecipe; public class PackRecipes { + public static void registerStandardRecipes(IExtendedDataResolver resolver) { IStorageDrawersApi api = StorageDrawersApi.instance(); if (api == null) return; @@ -47,82 +50,84 @@ public class PackRecipes { int slabMeta = resolver.getSlabMeta(i); 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")); - if (slab != null) { - if (StorageDrawers.config.cache.enableGTNHIntegration) { - GameRegistry.addRecipe(new ShapedOreRecipe( + if (plank != null) GameRegistry.addRecipe( + new ShapedOreRecipe( new ItemStack(basicFull1, blockConfig.getBlockRecipeOutput(nameFull1), i), - new String[] {"xxx", "xyx", "xxx"}, + "xxx", + " y ", + "xxx", 'x', - new ItemStack(slab, 1, slabMeta), + 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")); } } } - 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")); - 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")); + 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")); + 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")); 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")); - 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")); + 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")); + 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")); } } } @@ -133,7 +138,8 @@ public class PackRecipes { if (api == null) return; if (!Loader.isModLoaded("RefinedRelocation") - || !api.userConfig().integrationConfig().isRefinedRelocationEnabled()) return; + || !api.userConfig().integrationConfig().isRefinedRelocationEnabled()) + return; IBlockConfig blockConfig = api.userConfig().blockConfig(); 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 a054917..c9863b4 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 @@ -1,17 +1,19 @@ package com.jaquadro.minecraft.storagedrawers.core.handlers; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityFramingTable; import com.jaquadro.minecraft.storagedrawers.client.gui.GuiDrawers; import com.jaquadro.minecraft.storagedrawers.client.gui.GuiFraming; import com.jaquadro.minecraft.storagedrawers.inventory.*; import cpw.mods.fml.common.network.IGuiHandler; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public class GuiHandler implements IGuiHandler { + public static int drawersGuiID = 0; public static int framingGuiID = 1; 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 ac80d78..3a443f7 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 @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; public class FallbackShapedOreRecipe extends ShapedOreRecipe { + public FallbackShapedOreRecipe(Block 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 eadef77..ba62459 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 @@ -1,15 +1,18 @@ 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 com.jaquadro.minecraft.storagedrawers.core.ModItems; +import com.jaquadro.minecraft.storagedrawers.item.ItemDrawers; + public class TemplateRecipe implements IRecipe { + @Override public boolean matches(InventoryCrafting inventory, World world) { return getCraftingResult(inventory) != null; 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 0c78c7b..677a7ae 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java @@ -1,17 +1,21 @@ package com.jaquadro.minecraft.storagedrawers.integration; +import java.lang.reflect.Constructor; + import appeng.api.AEApi; import appeng.api.networking.security.BaseActionSource; import appeng.api.recipes.IIngredient; import appeng.api.storage.IMEInventory; 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 { + private Class classInventoryAdaptor; private Class classMEAdaptor; private Class classMonitor; @@ -35,8 +39,8 @@ public class AppliedEnergistics extends IntegrationModule { } @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); @@ -51,8 +55,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; } } @@ -71,9 +75,8 @@ public class AppliedEnergistics extends IntegrationModule { StorageDrawers.recipeHandlerRegistry.registerRecipeHandler(shapedHandler.getRecipeClass(), shapedHandler); ShapelessRecipeHandler shapelessHandler = new ShapelessRecipeHandler(); - if (shapelessHandler.isValid()) - StorageDrawers.recipeHandlerRegistry.registerRecipeHandler( - shapelessHandler.getRecipeClass(), shapelessHandler); + if (shapelessHandler.isValid()) StorageDrawers.recipeHandlerRegistry + .registerRecipeHandler(shapelessHandler.getRecipeClass(), shapelessHandler); StorageDrawers.recipeHandlerRegistry.registerIngredientHandler(IIngredient.class, new IngredientHandler()); @@ -85,9 +88,7 @@ public class AppliedEnergistics extends IntegrationModule { @Override public void postInit() { - AEApi.instance() - .registries() - .externalStorage() + 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 2ca797e..ca0d38b 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ChiselIntegrationModule.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ChiselIntegrationModule.java @@ -1,5 +1,8 @@ package com.jaquadro.minecraft.storagedrawers.integration; +import net.minecraft.block.Block; +import net.minecraft.block.BlockWood; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.pack.IPackDataResolver; import com.jaquadro.minecraft.storagedrawers.block.pack.BlockDrawersPack; @@ -8,19 +11,18 @@ import com.jaquadro.minecraft.storagedrawers.block.pack.BlockSortingTrimPack; import com.jaquadro.minecraft.storagedrawers.block.pack.BlockTrimPack; import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import com.jaquadro.minecraft.storagedrawers.core.ModBlocks; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.block.BlockWood; 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; 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 85644ba..7efc1c9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/GTNHIntegrationModule.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/GTNHIntegrationModule.java @@ -6,8 +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; 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 49725b1..0e9453c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/IntegrationModule.java @@ -1,14 +1,16 @@ package com.jaquadro.minecraft.storagedrawers.integration; +import java.util.List; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; 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 boolean versionCheck() { 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 1c255e5..3201b7a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java @@ -1,13 +1,17 @@ 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 java.util.ArrayList; import java.util.List; + import org.apache.logging.log4j.Level; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; + +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.Loader; + public class IntegrationRegistry { + private static IntegrationRegistry instance; private List registry; @@ -61,8 +65,7 @@ public class IntegrationRegistry { FMLLog.log( StorageDrawers.MOD_ID, Level.INFO, - "Could not load integration module: " - + module.getClass().getName()); + "Could not load integration module: " + module.getClass().getName()); } } } 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 8e64703..7e70e9f 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java @@ -1,11 +1,13 @@ package com.jaquadro.minecraft.storagedrawers.integration; +import minetweaker.MineTweakerAPI; + import com.jaquadro.minecraft.storagedrawers.integration.minetweaker.Compaction; import com.jaquadro.minecraft.storagedrawers.integration.minetweaker.OreDictionaryBlacklist; import com.jaquadro.minecraft.storagedrawers.integration.minetweaker.OreDictionaryWhitelist; -import minetweaker.MineTweakerAPI; public class MineTweaker extends IntegrationModule { + @Override public String getModID() { return "MineTweaker3"; 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 3cf8fa1..82da7c9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/NotEnoughItems.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/NotEnoughItems.java @@ -1,9 +1,11 @@ package com.jaquadro.minecraft.storagedrawers.integration; import java.lang.reflect.Field; + import net.minecraft.client.renderer.entity.RenderItem; public class NotEnoughItems extends IntegrationModule { + private static final String MOD_ID = "NotEnoughItems"; boolean loaded; 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 553da55..e6f9835 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/RefinedRelocation.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/RefinedRelocation.java @@ -1,14 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.integration; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; -import com.jaquadro.minecraft.storagedrawers.core.ModBlocks; -import com.jaquadro.minecraft.storagedrawers.core.ModItems; -import com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation.*; -import com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation.ItemUpgradeSorting; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockWood; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; @@ -16,7 +7,19 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; +import com.jaquadro.minecraft.storagedrawers.core.ModBlocks; +import com.jaquadro.minecraft.storagedrawers.core.ModItems; +import com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation.*; +import com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation.ItemUpgradeSorting; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class RefinedRelocation extends IntegrationModule { + public static BlockSortingDrawers fullDrawers1; public static BlockSortingDrawers fullDrawers2; public static BlockSortingDrawers fullDrawers4; @@ -28,6 +31,7 @@ public class RefinedRelocation extends IntegrationModule { public static ItemUpgradeSorting upgradeSorting; public static final CreativeTabs tabStorageDrawers = new CreativeTabs("storageDrawersSorting") { + @Override @SideOnly(Side.CLIENT) public Item getTabIconItem() { @@ -105,7 +109,9 @@ public class RefinedRelocation extends IntegrationModule { ModBlocks.getQualifiedName(compDrawers)); GameRegistry.registerTileEntityWithAlternatives( - TileSortingTrim.class, ModBlocks.getQualifiedName("tileSortingTrim"), ModBlocks.getQualifiedName(trim)); + TileSortingTrim.class, + ModBlocks.getQualifiedName("tileSortingTrim"), + ModBlocks.getQualifiedName(trim)); } @Override @@ -113,89 +119,81 @@ public class RefinedRelocation extends IntegrationModule { 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)); - 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)); - 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)); - 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)); - 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)); - 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)); - } - - if (config.isBlockEnabled("compdrawers")) - GameRegistry.addRecipe( - new ItemStack(compDrawers, 1), + if (config.isBlockEnabled("fulldrawers1")) GameRegistry.addRecipe( + new ItemStack(fullDrawers1, 1, i), "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', + 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, - 'z', - ModItems.upgradeTemplate); + '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)); + 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)); + 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)); + 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)); + } + + 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)); + + if (config.cache.enableSortingUpgrades) GameRegistry.addRecipe( + new ItemStack(upgradeSorting), + "y y", + " z ", + "y y", + 'y', + Items.gold_nugget, + 'z', + ModItems.upgradeTemplate); } private static Item getTabItem() { 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 5f0829c..89e0d91 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java @@ -1,13 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.integration; -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import com.jaquadro.minecraft.storagedrawers.api.event.DrawerPopulatedEvent; -import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaTooltipHandler; -import com.jaquadro.minecraft.storagedrawers.api.render.IRenderLabel; -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.renderer.OpenGlHelper; @@ -21,12 +13,25 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.Constants; + import org.lwjgl.opengl.GL11; + import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; +import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; +import com.jaquadro.minecraft.storagedrawers.api.event.DrawerPopulatedEvent; +import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaTooltipHandler; +import com.jaquadro.minecraft.storagedrawers.api.render.IRenderLabel; +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; + public class Thaumcraft extends IntegrationModule { + private Item[] aspectItems; @Override @@ -38,14 +43,11 @@ public class Thaumcraft extends IntegrationModule { public void init() throws Throwable { MinecraftForge.EVENT_BUS.register(this); - aspectItems = new Item[] { - GameRegistry.findItem(getModID(), "ItemResource"), - GameRegistry.findItem(getModID(), "ItemEssence"), - GameRegistry.findItem(getModID(), "ItemWispEssence"), - GameRegistry.findItem(getModID(), "ItemCrystalEssence"), - GameRegistry.findItem(getModID(), "BlockJarFilledItem"), - GameRegistry.findItem(getModID(), "ItemManaBean"), - }; + aspectItems = new Item[] { GameRegistry.findItem(getModID(), "ItemResource"), + GameRegistry.findItem(getModID(), "ItemEssence"), GameRegistry.findItem(getModID(), "ItemWispEssence"), + GameRegistry.findItem(getModID(), "ItemCrystalEssence"), + GameRegistry.findItem(getModID(), "BlockJarFilledItem"), + GameRegistry.findItem(getModID(), "ItemManaBean"), }; StorageDrawersApi.instance().renderRegistry().registerPreLabelRenderHandler(new LabelRenderHandler()); StorageDrawersApi.instance().wailaRegistry().registerTooltipHandler(new WailaTooltipHandler()); @@ -119,8 +121,8 @@ 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; @@ -128,8 +130,8 @@ public class Thaumcraft extends IntegrationModule { 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; 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 3b43a07..5591f93 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalExpansion.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalExpansion.java @@ -1,21 +1,26 @@ package com.jaquadro.minecraft.storagedrawers.integration; +import java.lang.reflect.Method; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import org.apache.logging.log4j.Level; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; import com.jaquadro.minecraft.storagedrawers.api.pack.IExtendedDataResolver; 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; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import org.apache.logging.log4j.Level; public class ThermalExpansion extends IntegrationModule { + private static final String MOD_ID = "ThermalExpansion"; static Class clSawmillManager; @@ -37,112 +42,100 @@ public class ThermalExpansion extends IntegrationModule { 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); - 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); - 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); - 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); - 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); - if (ModBlocks.trim != null) - mtSawmillAddRecipe.invoke( - null, - 2400, - new ItemStack(ModBlocks.trim, 1, i), - new ItemStack(Blocks.planks, 5, i), - itemSawdust, - 100); + 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); + 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); + 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); + 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); + 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); + if (ModBlocks.trim != null) 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); - 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); - 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); - 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); - 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); - if (RefinedRelocation.trim != null) - mtSawmillAddRecipe.invoke( - null, - 2400, - new ItemStack(RefinedRelocation.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); + 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); + 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); + 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); + 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); + if (RefinedRelocation.trim != null) mtSawmillAddRecipe.invoke( + null, + 2400, + new ItemStack(RefinedRelocation.trim, 1, i), + new ItemStack(Blocks.planks, 5, i), + itemSawdust, + 100); } itemMaterial = GameData.getItemRegistry().getObject("ThermalFoundation:material"); @@ -202,14 +195,13 @@ public class ThermalExpansion extends IntegrationModule { 100); } - if (StorageDrawers.config.cache.enableVoidUpgrades) - mtPulverizerAddRecipe.invoke( - null, - 2400, - new ItemStack(ModItems.upgradeVoid, 1, 1), - new ItemStack(itemMaterial, 2, 4), - itemSawdust, - 100); + if (StorageDrawers.config.cache.enableVoidUpgrades) mtPulverizerAddRecipe.invoke( + null, + 2400, + new ItemStack(ModItems.upgradeVoid, 1, 1), + new ItemStack(itemMaterial, 2, 4), + itemSawdust, + 100); initialized = true; } @@ -245,110 +237,98 @@ public class ThermalExpansion extends IntegrationModule { 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); - if (basicFull2 != null) - 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); - if (basicTrim != null) - mtSawmillAddRecipe.invoke( - null, - 2400, - new ItemStack(basicTrim, 1, i), - new ItemStack(plank, 5, plankMeta), - itemSawdust, - 100); + if (basicFull1 != null) 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); + if (basicFull4 != null) 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); - if (sortingFull1 != null) - 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); - if (sortingFull4 != null) - 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); + if (sortingFull1 != null) 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); + if (sortingFull4 != null) 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); } Block slab = resolver.getSlabBlock(i); int slabMeta = resolver.getSlabMeta(i); 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); - if (basicHalf4 != null) - mtSawmillAddRecipe.invoke( - null, - 2400, - new ItemStack(basicHalf4, 1, i), - new ItemStack(slab, 5, slabMeta), - new ItemStack(Blocks.planks, 8, 0), - 100); + if (basicHalf2 != null) 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); - if (sortingHalf2 != null) - 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); + if (sortingHalf2 != null) 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); } } } catch (Throwable t) { 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 954cef7..4ee662c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalFoundation.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalFoundation.java @@ -1,15 +1,18 @@ package com.jaquadro.minecraft.storagedrawers.integration; +import java.lang.reflect.Method; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; 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 java.lang.reflect.Method; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.ShapedOreRecipe; public class ThermalFoundation extends IntegrationModule { + private Class classRegistrySocial; private Method methodPlayerHasAccess; @@ -27,8 +30,8 @@ public class ThermalFoundation extends IntegrationModule { classRegistrySocial = Class.forName("cofh.core.util.SocialRegistry"); } - methodPlayerHasAccess = - classRegistrySocial.getDeclaredMethod("playerHasAccess", String.class, GameProfile.class); + methodPlayerHasAccess = classRegistrySocial + .getDeclaredMethod("playerHasAccess", String.class, GameProfile.class); } @Override @@ -36,15 +39,16 @@ public class ThermalFoundation extends IntegrationModule { 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)); } } 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 0755b28..ff6a7c0 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Waila.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Waila.java @@ -1,5 +1,20 @@ package com.jaquadro.minecraft.storagedrawers.integration; +import java.util.List; + +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaRegistrar; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaTooltipHandler; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; @@ -9,24 +24,13 @@ 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; -import mcp.mobius.waila.api.IWailaRegistrar; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; /** * @author dmillerw * @author jaquadro */ public class Waila extends IntegrationModule { + @Override public String getModID() { return "Waila"; @@ -34,8 +38,8 @@ public class Waila extends IntegrationModule { @Override public void init() throws Throwable { - FMLInterModComms.sendMessage( - "Waila", "register", StorageDrawers.SOURCE_PATH + "integration.Waila.registerProvider"); + FMLInterModComms + .sendMessage("Waila", "register", StorageDrawers.SOURCE_PATH + "integration.Waila.registerProvider"); } @Override @@ -46,20 +50,21 @@ public class Waila extends IntegrationModule { } public static class WailaDrawer implements IWailaDataProvider { + @Override 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)) { @@ -80,13 +85,18 @@ public class Waila extends IntegrationModule { else if (drawer instanceof IFractionalDrawer && ((IFractionalDrawer) drawer).getConversionRate() > 1) name = stackName + ((i == 0) ? " [" : " [+") - + ((IFractionalDrawer) drawer).getStoredItemRemainder() + "]"; + + ((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 + "]"; + if (stacks > 0 && remainder > 0) name = stackName + " [" + + stacks + + "x" + + drawer.getStoredItemStackSize() + + " + " + + remainder + + "]"; else if (stacks > 0) name = stackName + " [" + stacks + "x" + drawer.getStoredItemStackSize() + "]"; else name = stackName + " [" + remainder + "]"; @@ -99,23 +109,23 @@ 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"); + if (tile.isLocked(LockAttribute.LOCK_POPULATED)) 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"); - if (tile.getOwner() != null) - attrib += (attrib.isEmpty() ? "" : ", ") - + StatCollector.translateToLocal("storageDrawers.waila.protected"); + if (tile.isSorting()) attrib += (attrib.isEmpty() ? "" : ", ") + + StatCollector.translateToLocal("storageDrawers.waila.sorting"); + if (tile.getOwner() != null) attrib += (attrib.isEmpty() ? "" : ", ") + + StatCollector.translateToLocal("storageDrawers.waila.protected"); if (!attrib.isEmpty()) currenttip.add(attrib); @@ -123,14 +133,14 @@ public class Waila extends IntegrationModule { } @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 65817f2..edcea9a 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 @@ -1,14 +1,17 @@ package com.jaquadro.minecraft.storagedrawers.integration.ae2; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; + import appeng.api.networking.security.BaseActionSource; import appeng.api.storage.IExternalStorageHandler; import appeng.api.storage.IMEInventory; import appeng.api.storage.StorageChannel; + import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; public class DrawerExternalStorageHandler implements IExternalStorageHandler { + private IStorageBusMonitorFactory sbmFactory; public DrawerExternalStorageHandler(IStorageBusMonitorFactory factory) { 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 d655362..f72a68e 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 @@ -1,5 +1,10 @@ package com.jaquadro.minecraft.storagedrawers.integration.ae2; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; + import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.networking.security.BaseActionSource; @@ -7,15 +12,14 @@ import appeng.api.storage.IMEInventory; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; + 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; public class DrawerMEInventory implements IMEInventory { + final IDrawerGroup group; public DrawerMEInventory(IDrawerGroup drawerGroup) { @@ -78,9 +82,9 @@ public class DrawerMEInventory implements IMEInventory { 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(); 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 7e96b1e..1cc6ad8 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 @@ -6,5 +6,6 @@ import appeng.api.storage.IMEMonitor; import appeng.api.storage.data.IAEItemStack; 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 6049174..60bbba9 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 @@ -1,10 +1,13 @@ package com.jaquadro.minecraft.storagedrawers.integration.ae2; -import appeng.api.recipes.IIngredient; -import com.jaquadro.minecraft.storagedrawers.api.registry.IIngredientHandler; import net.minecraft.item.ItemStack; +import appeng.api.recipes.IIngredient; + +import com.jaquadro.minecraft.storagedrawers.api.registry.IIngredientHandler; + public class IngredientHandler implements IIngredientHandler { + @Override public ItemStack getItemStack(Object object) { if (!(object instanceof IIngredient)) 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 5045e4c..61c5569 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,11 +1,14 @@ package com.jaquadro.minecraft.storagedrawers.integration.ae2; -import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandler; import java.lang.reflect.Method; import java.util.List; + import net.minecraft.item.crafting.IRecipe; +import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandler; + public class ShapedRecipeHandler implements IRecipeHandler { + private Class classShapedRecipe; private Method methodGetInput; 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 2f8a19b..50f82a2 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,11 +1,14 @@ package com.jaquadro.minecraft.storagedrawers.integration.ae2; -import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandler; import java.lang.reflect.Method; import java.util.List; + import net.minecraft.item.crafting.IRecipe; +import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandler; + public class ShapelessRecipeHandler implements IRecipeHandler { + private Class classShapelessRecipe; private Method methodGetInput; 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 cb14acc..610d584 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 @@ -4,13 +4,6 @@ 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; -import com.jaquadro.minecraft.storagedrawers.item.ItemDrawers; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; -import gregtech.api.util.GT_Utility; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -19,6 +12,15 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; +import com.google.common.collect.ImmutableList; +import com.jaquadro.minecraft.storagedrawers.core.ModBlocks; +import com.jaquadro.minecraft.storagedrawers.core.ModItems; +import com.jaquadro.minecraft.storagedrawers.item.ItemDrawers; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; +import gregtech.api.util.GT_Utility; + public class ModRecipes { private static final String MOD_ID_CB = "CarpentersBlocks"; @@ -74,27 +76,33 @@ 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); @@ -109,8 +117,7 @@ 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 @@ -203,7 +210,7 @@ public class ModRecipes { // 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 @@ -215,7 +222,12 @@ public class ModRecipes { 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() { @@ -231,8 +243,12 @@ public class ModRecipes { 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); + for (ItemStack slabWood7W : slabWood7WList) RA.addAssemblerRecipe( + new ItemStack[] { slabWood7W, chest2, integratedCircuit2 }, + NF, + fullDrawers2, + 200, + 16); // Framed Drawer Full 1x2 @@ -244,7 +260,12 @@ public class ModRecipes { 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() { @@ -260,8 +281,12 @@ public class ModRecipes { 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); + for (ItemStack slabWood5W : slabWood5WList) RA.addAssemblerRecipe( + new ItemStack[] { slabWood5W, chest4, integratedCircuit4 }, + NF, + fullDrawers4, + 200, + 16); // Framed Drawer Full 2x2 @@ -273,7 +298,12 @@ public class ModRecipes { 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() { @@ -289,8 +319,12 @@ public class ModRecipes { 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); + for (ItemStack slabWood7W : slabWood7WList) RA.addAssemblerRecipe( + new ItemStack[] { slabWood7W, chest2, integratedCircuit12 }, + NF, + halfDrawers2, + 200, + 16); // Framed Drawer Half 1x2 @@ -303,7 +337,11 @@ public class ModRecipes { // Framed Drawer Half 1x2 Gregtech Assembler recipe RA.addAssemblerRecipe( - new ItemStack[] {carpentersBlock7, chest2, integratedCircuit12}, NF, halfCustom2, 200, 16); + new ItemStack[] { carpentersBlock7, chest2, integratedCircuit12 }, + NF, + halfCustom2, + 200, + 16); } private static void halfDrawers4Recipes() { @@ -318,8 +356,12 @@ public class ModRecipes { 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); + for (ItemStack slabWood4W : slabWood4WList) RA.addAssemblerRecipe( + new ItemStack[] { slabWood4W, chest5, integratedCircuit14 }, + NF, + halfDrawers4, + 200, + 16); // Framed Drawer Half 2x2 @@ -332,7 +374,11 @@ public class ModRecipes { // Framed Drawer Half 2x2 Gregtech Assembler recipe RA.addAssemblerRecipe( - new ItemStack[] {carpentersBlock4, chest5, integratedCircuit14}, NF, halfCustom4, 200, 16); + new ItemStack[] { carpentersBlock4, chest5, integratedCircuit14 }, + NF, + halfCustom4, + 200, + 16); } private static void trimRecipes() { @@ -348,7 +394,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 @@ -360,311 +406,334 @@ public class ModRecipes { 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() { - if (!(config.cache.enableIndicatorUpgrades - || config.cache.enableLockUpgrades + if (!(config.cache.enableIndicatorUpgrades || config.cache.enableLockUpgrades || config.cache.enablePersonalUpgrades || config.cache.enableRedstoneUpgrades || config.cache.enableShroudUpgrades || config.cache.enableSortingUpgrades || config.cache.enableStorageUpgrades - || config.cache.enableVoidUpgrades)) return; + || 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)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(ModItems.upgradeDowngrade, 1, 0), - new String[] {"pup", "utu", "psp"}, - 'p', - ORE_plateRubber, - 's', - ORE_stickRubber, - 'u', - upgradeTemplate, - 't', - new ItemStack(Blocks.soul_sand))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(ModItems.upgradeDowngrade, 1, 0), + new String[] { "pup", "utu", "psp" }, + 'p', + ORE_plateRubber, + 's', + ORE_stickRubber, + 'u', + upgradeTemplate, + 't', + new ItemStack(Blocks.soul_sand))); } 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() { @@ -672,7 +741,7 @@ public class ModRecipes { // Concealment Key RA.addAssemblerRecipe( - new ItemStack[] {upgradeLock, new ItemStack(Items.ender_eye)}, + new ItemStack[] { upgradeLock, new ItemStack(Items.ender_eye) }, NF, new ItemStack(ModItems.shroudKey), 100, @@ -684,7 +753,7 @@ public class ModRecipes { // Storage Personal Key RA.addAssemblerRecipe( - new ItemStack[] {upgradeLock, new ItemStack(Items.name_tag)}, + new ItemStack[] { upgradeLock, new ItemStack(Items.name_tag) }, NF, new ItemStack(ModItems.personalKey), 100, @@ -696,7 +765,7 @@ public class ModRecipes { // Packing Tape RA.addAssemblerRecipe( - new ItemStack[] {new ItemStack(Items.paper), GT_Utility.getIntegratedCircuit(1)}, + new ItemStack[] { new ItemStack(Items.paper), GT_Utility.getIntegratedCircuit(1) }, new FluidStack( (FluidRegistry.getFluid(FLUID_NAME_refinedglue) != null) ? FluidRegistry.getFluid(FLUID_NAME_refinedglue) @@ -707,8 +776,8 @@ public class ModRecipes { 30); } - /* Same as cpw.mods.fml.common.registry.GameRegistry.makeItemStack - * But with working stackSize + /* + * Same as cpw.mods.fml.common.registry.GameRegistry.makeItemStack But with working stackSize */ @SuppressWarnings("SameParameterValue") private static ItemStack makeItemStack(String itemName, int meta, int stackSize, String nbtString) { 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 ff8f9de..0f68843 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 @@ -1,16 +1,20 @@ package com.jaquadro.minecraft.storagedrawers.integration.minetweaker; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; + import net.minecraft.item.ItemStack; + import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; + @ZenClass("mods.storagedrawers.Compaction") public class Compaction { + @ZenMethod public static void add(IItemStack upper, IItemStack lower, int conversion) { ItemStack upperStack = MineTweakerMC.getItemStack(upper); @@ -22,6 +26,7 @@ public class Compaction { } private static class AddRecordAction implements IUndoableAction { + ItemStack upper; ItemStack lower; int conversionRate; @@ -50,17 +55,15 @@ public class Compaction { @Override public String describe() { - if (added) - return "Adding compacting tier: 1 '" + upper.getDisplayName() + "' = " + conversionRate + " '" - + lower.getDisplayName() + "'."; + if (added) return "Adding compacting tier: 1 '" + upper + .getDisplayName() + "' = " + conversionRate + " '" + lower.getDisplayName() + "'."; else return "Failed to add compacting tier."; } @Override public String describeUndo() { - if (added) - return "Removing previously added compacting tier: 1 '" + upper.getDisplayName() + "' = " - + conversionRate + " '" + lower.getDisplayName() + "'."; + if (added) return "Removing previously added compacting tier: 1 '" + upper + .getDisplayName() + "' = " + conversionRate + " '" + lower.getDisplayName() + "'."; else return ""; } 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 9d99e25..f0e464b 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 @@ -1,13 +1,15 @@ package com.jaquadro.minecraft.storagedrawers.integration.minetweaker; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; + @ZenClass("mods.storagedrawers.OreDictionaryBlacklist") public class OreDictionaryBlacklist { + @ZenMethod public static void add(String name) { if (name != null && name.length() > 0) MineTweakerAPI.apply(new AddNameAction(name)); @@ -21,6 +23,7 @@ public class OreDictionaryBlacklist { } private static class AddNameAction implements IUndoableAction { + String name; boolean added; @@ -63,6 +66,7 @@ public class OreDictionaryBlacklist { } private static class AddPrefixAction implements IUndoableAction { + String name; boolean added; @@ -93,9 +97,8 @@ public class OreDictionaryBlacklist { @Override public String describeUndo() { - if (added) - return "Removing previously added ore dictionary prefix '" + name - + "' from drawer conversion blacklist."; + if (added) return "Removing previously added ore dictionary prefix '" + name + + "' from drawer conversion blacklist."; else return ""; } 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 8ace6a1..4e18fbd 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 @@ -1,13 +1,15 @@ package com.jaquadro.minecraft.storagedrawers.integration.minetweaker; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; + @ZenClass("mods.storagedrawers.OreDictionaryWhitelist") public class OreDictionaryWhitelist { + @ZenMethod public static void add(String name) { if (name != null && name.length() > 0) MineTweakerAPI.apply(new AddNameAction(name)); @@ -15,6 +17,7 @@ public class OreDictionaryWhitelist { } private static class AddNameAction implements IUndoableAction { + String name; boolean added; 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 6e2a9d0..550c383 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 @@ -1,19 +1,24 @@ package com.jaquadro.minecraft.storagedrawers.integration.notenoughitems; -import codechicken.nei.api.API; -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 codechicken.nei.api.API; +import codechicken.nei.api.IConfigureNEI; + +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; + +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.registry.GameData; + @Optional.Interface(iface = "codechicken.nei.api.IConfigureNEI", modid = "NotEnoughItems") public class NEIStorageDrawersConfig implements IConfigureNEI { + private static Set pendingHide = new HashSet(); private static boolean loaded; 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 00384c7..0f8e289 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 @@ -1,11 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.block.BlockCompDrawers; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersComp; -import com.jaquadro.minecraft.storagedrawers.integration.RefinedRelocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.nbt.NBTTagCompound; @@ -14,7 +8,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.block.BlockCompDrawers; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersComp; +import com.jaquadro.minecraft.storagedrawers.integration.RefinedRelocation; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockSortingCompDrawers extends BlockCompDrawers { + @SideOnly(Side.CLIENT) IIcon iconSort; 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 6ea5187..b5b9111 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 @@ -1,12 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.pack.BlockType; -import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard; -import com.jaquadro.minecraft.storagedrawers.integration.RefinedRelocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockWood; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,7 +9,17 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.pack.BlockType; +import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard; +import com.jaquadro.minecraft.storagedrawers.integration.RefinedRelocation; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockSortingDrawers extends BlockDrawers { + @SideOnly(Side.CLIENT) protected IIcon[] iconSort; 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 9048a22..fbb9359 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 @@ -1,10 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.block.BlockTrim; -import com.jaquadro.minecraft.storagedrawers.integration.RefinedRelocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockWood; import net.minecraft.block.ITileEntityProvider; @@ -13,7 +8,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.block.BlockTrim; +import com.jaquadro.minecraft.storagedrawers.integration.RefinedRelocation; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockSortingTrim extends BlockTrim implements ITileEntityProvider { + @SideOnly(Side.CLIENT) protected IIcon[] iconSort; 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 eab234d..9096b54 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 @@ -1,11 +1,13 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; +import net.minecraft.item.ItemStack; + import com.dynious.refinedrelocation.api.filter.IFilter; 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 { + private IDrawerGroup group; public DrawerFilter(IDrawerGroup group) { 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 18d7fab..fca5ef0 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 @@ -1,5 +1,9 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + import com.dynious.refinedrelocation.api.APIUtils; import com.dynious.refinedrelocation.api.filter.IFilter; import com.dynious.refinedrelocation.api.tileentity.ISortingInventory; @@ -9,11 +13,9 @@ import com.dynious.refinedrelocation.api.tileentity.handlers.ISortingInventoryHa import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import com.jaquadro.minecraft.storagedrawers.storage.IUpgradeProvider; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public class DrawerSortingInventory { + private ISpecialSortingInventory parent; private IDrawerGroup group; private IInventory inventory; @@ -23,8 +25,8 @@ public class DrawerSortingInventory { private DrawerFilter filter; private boolean isAttached; - public DrawerSortingInventory( - TileEntity tileEntity, IDrawerGroup group, IInventory inventory, IUpgradeProvider upgrade) { + public DrawerSortingInventory(TileEntity tileEntity, IDrawerGroup group, IInventory inventory, + IUpgradeProvider upgrade) { parent = (ISpecialSortingInventory) tileEntity; this.group = group; this.inventory = inventory; @@ -64,8 +66,7 @@ public class DrawerSortingInventory { IDrawer drawer = group.getDrawer(i); if (drawer.isEmpty() || !drawer.canItemBeStored(itemStack)) continue; - int added = upgrade.isVoid() - ? itemStack.stackSize + int added = upgrade.isVoid() ? itemStack.stackSize : Math.min(drawer.getRemainingCapacity(), itemStack.stackSize); if (!simulate) drawer.setStoredItemCount(drawer.getStoredItemCount() + added); 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 e07afed..5489a66 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 @@ -1,16 +1,20 @@ 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 com.jaquadro.minecraft.storagedrawers.item.ItemCompDrawers; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemSortingCompDrawers extends ItemCompDrawers { + public ItemSortingCompDrawers(Block block) { super(block); } 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 03d6865..aaf7ca8 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 @@ -1,19 +1,23 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; -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 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 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 cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemSortingDrawers extends ItemBasicDrawers { + public ItemSortingDrawers(Block block) { super(block); } 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 09c8c16..6bb0e7b 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 @@ -1,16 +1,20 @@ 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 com.jaquadro.minecraft.storagedrawers.item.ItemTrim; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemSortingTrim extends ItemTrim { + public ItemSortingTrim(Block block) { super(block); } 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 eccde46..33a2eef 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 @@ -1,13 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -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 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; @@ -15,7 +9,17 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +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 cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemUpgradeSorting extends Item { + public ItemUpgradeSorting(String name) { setUnlocalizedName(name); setCreativeTab(ModCreativeTabs.tabStorageDrawers); @@ -31,17 +35,8 @@ public class ItemUpgradeSorting extends Item { } @Override - public boolean onItemUseFirst( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float hitX, - float hitY, - float hitZ) { + 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) { 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 3b99b95..c45e85b 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 @@ -2,9 +2,11 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; import java.util.HashMap; import java.util.Map; + import net.minecraft.block.Block; public class SortingBlockRegistry { + private static Map registry = new HashMap(); public static void register(Block storageBlock, Block sortingBlock) { 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 8861219..eb01543 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 @@ -1,14 +1,16 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; +import net.minecraft.item.ItemStack; + import com.dynious.refinedrelocation.api.filter.IFilter; import com.dynious.refinedrelocation.api.tileentity.ISortingInventory; import com.dynious.refinedrelocation.api.tileentity.ISpecialSortingInventory; import com.dynious.refinedrelocation.api.tileentity.grid.SpecialLocalizedStack; import com.dynious.refinedrelocation.api.tileentity.handlers.ISortingInventoryHandler; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersComp; -import net.minecraft.item.ItemStack; public class TileSortingDrawersComp extends TileEntityDrawersComp implements ISpecialSortingInventory { + private DrawerSortingInventory sortingInventory; public TileSortingDrawersComp() { 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 bca174f..c4cdcf7 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 @@ -1,14 +1,16 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; +import net.minecraft.item.ItemStack; + import com.dynious.refinedrelocation.api.filter.IFilter; import com.dynious.refinedrelocation.api.tileentity.ISortingInventory; import com.dynious.refinedrelocation.api.tileentity.ISpecialSortingInventory; import com.dynious.refinedrelocation.api.tileentity.grid.SpecialLocalizedStack; import com.dynious.refinedrelocation.api.tileentity.handlers.ISortingInventoryHandler; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard; -import net.minecraft.item.ItemStack; public class TileSortingDrawersStandard extends TileEntityDrawersStandard implements ISpecialSortingInventory { + private DrawerSortingInventory sortingInventory; public TileSortingDrawersStandard() { 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 7b5c4c0..f41662e 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 @@ -1,9 +1,10 @@ package com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation; +import net.minecraft.tileentity.TileEntity; + import com.dynious.refinedrelocation.api.APIUtils; import com.dynious.refinedrelocation.api.tileentity.ISortingMember; import com.dynious.refinedrelocation.api.tileentity.handlers.ISortingMemberHandler; -import net.minecraft.tileentity.TileEntity; public class TileSortingTrim extends TileEntity implements ISortingMember { 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 4624741..070ecba 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 @@ -7,6 +7,7 @@ import com.jaquadro.minecraft.storagedrawers.security.DefaultSecurityProvider; import com.mojang.authlib.GameProfile; public class CoFHSecurityProvider implements ISecurityProvider { + ThermalFoundation foundation; private DefaultSecurityProvider defaultProvider = new DefaultSecurityProvider(); 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 04f10d2..64d465e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers.java @@ -1,8 +1,8 @@ package com.jaquadro.minecraft.storagedrawers.inventory; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; 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; @@ -10,7 +10,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; + public class ContainerDrawers extends Container { + private static final int InventoryX = 8; private static final int InventoryY = 117; private static final int HotbarY = 175; @@ -32,9 +35,8 @@ public class ContainerDrawers extends Container { 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)))); + for (int i = 0; i < tileEntity.getDrawerCount(); i++) storageSlots + .add(addSlotToContainer(new SlotStorage(storageInventory, i, getStorageSlotX(i), getStorageSlotY(i)))); upgradeSlots = new ArrayList(); for (int i = 0; i < 5; i++) @@ -42,9 +44,9 @@ 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))); + for (int j = 0; j < 9; j++) playerSlots.add( + addSlotToContainer( + new Slot(playerInventory, j + i * 9 + 9, InventoryX + j * 18, InventoryY + i * 18))); } hotbarSlots = new ArrayList(); @@ -104,27 +106,21 @@ public class ContainerDrawers extends Container { // Try merge inventory to upgrades else if (slotIndex >= inventoryStart && slotIndex < hotbarEnd && slotStack != null) { - /*if (slotStack.getItem() == ModItems.upgrade || slotStack.getItem() == ModItems.upgradeStatus || slotStack.getItem() == ModItems.upgradeVoid) { - ItemStack slotStack1 = slotStack.copy(); - slotStack1.stackSize = 1; - - if (!mergeItemStack(slotStack1, upgradeStart, upgradeEnd, false)) { - if (slotIndex >= inventoryStart && slotIndex < hotbarEnd) { - if (!mergeItemStack(slotStack, hotbarStart, hotbarEnd, false)) - return null; - } else if (slotIndex >= hotbarStart && slotIndex < hotbarEnd && !mergeItemStack(slotStack, inventoryStart, hotbarStart, false)) - return null; - } - else { - slotStack.stackSize--; - } - }*/ + /* + * if (slotStack.getItem() == ModItems.upgrade || slotStack.getItem() == ModItems.upgradeStatus || + * slotStack.getItem() == ModItems.upgradeVoid) { ItemStack slotStack1 = slotStack.copy(); + * slotStack1.stackSize = 1; if (!mergeItemStack(slotStack1, upgradeStart, upgradeEnd, false)) { if + * (slotIndex >= inventoryStart && slotIndex < hotbarEnd) { if (!mergeItemStack(slotStack, hotbarStart, + * hotbarEnd, false)) return null; } else if (slotIndex >= hotbarStart && slotIndex < hotbarEnd && + * !mergeItemStack(slotStack, inventoryStart, hotbarStart, false)) return null; } else { + * slotStack.stackSize--; } } + */ 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; + } else if (slotIndex >= hotbarStart && slotIndex < hotbarEnd + && !mergeItemStack(slotStack, inventoryStart, hotbarStart, false)) + return null; } // Try merge stack into inventory 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 eb59520..69571cc 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers1.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers1.java @@ -1,10 +1,12 @@ package com.jaquadro.minecraft.storagedrawers.inventory; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import net.minecraft.entity.player.InventoryPlayer; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; + public class ContainerDrawers1 extends ContainerDrawers { - private static final int[][] slotCoordinates = new int[][] {{80, 36}}; + + private static final int[][] slotCoordinates = new int[][] { { 80, 36 } }; public ContainerDrawers1(InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { super(playerInventory, tileEntity); 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 8d401c9..d96dae9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers2.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers2.java @@ -1,10 +1,12 @@ package com.jaquadro.minecraft.storagedrawers.inventory; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import net.minecraft.entity.player.InventoryPlayer; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; + public class ContainerDrawers2 extends ContainerDrawers { - private static final int[][] slotCoordinates = new int[][] {{80, 23}, {80, 49}}; + + private static final int[][] slotCoordinates = new int[][] { { 80, 23 }, { 80, 49 } }; public ContainerDrawers2(InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { super(playerInventory, tileEntity); 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 fb1112f..826d705 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers4.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawers4.java @@ -1,10 +1,12 @@ package com.jaquadro.minecraft.storagedrawers.inventory; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import net.minecraft.entity.player.InventoryPlayer; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; + public class ContainerDrawers4 extends ContainerDrawers { - private static final int[][] slotCoordinates = new int[][] {{67, 23}, {67, 49}, {93, 23}, {93, 49}}; + + private static final int[][] slotCoordinates = new int[][] { { 67, 23 }, { 67, 49 }, { 93, 23 }, { 93, 49 } }; public ContainerDrawers4(InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { super(playerInventory, tileEntity); 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 8307f60..ae0b974 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawersComp.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerDrawersComp.java @@ -1,10 +1,12 @@ package com.jaquadro.minecraft.storagedrawers.inventory; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import net.minecraft.entity.player.InventoryPlayer; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; + public class ContainerDrawersComp extends ContainerDrawers { - private static final int[][] slotCoordinates = new int[][] {{80, 23}, {67, 49}, {93, 49}}; + + private static final int[][] slotCoordinates = new int[][] { { 80, 23 }, { 67, 49 }, { 93, 49 } }; public ContainerDrawersComp(InventoryPlayer playerInventory, TileEntityDrawers tileEntity) { super(playerInventory, tileEntity); 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 c2e6262..aef1dfc 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerFramingTable.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ContainerFramingTable.java @@ -1,12 +1,8 @@ package com.jaquadro.minecraft.storagedrawers.inventory; -import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom; -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; @@ -16,7 +12,14 @@ import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom; +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; + public class ContainerFramingTable extends Container { + private static final int InventoryX = 8; private static final int InventoryY = 84; private static final int HotbarY = 142; @@ -50,14 +53,20 @@ public class ContainerFramingTable extends Container { 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))); + for (int j = 0; j < 9; j++) playerSlots.add( + addSlotToContainer(new Slot(inventory, j + i * 9 + 9, InventoryX + j * 18, InventoryY + i * 18))); } hotbarSlots = new ArrayList(); @@ -84,7 +93,8 @@ public class ContainerFramingTable extends Container { if (block instanceof BlockDrawersCustom) { if (matSide != null) { craftResult.setInventorySlotContents( - 0, ItemCustomDrawers.makeItemStack(block, 1, matSide, matTrim, matFront)); + 0, + ItemCustomDrawers.makeItemStack(block, 1, matSide, matTrim, matFront)); return; } } else if (block instanceof BlockTrimCustom) { @@ -123,16 +133,18 @@ public class ContainerFramingTable extends Container { boolean merged = false; 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); + if (TileEntityFramingTable.isItemValidMaterial(slotStack)) 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; + } else if (slotIndex >= hotbarStart && slotIndex < hotbarEnd + && !this.mergeItemStack(slotStack, inventoryStart, hotbarStart, false)) + return null; } } 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 5614e10..c99890e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ISideManager.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/ISideManager.java @@ -4,5 +4,6 @@ package com.jaquadro.minecraft.storagedrawers.inventory; * Created by Justin on 11/9/2014. */ 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 ceb095a..5f1466c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryContainerProxy.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryContainerProxy.java @@ -6,6 +6,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; public class InventoryContainerProxy implements IInventory { + private IInventory parent; private Container container; 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 2ff0c8a..fdd74d2 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java @@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.inventory; import net.minecraft.item.ItemStack; public abstract class InventoryStack { + private ItemStack inStack; private ItemStack outStack; 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 79a63f5..e023ab7 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStorage.java @@ -1,16 +1,19 @@ package com.jaquadro.minecraft.storagedrawers.inventory; -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; -import com.jaquadro.minecraft.storagedrawers.client.renderer.StorageRenderItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; +import com.jaquadro.minecraft.storagedrawers.client.renderer.StorageRenderItem; + public class InventoryStorage implements IInventory { + public StorageRenderItem activeRenderItem; private static class InventorySnapshot { + private ItemStack[] snapshotItems; private int[] snapshotCounts; @@ -115,7 +118,7 @@ public class InventoryStorage implements IInventory { ItemStack stack = tile.getStackInSlot(i); if (stack != null) stack.stackSize += diff; // else if (diff > 0) - // tile.setInventorySlotContents(i, snapshot.); + // tile.setInventorySlotContents(i, snapshot.); } } 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 09e7676..93e66dd 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryUpgrade.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/InventoryUpgrade.java @@ -1,16 +1,18 @@ package com.jaquadro.minecraft.storagedrawers.inventory; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + 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.item.ItemUpgrade; import com.jaquadro.minecraft.storagedrawers.item.ItemUpgradeStatus; import com.jaquadro.minecraft.storagedrawers.item.ItemUpgradeVoid; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; public class InventoryUpgrade implements IInventory { + private static final int upgradeCapacity = 5; private TileEntityDrawers tile; @@ -45,7 +47,7 @@ public class InventoryUpgrade implements IInventory { @Override public void setInventorySlotContents(int slot, ItemStack item) { // if (item != null && item.stackSize > getInventoryStackLimit()) - // item.stackSize = getInventoryStackLimit(); + // item.stackSize = getInventoryStackLimit(); tile.setUpgrade(slot, item); } @@ -83,9 +85,9 @@ public class InventoryUpgrade implements IInventory { @Override public boolean isItemValidForSlot(int slot, ItemStack item) { - if (item.getItem() instanceof ItemUpgrade - || item.getItem() instanceof ItemUpgradeStatus - || item.getItem() instanceof ItemUpgradeVoid) return true; + if (item.getItem() instanceof ItemUpgrade || item.getItem() instanceof ItemUpgradeStatus + || item.getItem() instanceof ItemUpgradeVoid) + return true; return false; } 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 4b890d7..f0d1c08 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotCraftResult.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotCraftResult.java @@ -1,6 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.inventory; -import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; @@ -8,20 +7,17 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; +import cpw.mods.fml.common.FMLCommonHandler; + 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; @@ -65,8 +61,7 @@ public class SlotCraftResult extends Slot { if (itemTarget.getItem().hasContainerItem(itemTarget)) { ItemStack itemContainer = itemTarget.getItem().getContainerItem(itemTarget); - if (itemContainer != null - && itemContainer.isItemStackDamageable() + if (itemContainer != null && itemContainer.isItemStackDamageable() && itemContainer.getItemDamage() > itemContainer.getMaxDamage()) { MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(this.player, itemContainer)); continue; 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 a43322a..7f2c2ad 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotRestricted.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotRestricted.java @@ -5,6 +5,7 @@ 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) { super(inventory, slotIndex, xDisplayPosition, yDisplayPosition); } 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 1745638..8d512be 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotStorage.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotStorage.java @@ -5,6 +5,7 @@ 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) { super(inventory, index, x, y); } 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 bec994e..f1885f0 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotUpgrade.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/SlotUpgrade.java @@ -1,12 +1,14 @@ package com.jaquadro.minecraft.storagedrawers.inventory; -import com.jaquadro.minecraft.storagedrawers.core.ModItems; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.jaquadro.minecraft.storagedrawers.core.ModItems; + public class SlotUpgrade extends Slot { + public SlotUpgrade(IInventory inventory, int index, int x, int y) { super(inventory, index, x, y); } 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 8698488..4f70004 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java @@ -1,5 +1,8 @@ package com.jaquadro.minecraft.storagedrawers.inventory; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.inventory.IDrawerInventory; import com.jaquadro.minecraft.storagedrawers.api.inventory.IInventoryAdapter; @@ -9,10 +12,9 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; 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 { + private static final int[] emptySlots = new int[0]; private final IDrawerGroup group; 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 070a08f..2a81af6 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemBasicDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemBasicDrawers.java @@ -1,13 +1,15 @@ package com.jaquadro.minecraft.storagedrawers.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockWood; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemBasicDrawers extends ItemDrawers { + protected final Block blockTemplate; protected final String[] blockNames; 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 9e62b46..c8ca6f1 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCompDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCompDrawers.java @@ -1,11 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.item; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -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; @@ -14,24 +10,22 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +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; + 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) { + 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); @@ -59,8 +53,9 @@ public class ItemCompDrawers extends ItemBlock { 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 7fdad12..05bb6fe 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemController.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemController.java @@ -1,9 +1,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; @@ -11,24 +9,20 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityController; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + 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) { + 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); 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 1765723..3f6c307 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCustomDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCustomDrawers.java @@ -1,6 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.item; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -8,44 +7,34 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; + 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) { + 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; 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 c72c551..2312ce6 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCustomTrim.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemCustomTrim.java @@ -1,6 +1,5 @@ package com.jaquadro.minecraft.storagedrawers.item; -import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityTrim; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -9,34 +8,25 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityTrim; + 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) { + 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; 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 aa5c000..ed12c19 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemDrawers.java @@ -1,13 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.item; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -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 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; @@ -16,25 +10,25 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +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 cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + 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) { + 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); @@ -60,12 +54,14 @@ public class ItemDrawers extends ItemBlock { @SideOnly(Side.CLIENT) 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")); } } 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 ad2585e..085a527 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemFramingTable.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemFramingTable.java @@ -8,24 +8,15 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; 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 == 1) { 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 6c8bb56..70b6fe6 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemPersonalKey.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemPersonalKey.java @@ -1,12 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.item; -import com.google.common.collect.Multimap; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -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; @@ -18,8 +13,17 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; +import com.google.common.collect.Multimap; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +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; + public class ItemPersonalKey extends Item { - public static final String[] iconNames = new String[] {"default", "cofh"}; + + public static final String[] iconNames = new String[] { "default", "cofh" }; @SideOnly(Side.CLIENT) private IIcon[] icons; @@ -71,7 +75,8 @@ public class ItemPersonalKey extends Item { 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)); + && IntegrationRegistry.instance().isModLoaded("ThermalFoundation")) + list.add(new ItemStack(item, 1, 1)); } @Override 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 d530a71..dfc6bcb 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemShroudKey.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemShroudKey.java @@ -1,11 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.item; -import com.google.common.collect.Multimap; -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.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +9,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import com.google.common.collect.Multimap; +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; + public class ItemShroudKey extends Item { + public ItemShroudKey(String name) { setUnlocalizedName(name); setCreativeTab(ModCreativeTabs.tabStorageDrawers); 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 7486119..911beac 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemTape.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemTape.java @@ -1,13 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.item; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IProtectable; -import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ISealable; -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; @@ -15,7 +9,17 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IProtectable; +import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ISealable; +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; + public class ItemTape extends Item { + public ItemTape(String name) { setUnlocalizedName(name); setMaxStackSize(1); @@ -32,17 +36,8 @@ public class ItemTape extends Item { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float hitX, - float hitY, - float hitZ) { + 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); 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 4341f7a..b575eb7 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemTrim.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemTrim.java @@ -1,13 +1,15 @@ package com.jaquadro.minecraft.storagedrawers.item; -import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import net.minecraft.block.Block; import net.minecraft.block.BlockWood; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemMultiTexture; import net.minecraft.world.World; +import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; + public class ItemTrim extends ItemMultiTexture { + public ItemTrim(Block block) { super(block, block, BlockWood.field_150096_a); } 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 ea09737..680b20e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgrade.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgrade.java @@ -1,10 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.item; -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; @@ -14,9 +11,16 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; +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; + public class ItemUpgrade extends Item { - public static final String[] iconNames = - new String[] {null, null, "iron", "gold", "obsidian", "diamond", "emerald"}; + + public static final String[] iconNames = new String[] { null, null, "iron", "gold", "obsidian", "diamond", + "emerald" }; @SideOnly(Side.CLIENT) private IIcon[] icons; 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 085f794..b56769f 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeCreative.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeCreative.java @@ -1,10 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.item; -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; @@ -14,8 +11,15 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; +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; + public class ItemUpgradeCreative extends Item { - public static final String[] iconNames = new String[] {"store", "vend"}; + + public static final String[] iconNames = new String[] { "store", "vend" }; @SideOnly(Side.CLIENT) private IIcon[] icons; 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 c6efb78..5daad8e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeDowngrade.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeDowngrade.java @@ -1,15 +1,18 @@ package com.jaquadro.minecraft.storagedrawers.item; -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 com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemUpgradeDowngrade extends Item { public ItemUpgradeDowngrade(String name) { 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 f79e51b..b0d81e8 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeLock.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeLock.java @@ -1,11 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.item; -import com.google.common.collect.Multimap; -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.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +9,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import com.google.common.collect.Multimap; +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; + public class ItemUpgradeLock extends Item { + public ItemUpgradeLock(String name) { setUnlocalizedName(name); setCreativeTab(ModCreativeTabs.tabStorageDrawers); 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 e08d835..67a8c71 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeRedstone.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeRedstone.java @@ -1,10 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.item; -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; @@ -14,8 +11,15 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; +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; + public class ItemUpgradeRedstone extends Item { - public static final String[] iconNames = new String[] {"combined", "max", "min"}; + + public static final String[] iconNames = new String[] { "combined", "max", "min" }; @SideOnly(Side.CLIENT) private IIcon[] icons; 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 3f8312c..bbfd226 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeStatus.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeStatus.java @@ -1,10 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.item; -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; @@ -14,8 +11,15 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; +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; + public class ItemUpgradeStatus extends Item { - public static final String[] iconNames = new String[] {null, "level1", "level2"}; + + public static final String[] iconNames = new String[] { null, "level1", "level2" }; @SideOnly(Side.CLIENT) private IIcon[] icons; 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 7ab9282..726601d 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeVoid.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeVoid.java @@ -1,16 +1,20 @@ package com.jaquadro.minecraft.storagedrawers.item; -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 com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemUpgradeVoid extends Item { + public ItemUpgradeVoid(String name) { setUnlocalizedName(name); setCreativeTab(ModCreativeTabs.tabStorageDrawers); 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 684ed0a..aa71a92 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,10 +1,12 @@ package com.jaquadro.minecraft.storagedrawers.item.pack; +import net.minecraft.block.Block; + 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) { super(block, getUnlocalizedNames(block)); } 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 7433410..2357300 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 @@ -1,16 +1,20 @@ 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 com.jaquadro.minecraft.storagedrawers.block.pack.BlockSortingDrawersPack; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemSortingDrawersPack extends ItemDrawersPack { + public ItemSortingDrawersPack(Block block) { super(block, getUnlocalizedNames(block)); } 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 c53a278..10258fb 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 @@ -1,16 +1,20 @@ 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 com.jaquadro.minecraft.storagedrawers.block.pack.BlockSortingTrimPack; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemSortingTrimPack extends ItemTrimPack { + public ItemSortingTrimPack(Block block) { super(block, getUnlocalizedNames(block)); } 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 8d5e15e..664eeab 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,10 +1,12 @@ package com.jaquadro.minecraft.storagedrawers.item.pack; +import net.minecraft.block.Block; + 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) { super(block, getUnlocalizedNames(block)); } 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 a3a0a25..cfb16e9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/network/BlockClickMessage.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/network/BlockClickMessage.java @@ -1,15 +1,18 @@ package com.jaquadro.minecraft.storagedrawers.network; +import net.minecraft.block.Block; +import net.minecraft.world.World; + import com.jaquadro.minecraft.storagedrawers.block.IExtendedBlockClickHandler; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; -import net.minecraft.block.Block; -import net.minecraft.world.World; public class BlockClickMessage implements IMessage { + private int x; private int y; private int z; @@ -57,24 +60,23 @@ public class BlockClickMessage implements IMessage { } public static class Handler implements IMessageHandler { + @Override 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); + 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); } 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 27bb068..c883aad 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/network/CountUpdateMessage.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/network/CountUpdateMessage.java @@ -1,7 +1,14 @@ package com.jaquadro.minecraft.storagedrawers.network; +import net.minecraft.client.Minecraft; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import org.apache.logging.log4j.Level; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; + import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -9,12 +16,9 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import org.apache.logging.log4j.Level; public class CountUpdateMessage implements IMessage { + private int x; private int y; private int z; @@ -51,6 +55,7 @@ public class CountUpdateMessage implements IMessage { @SideOnly(Side.CLIENT) public static class Handler implements IMessageHandler { + @Override public IMessage onMessage(CountUpdateMessage message, MessageContext ctx) { if (ctx.side == Side.CLIENT) { @@ -66,6 +71,7 @@ public class CountUpdateMessage implements IMessage { } public static class HandlerStub implements IMessageHandler { + @Override public IMessage onMessage(CountUpdateMessage message, MessageContext ctx) { FMLLog.log(StorageDrawers.MOD_ID, Level.WARN, "CountUpdateMessage stub handler called."); 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 6ea0341..8ee6961 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/security/DefaultSecurityProvider.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/security/DefaultSecurityProvider.java @@ -5,6 +5,7 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IProtectable; import com.mojang.authlib.GameProfile; public class DefaultSecurityProvider implements ISecurityProvider { + @Override public String getProviderID() { return null; 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 02c6df9..b5251cb 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/security/SecurityManager.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/security/SecurityManager.java @@ -5,6 +5,7 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IProtectable; import com.mojang.authlib.GameProfile; public class SecurityManager { + private static ISecurityProvider defaultProvider = new DefaultSecurityProvider(); public static boolean hasOwnership(GameProfile profile, IProtectable 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 a13f9a0..141627a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/security/SecurityRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/security/SecurityRegistry.java @@ -1,10 +1,12 @@ package com.jaquadro.minecraft.storagedrawers.security; -import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; import java.util.HashMap; import java.util.Map; +import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; + public class SecurityRegistry { + private Map registry = new HashMap(); public void registerProvider(ISecurityProvider provider) { 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 73c4300..05b29d3 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/BaseDrawerData.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/BaseDrawerData.java @@ -1,18 +1,21 @@ package com.jaquadro.minecraft.storagedrawers.storage; +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; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; 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 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 { + protected InventoryStack inventoryStack; private List oreDictMatches; private Map auxData; @@ -145,7 +148,8 @@ public abstract class BaseDrawerData implements IDrawer, IInventoryAdapter { if (!stack1.isItemEqual(stack2)) { if (!StorageDrawers.config.cache.enableItemConversion) return false; if (stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE - || stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE) return false; + || stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE) + return false; if (stack1.getItem() == stack2.getItem()) return false; int[] ids1 = OreDictionary.getOreIDs(stack1); @@ -174,6 +178,7 @@ public abstract class BaseDrawerData implements IDrawer, IInventoryAdapter { } class DrawerInventoryStack extends InventoryStack { + @Override protected ItemStack getNewItemStack() { return getStoredItemCopy(); 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 2d418a9..7e96439 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java @@ -1,16 +1,18 @@ package com.jaquadro.minecraft.storagedrawers.storage; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.IFractionalDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ILockable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IShroudable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; -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); private ICentralInventory central; 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 6b277f9..15d47fa 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DefaultStorageProvider.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DefaultStorageProvider.java @@ -1,14 +1,17 @@ package com.jaquadro.minecraft.storagedrawers.storage; +import net.minecraft.tileentity.TileEntity; + import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; 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.tileentity.TileEntity; public class DefaultStorageProvider implements IStorageProvider { + TileEntity tile; IDrawerGroup group; @@ -83,7 +86,11 @@ public class DefaultStorageProvider implements IStorageProvider { 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); + tile.getWorldObj().provider.dimensionId, + tile.xCoord, + tile.yCoord, + tile.zCoord, + 500); StorageDrawers.network.sendToAllAround(message, targetPoint); 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 765c8fc..7468531 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java @@ -1,17 +1,19 @@ package com.jaquadro.minecraft.storagedrawers.storage; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.MinecraftForge; + import com.jaquadro.minecraft.storagedrawers.api.event.DrawerPopulatedEvent; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ILockable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IShroudable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; -import net.minecraft.item.Item; -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); private IStorageProvider storageProvider; 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 66786bb..319bc1c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java @@ -1,11 +1,13 @@ package com.jaquadro.minecraft.storagedrawers.storage; -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; +import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; + public interface ICentralInventory { + public ItemStack getStoredItemPrototype(int slot); public IDrawer setStoredItem(int slot, ItemStack itemPrototype, int amount); 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 bd86cda..9f98554 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/IStorageProvider.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/IStorageProvider.java @@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.storage; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; public interface IStorageProvider { + public boolean isCentrallyManaged(); public int getSlotCount(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 110f487..be66440 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/IUpgradeProvider.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/IUpgradeProvider.java @@ -1,6 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.storage; public interface IUpgradeProvider { + boolean isVoid(); boolean isSorting(); 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 b030dbc..9302ee7 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/ItemMetaListRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/ItemMetaListRegistry.java @@ -4,9 +4,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; + import net.minecraft.item.Item; public class ItemMetaListRegistry { + private ItemMetaRegistry> registry; private boolean compactTopLevel; @@ -43,8 +45,7 @@ public class ItemMetaListRegistry { } public void clear(Item item) { - for (Map.Entry> map : registry.entrySet(item)) - map.getValue().clear(); + for (Map.Entry> map : registry.entrySet(item)) map.getValue().clear(); } public void clear() { 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 2927024..28deb32 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/ItemMetaRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/ItemMetaRegistry.java @@ -3,9 +3,11 @@ package com.jaquadro.minecraft.storagedrawers.util; import java.util.HashMap; import java.util.Map; import java.util.Set; + import net.minecraft.item.Item; public class ItemMetaRegistry { + private Map> registry; private boolean compactTopLevel; 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 b719972..a119687 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelper.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelper.java @@ -8,9 +8,11 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; public class RenderHelper { + public static final int YNEG = 0; public static final int YPOS = 1; public static final int ZNEG = 2; @@ -20,14 +22,8 @@ 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}, - }; + private static final float normMap[][] = { { 0, -1, 0 }, { 0, 1, 0 }, { 0, 0, -1 }, { 0, 0, 1 }, { -1, 0, 0 }, + { 1, 0, 0 }, }; public RenderHelperState state = new RenderHelperState(); @@ -141,35 +137,16 @@ public class RenderHelper { 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 + 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); } - 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]; @@ -178,17 +155,8 @@ public class RenderHelper { 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]; @@ -219,18 +187,8 @@ 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, @@ -249,72 +207,32 @@ public class RenderHelper { 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 + 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); } - 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(); } - 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]) { @@ -348,8 +266,8 @@ public class RenderHelper { 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); } @@ -506,8 +424,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); @@ -554,10 +472,8 @@ public class RenderHelper { } private IIcon getIconSafe(IIcon icon) { - if (icon == null) - return ((TextureMap) - Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)) - .getAtlasSprite("missingno"); + if (icon == null) 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 fd19de9..a6c26a6 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperAO.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperAO.java @@ -6,6 +6,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; public class RenderHelperAO { + private RenderHelperState state; private int aoBrightnessXYNI; @@ -106,8 +107,8 @@ public class RenderHelperAO { 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); @@ -118,12 +119,27 @@ public class RenderHelperAO { boolean blocksGrassYZNP = !blockAccess.getBlock(x, yGrass, z + 1).getCanBlockGrass(); boolean blocksGrassYZNN = !blockAccess.getBlock(x, yGrass, z - 1).getCanBlockGrass(); - if (state.renderMinY > 0) - setupAOBrightnessYNeg( - blockAccess, block, x, y, z, blocksGrassXYPN, blocksGrassXYNN, blocksGrassYZNP, blocksGrassYZNN); + if (state.renderMinY > 0) setupAOBrightnessYNeg( + blockAccess, + block, + x, + y, + z, + blocksGrassXYPN, + blocksGrassXYNN, + blocksGrassYZNP, + blocksGrassYZNN); setupAOBrightnessYPos( - blockAccess, block, x, y - 1, z, blocksGrassXYPN, blocksGrassXYNN, blocksGrassYZNP, blocksGrassYZNN); + blockAccess, + block, + x, + y - 1, + z, + blocksGrassXYPN, + blocksGrassXYNN, + blocksGrassYZNP, + blocksGrassYZNN); float yClamp = MathHelper.clamp_float((float) state.renderMinY, 0, 1); mixAOBrightnessLightValueY(yClamp, 1 - yClamp); @@ -133,18 +149,18 @@ 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 @@ -212,8 +228,8 @@ 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); @@ -269,18 +285,18 @@ public class RenderHelperAO { 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 @@ -304,14 +320,34 @@ public class RenderHelperAO { 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); @@ -320,8 +356,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); @@ -332,12 +368,27 @@ public class RenderHelperAO { boolean blocksGrassYZPN = !blockAccess.getBlock(x, y + 1, zGrass).getCanBlockGrass(); boolean blocksGrassYZNN = !blockAccess.getBlock(x, y - 1, zGrass).getCanBlockGrass(); - if (state.renderMinZ > 0) - setupAOBrightnessZNeg( - blockAccess, block, x, y, z, blocksGrassXZPN, blocksGrassXZNN, blocksGrassYZPN, blocksGrassYZNN); + if (state.renderMinZ > 0) setupAOBrightnessZNeg( + blockAccess, + block, + x, + y, + z, + blocksGrassXZPN, + blocksGrassXZNN, + blocksGrassYZPN, + blocksGrassYZNN); setupAOBrightnessZPos( - blockAccess, block, x, y, z - 1, blocksGrassXZPN, blocksGrassXZNN, blocksGrassYZPN, blocksGrassYZNN); + blockAccess, + block, + x, + y, + z - 1, + blocksGrassXZPN, + blocksGrassXZNN, + blocksGrassYZPN, + blocksGrassYZNN); float zClamp = MathHelper.clamp_float((float) state.renderMinZ, 0, 1); mixAOBrightnessLightValueZ(zClamp, 1 - zClamp); @@ -347,18 +398,18 @@ 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 @@ -426,8 +477,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); @@ -438,12 +489,27 @@ public class RenderHelperAO { boolean blocksGrassYZPP = !blockAccess.getBlock(x, y + 1, zGrass).getCanBlockGrass(); boolean blocksGrassYZNP = !blockAccess.getBlock(x, y - 1, zGrass).getCanBlockGrass(); - if (state.renderMaxZ < 1) - setupAOBrightnessZPos( - blockAccess, block, x, y, z, blocksGrassXZPP, blocksGrassXZNP, blocksGrassYZPP, blocksGrassYZNP); + if (state.renderMaxZ < 1) setupAOBrightnessZPos( + blockAccess, + block, + x, + y, + z, + blocksGrassXZPP, + blocksGrassXZNP, + blocksGrassYZPP, + blocksGrassYZNP); setupAOBrightnessZNeg( - blockAccess, block, x, y, z + 1, blocksGrassXZPP, blocksGrassXZNP, blocksGrassYZPP, blocksGrassYZNP); + blockAccess, + block, + x, + y, + z + 1, + blocksGrassXZPP, + blocksGrassXZNP, + blocksGrassYZPP, + blocksGrassYZNP); float zClamp = MathHelper.clamp_float((float) state.renderMaxZ, 0, 1); mixAOBrightnessLightValueZ(zClamp, 1 - zClamp); @@ -453,18 +519,18 @@ 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 @@ -532,8 +598,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); @@ -544,12 +610,27 @@ public class RenderHelperAO { boolean blocksGrassXZNN = !blockAccess.getBlock(xGrass, y, z - 1).getCanBlockGrass(); boolean blocksGrassXZNP = !blockAccess.getBlock(xGrass, y, z + 1).getCanBlockGrass(); - if (state.renderMinX > 0) - setupAOBrightnessXNeg( - blockAccess, block, x, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + if (state.renderMinX > 0) setupAOBrightnessXNeg( + blockAccess, + block, + x, + y, + z, + blocksGrassXYNP, + blocksGrassXYNN, + blocksGrassXZNN, + blocksGrassXZNP); setupAOBrightnessXPos( - blockAccess, block, x - 1, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + blockAccess, + block, + x - 1, + y, + z, + blocksGrassXYNP, + blocksGrassXYNN, + blocksGrassXZNN, + blocksGrassXZNP); float xClamp = MathHelper.clamp_float((float) state.renderMinX, 0, 1); mixAOBrightnessLightValueX(xClamp, 1 - xClamp); @@ -559,18 +640,18 @@ 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) @@ -638,8 +719,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); @@ -650,12 +731,27 @@ public class RenderHelperAO { boolean blocksGrassXZNN = !blockAccess.getBlock(xGrass, y, z - 1).getCanBlockGrass(); boolean blocksGrassXZNP = !blockAccess.getBlock(xGrass, y, z + 1).getCanBlockGrass(); - if (state.renderMaxX < 1) - setupAOBrightnessXPos( - blockAccess, block, x, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + if (state.renderMaxX < 1) setupAOBrightnessXPos( + blockAccess, + block, + x, + y, + z, + blocksGrassXYNP, + blocksGrassXYNN, + blocksGrassXZNN, + blocksGrassXZNP); setupAOBrightnessXNeg( - blockAccess, block, x + 1, y, z, blocksGrassXYNP, blocksGrassXYNN, blocksGrassXZNN, blocksGrassXZNP); + blockAccess, + block, + x + 1, + y, + z, + blocksGrassXYNP, + blocksGrassXYNN, + blocksGrassXZNN, + blocksGrassXZNP); float xClamp = MathHelper.clamp_float((float) state.renderMaxX, 0, 1); mixAOBrightnessLightValueX(xClamp, 1 - xClamp); @@ -665,18 +761,18 @@ 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) @@ -744,16 +840,8 @@ 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(); @@ -793,16 +881,8 @@ 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(); @@ -842,16 +922,8 @@ 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(); @@ -891,16 +963,8 @@ 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(); @@ -940,16 +1004,8 @@ 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(); @@ -989,16 +1045,8 @@ 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(); @@ -1220,31 +1268,20 @@ public class RenderHelperAO { 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; 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 3064925..881349f 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperLL.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/RenderHelperLL.java @@ -4,6 +4,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; public class RenderHelperLL { + private static final int TL = 0; private static final int BL = 1; private static final int BR = 2; @@ -16,44 +17,18 @@ public class RenderHelperLL { private static final int MINZ = 4; 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} - }, - }; + 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 } }, }; private RenderHelperState state; @@ -85,13 +60,15 @@ public class RenderHelperLL { case RenderHelper.ZNEG: case RenderHelper.ZPOS: if (state.rotateTransform == RenderHelperState.ROTATE180 - || state.rotateTransform == RenderHelperState.ROTATE90) state.flipTexture = !state.flipTexture; + || 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; + || state.rotateTransform == RenderHelperState.ROTATE270) + state.flipTexture = !state.flipTexture; drawFaceX(face, x, y, z, icon); break; } @@ -111,8 +88,8 @@ 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) @@ -173,13 +150,12 @@ public class RenderHelperLL { 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); + if (rotate == RenderHelperState.ROTATE180) 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); } @@ -190,13 +166,12 @@ public class RenderHelperLL { 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); + if (rotate == RenderHelperState.ROTATE180) 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); } @@ -254,20 +229,13 @@ public class RenderHelperLL { 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: - setUV(icon, 1 - minVDiv[ix], minUDiv[iy], 1 - maxVDiv[ix], maxUDiv[iy]); - break; - case RenderHelperState.ROTATE180: - setUV(icon, maxUDiv[ix], 1 - minVDiv[iy], minUDiv[ix], 1 - maxVDiv[iy]); - break; - case RenderHelperState.ROTATE270: - setUV(icon, 1 - maxVDiv[ix], maxUDiv[iy], 1 - minVDiv[ix], minUDiv[iy]); - break; - default: - setUV(icon, minUDiv[ix], 1 - maxVDiv[iy], maxUDiv[ix], 1 - minVDiv[iy]); - break; - }*/ + /* + * switch (rotate) { case RenderHelperState.ROTATE90: setUV(icon, 1 - minVDiv[ix], minUDiv[iy], 1 - + * maxVDiv[ix], maxUDiv[iy]); break; case RenderHelperState.ROTATE180: setUV(icon, maxUDiv[ix], 1 - + * minVDiv[iy], minUDiv[ix], 1 - maxVDiv[iy]); break; case RenderHelperState.ROTATE270: setUV(icon, 1 - + * maxVDiv[ix], maxUDiv[iy], 1 - minVDiv[ix], minUDiv[iy]); break; default: setUV(icon, minUDiv[ix], 1 - + * maxVDiv[iy], maxUDiv[ix], 1 - minVDiv[iy]); break; } + */ renderXYZUVAO(xyzuvMap[face], state.uvRotate[face]); @@ -384,8 +352,8 @@ 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); @@ -393,8 +361,8 @@ public class RenderHelperLL { 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; @@ -433,10 +401,10 @@ public class RenderHelperLL { for (int lr = 0; lr <= rangeLR; lr++) { 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++) { 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 2a0facb..162957f 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,17 @@ package com.jaquadro.minecraft.storagedrawers.util; 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}, - }; + 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 }, }; - 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}, - }; + 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 }, }; public double renderMinX; public double renderMinY; 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 aad1003..281fcb0 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/UniqueMetaIdentifier.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/UniqueMetaIdentifier.java @@ -1,14 +1,17 @@ package com.jaquadro.minecraft.storagedrawers.util; -import com.google.common.base.Objects; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import com.google.common.base.Objects; + +import cpw.mods.fml.common.registry.GameData; +import cpw.mods.fml.common.registry.GameRegistry; + public final class UniqueMetaIdentifier { + public final String modId; public final String name; public final int meta; 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 92377d8..ae5ea4e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/util/UniqueMetaRegistry.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/util/UniqueMetaRegistry.java @@ -3,9 +3,11 @@ package com.jaquadro.minecraft.storagedrawers.util; import java.util.HashMap; import java.util.Map; import java.util.Set; + import net.minecraftforge.oredict.OreDictionary; public class UniqueMetaRegistry { + private Map registry; public UniqueMetaRegistry() {