From 5715a32d2901922503fd850f3a68503fb77467c3 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Wed, 20 Dec 2017 23:39:49 +1000 Subject: - Disabled some logging. % Minor Project Clean-up, added missing Override annotations to 100+ methods & removed pointless casts. % Moved Logging to it's own class. $ Fixed Multi-block handling of Pollution. $ Fixed the GT 5.09 material enabler system. (From My Side, it's still borked on GTs). + Added a Dynamic Proxy invocation for IMaterialHandler. + Added an AutoMap data type, which is a Auto-incremental ID'd Hashmap wrapper. --- src/Java/gtPlusPlus/GTplusplus.java | 76 +++--- src/Java/gtPlusPlus/GTplusplus_Secondary.java | 8 +- .../api/analytics/AnalyticsLoggingPlugin.java | 10 +- .../gtPlusPlus/api/analytics/SegmentAnalytics.java | 4 +- src/Java/gtPlusPlus/api/objects/CSPRNG.java | 8 +- src/Java/gtPlusPlus/api/objects/Logger.java | 131 +++++++++ src/Java/gtPlusPlus/core/block/ModBlocks.java | 5 +- .../core/block/general/antigrief/TowerDevice.java | 4 +- .../block/machine/Machine_ModularityTable.java | 4 +- .../core/block/machine/Machine_ProjectTable.java | 4 +- .../core/block/machine/Machine_TradeTable.java | 4 +- .../core/block/machine/Machine_Workbench.java | 4 +- .../core/client/model/ModelStaballoyConstruct.java | 15 +- .../renderer/RenderMiningExplosivesPrimed.java | 6 +- .../core/client/renderer/RenderPotionthrow.java | 25 +- .../client/renderer/RenderStaballoyConstruct.java | 21 +- src/Java/gtPlusPlus/core/commands/CommandMath.java | 50 ++-- src/Java/gtPlusPlus/core/common/CommonProxy.java | 27 +- .../core/common/compat/COMPAT_Baubles.java | 6 +- .../core/container/Container_HeliumGenerator.java | 6 +- .../core/container/Container_ModularityTable.java | 21 +- .../core/container/Container_ProjectTable.java | 16 +- .../core/container/Container_TradeTable.java | 17 +- .../core/container/Container_Workbench.java | 40 +-- .../container/Container_WorkbenchAdvanced.java | 40 +-- .../core/entity/InternalEntityRegistry.java | 4 +- .../entity/monster/EntityStaballoyConstruct.java | 12 +- .../projectile/EntityHydrofluoricAcidPotion.java | 5 +- .../projectile/EntitySulfuricAcidPotion.java | 3 +- .../core/gui/machine/GUI_TradeTable.java | 6 +- src/Java/gtPlusPlus/core/handler/BookHandler.java | 4 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 4 +- src/Java/gtPlusPlus/core/handler/GuiHandler.java | 10 +- .../gtPlusPlus/core/handler/OldCircuitHandler.java | 8 +- .../handler/Recipes/LateRegistrationHandler.java | 6 +- .../core/handler/Recipes/RegistrationHandler.java | 4 +- .../core/handler/events/BlockEventHandler.java | 20 +- .../core/handler/events/LoginEventHandler.java | 11 +- .../events/PickaxeBlockBreakEventHandler.java | 10 +- .../core/handler/events/SneakManager.java | 4 +- .../handler/events/UnbreakableBlockManager.java | 50 ++-- .../events/ZombieBackupSpawnEventHandler.java | 8 +- .../workbench/Workbench_CraftingHandler.java | 4 +- .../inventories/InventoryWorkbenchHoloSlots.java | 14 +- src/Java/gtPlusPlus/core/item/ModItems.java | 35 +-- .../core/item/base/BaseItemDamageable.java | 6 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 6 +- src/Java/gtPlusPlus/core/item/base/CoreItem.java | 4 +- .../core/item/base/dusts/BaseItemDust.java | 34 +-- .../core/item/base/dusts/BaseItemDustUnique.java | 12 +- .../core/item/base/foods/BaseItemHotFood.java | 3 +- .../core/item/base/ingots/BaseItemIngot.java | 8 +- .../core/item/base/ingots/BaseItemIngotHot.java | 3 +- .../core/item/base/ingots/BaseItemIngot_OLD.java | 8 +- .../core/item/base/itemblock/ItemBlockNBT.java | 4 +- .../core/item/base/misc/BaseItemMisc.java | 4 +- .../core/item/base/rods/BaseItemRod.java | 4 +- .../core/item/base/rods/BaseItemRodLong.java | 4 +- .../core/item/base/screws/BaseItemScrew.java | 4 +- .../gtPlusPlus/core/item/bauble/ModularBauble.java | 8 +- .../core/item/general/ItemAreaClear.java | 4 +- .../core/item/general/ItemBlueprint.java | 12 +- .../core/item/general/ItemHealingDevice.java | 4 +- .../item/general/capture/ItemEntityCatcher.java | 58 ++-- .../throwables/ItemHydrofluoricAcidPotion.java | 1 + .../general/throwables/ItemSulfuricAcidPotion.java | 1 + .../gtPlusPlus/core/item/init/ItemsMultiTools.java | 4 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 13 +- .../core/item/tool/staballoy/StaballoyPickaxe.java | 34 +-- .../core/item/tool/staballoy/StaballoySpade.java | 30 +-- src/Java/gtPlusPlus/core/lib/LoadedMods.java | 92 +++---- src/Java/gtPlusPlus/core/material/Material.java | 85 +++--- .../core/material/MaterialGenerator.java | 5 +- src/Java/gtPlusPlus/core/proxy/ClientProxy.java | 13 +- .../core/recipe/Gregtech_Recipe_Adder.java | 4 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 54 ++-- .../gtPlusPlus/core/recipe/RECIPES_General.java | 10 +- .../core/recipe/RECIPES_LaserEngraver.java | 30 +-- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 4 +- .../core/recipe/RECIPES_MachineComponents.java | 8 +- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 8 +- .../core/recipe/RECIPES_Old_Circuits.java | 18 +- .../gtPlusPlus/core/recipe/RECIPES_Shapeless.java | 4 +- .../gtPlusPlus/core/recipe/ShapedRecipeObject.java | 4 +- src/Java/gtPlusPlus/core/recipe/common/CI.java | 7 +- src/Java/gtPlusPlus/core/slots/SlotBlueprint.java | 6 +- .../core/slots/SlotCraftingNoCollect.java | 11 +- src/Java/gtPlusPlus/core/slots/SlotGtTool.java | 6 +- .../gtPlusPlus/core/slots/SlotGtToolElectric.java | 6 +- .../core/slots/SlotModularBaubleUpgrades.java | 6 +- .../core/tileentities/ModTileEntities.java | 4 +- .../core/tileentities/base/TileEntityBase.java | 10 +- .../tileentities/general/TileEntityFishTrap.java | 12 +- .../general/TileEntityInfiniteFluid.java | 14 +- .../general/TileEntityXpConverter.java | 38 +-- .../machines/TileEntityModularityTable.java | 17 +- .../machines/TileEntityProjectTable.java | 42 +-- src/Java/gtPlusPlus/core/util/Utils.java | 141 +++------- src/Java/gtPlusPlus/core/util/array/AutoMap.java | 77 ++++++ .../core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 4 +- .../core/util/debug/DEBUG_TimerThread.java | 10 +- .../core/util/enchanting/EnchantingUtils.java | 6 +- .../gtPlusPlus/core/util/fluid/FluidUtils.java | 29 +- src/Java/gtPlusPlus/core/util/geo/GeoUtils.java | 14 +- .../gregtech/recipehandlers/GregtechRecipe.java | 14 +- .../core/util/inventory/InventoryUtils.java | 10 +- src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 47 ++-- .../core/util/materials/MaterialUtils.java | 28 +- src/Java/gtPlusPlus/core/util/math/MathUtils.java | 7 +- .../core/util/nbt/ModularArmourUtils.java | 4 +- src/Java/gtPlusPlus/core/util/nbt/NBTUtils.java | 8 +- .../core/util/networking/NetworkUtils.java | 12 +- .../gtPlusPlus/core/util/player/PlayerCache.java | 16 +- .../gtPlusPlus/core/util/player/PlayerUtils.java | 2 +- .../gtPlusPlus/core/util/player/UtilsMining.java | 18 +- .../gtPlusPlus/core/util/recipe/RecipeUtils.java | 140 +++++----- .../core/util/recipe/shapeless/ShapelessUtils.java | 6 +- .../core/util/reflect/ReflectionUtils.java | 44 +++- src/Java/gtPlusPlus/core/util/wrapper/var.java | 4 +- .../darkworld/biome/BiomeGenerator_Custom.java | 37 ++- .../world/darkworld/biome/Biome_DarkWorld.java | 4 +- .../block/blockDarkWorldPollutedDirt.java | 4 +- .../world/darkworld/chunk/ChunkProviderModded.java | 6 +- .../world/darkworld/gen/WorldGenDeadLilly.java | 4 +- .../darkworld/gen/WorldGenMinable_Custom.java | 34 +-- src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java | 2 +- .../preloader/asm/Preloader_ClassTransformer.java | 5 +- .../preloader/asm/Preloader_DummyContainer.java | 8 +- .../xmod/bop/blocks/base/LeavesBase.java | 3 +- .../xmod/bop/blocks/base/SaplingBase.java | 19 +- .../blocks/rainforest/SaplingRainforestTree.java | 4 +- .../features/trees/WorldGenRainForestTree_Ex.java | 30 +-- src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 4 +- .../forestry/bees/custom/GTPP_Bee_Definition.java | 30 +-- .../xmod/forestry/bees/custom/GTPP_Bees.java | 72 ++--- .../bees/custom/GTPP_Branch_Definition.java | 18 +- .../bees/inventory/InventoryDenseBeeHouse.java | 12 +- .../xmod/forestry/trees/TreefarmManager.java | 6 +- .../interfaces/internal/Interface_ToolStats.java | 1 + .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 5 +- .../gregtech/api/items/tools/GT_MetaGenTool.java | 5 + .../GT_MetaTileEntity_DeluxeMachine.java | 38 +-- .../GT_MetaTileEntity_DeluxeTank.java | 4 +- .../GT_MetaTileEntity_Hatch_InputBattery.java | 13 +- .../GT_MetaTileEntity_Hatch_OutputBattery.java | 14 +- .../base/GregtechMetaPipeEntityBase_Cable.java | 6 +- .../base/GregtechMeta_MultiBlockBase.java | 67 +++-- .../GregtechDoubleFuelGeneratorBase.java | 88 +++---- .../base/machines/GregtechMetaSafeBlockBase.java | 30 +-- .../api/world/GTPP_Worldgen_GT_Ore_Layer.java | 11 +- .../xmod/gregtech/common/Meta_GT_Proxy.java | 4 +- .../common/blocks/fluid/GregtechFluidHandler.java | 13 +- .../common/blocks/textures/TexturesGtBlock.java | 6 +- .../common/blocks/textures/TexturesGtTools.java | 4 +- .../gregtech/common/helpers/ChargingHelper.java | 53 ++-- .../gregtech/common/helpers/CraftingHelper.java | 4 +- .../gregtech/common/helpers/TreeFarmHelper.java | 20 +- .../helpers/autocrafter/AC_Helper_Container.java | 16 +- .../helpers/autocrafter/AC_Helper_Utils.java | 10 +- .../common/helpers/tesseract/TesseractHelper.java | 34 +-- .../common/items/MetaGeneratedGregtechItems.java | 5 +- .../GT_MetaTileEntity_TesseractGenerator.java | 18 +- .../generators/GT_MetaTileEntity_Boiler_Base.java | 4 +- .../GT_MetaTileEntity_SemiFluidGenerator.java | 25 +- .../GregtechMetaTileEntitySolarGenerator.java | 8 +- .../generators/GregtechMetaTileEntity_RTG.java | 10 +- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 14 +- .../GregtechMetaAtmosphericReconditioner.java | 28 +- .../basic/GregtechMetaPollutionCreator.java | 3 +- .../basic/GregtechMetaPollutionDetector.java | 4 +- ...regtechMetaTileEntity_CompactFusionReactor.java | 61 ++--- .../machines/multi/GT4Entity_AutoCrafter.java | 18 +- .../machines/multi/GT4Entity_ThermalBoiler.java | 4 +- .../machines/multi/GregtechMTE_NuclearReactor.java | 96 +++---- .../multi/GregtechMetaTileEntityAnimalFarm.java | 60 ++--- .../GregtechMetaTileEntityGeneratorArray.java | 41 +-- .../multi/GregtechMetaTileEntityTreeFarm.java | 139 +++++----- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 6 +- .../GregtechMetaTileEntity_CatalyticReactor.java | 54 ++-- .../multi/GregtechMetaTileEntity_Cyclotron.java | 26 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 38 +-- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 14 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 20 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 4 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 22 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 4 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 82 +++--- .../GregtechMetaTileEntity_IndustrialSinter.java | 22 +- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 34 ++- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 32 +-- .../GregtechMetaTileEntity_IndustrialWireMill.java | 22 +- .../GregtechMetaTileEntity_MassFabricator.java | 56 ++-- .../multi/GregtechMetaTileEntity_MultiTank.java | 73 +++--- ...chMetaTileEntity_PowerSubStationController.java | 79 +++--- .../multi/GregtechMetaTileEntity_Refinery.java | 52 ++-- .../storage/GregtechMetaEnergyBuffer.java | 6 +- .../common/tools/TOOL_Gregtech_Choocher.java | 1 + .../xmod/gregtech/loaders/GT_Material_Loader.java | 292 +++++++++++++++++++++ .../xmod/gregtech/loaders/Gregtech_Blocks.java | 8 +- .../loaders/ProcessingToolHeadChoocher.java | 16 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 60 ++--- .../loaders/RecipeGen_BlastSmelterGT_Ex.java | 5 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 58 ++-- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 32 +-- .../xmod/gregtech/loaders/RecipeGen_Fluids.java | 42 +-- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 24 +- .../xmod/gregtech/loaders/RecipeGen_Recycling.java | 88 ++++--- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 44 ++-- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 153 +++++------ .../recipes/machines/RECIPEHANDLER_CokeOven.java | 52 ++-- .../recipes/machines/RECIPEHANDLER_Dehydrator.java | 52 ++-- .../machines/RECIPEHANDLER_MatterFabricator.java | 52 ++-- .../registration/gregtech/Gregtech4Content.java | 10 +- .../gregtech/GregtechAdvancedBoilers.java | 4 +- .../gregtech/GregtechAdvancedMixer.java | 6 +- .../gregtech/GregtechComponentAssembler.java | 4 +- .../registration/gregtech/GregtechConduits.java | 33 +-- .../registration/gregtech/GregtechCyclotron.java | 4 +- .../registration/gregtech/GregtechDehydrator.java | 4 +- .../gregtech/GregtechEnergyBuffer.java | 4 +- .../GregtechGeothermalThermalGenerator.java | 4 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 4 +- .../gregtech/GregtechIndustrialCentrifuge.java | 4 +- .../gregtech/GregtechIndustrialCokeOven.java | 4 +- .../gregtech/GregtechIndustrialCuttingFactory.java | 4 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 4 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 4 +- .../gregtech/GregtechIndustrialGeneratorArray.java | 4 +- .../gregtech/GregtechIndustrialMacerator.java | 4 +- .../gregtech/GregtechIndustrialMassFabricator.java | 4 +- .../gregtech/GregtechIndustrialMultiTank.java | 4 +- .../gregtech/GregtechIndustrialPlatePress.java | 4 +- .../gregtech/GregtechIndustrialSifter.java | 4 +- .../GregtechIndustrialThermalCentrifuge.java | 4 +- .../gregtech/GregtechIndustrialTreeFarm.java | 4 +- .../gregtech/GregtechIndustrialWashPlant.java | 4 +- .../gregtech/GregtechIndustrialWiremill.java | 4 +- .../gregtech/GregtechIronBlastFurnace.java | 4 +- .../registration/gregtech/GregtechLFTR.java | 4 +- .../gregtech/GregtechMiniRaFusion.java | 4 +- .../gregtech/GregtechNitroDieselFix.java | 35 +-- .../gregtech/GregtechPollutionDevices.java | 4 +- .../gregtech/GregtechPowerSubStation.java | 4 +- .../registration/gregtech/GregtechRTG.java | 4 +- .../gregtech/GregtechRocketFuelGenerator.java | 4 +- .../registration/gregtech/GregtechSafeBlock.java | 4 +- .../gregtech/GregtechSolarGenerators.java | 4 +- .../gregtech/GregtechSteamCondenser.java | 4 +- .../gregtech/GregtechTieredFluidTanks.java | 8 +- .../gregtech/GregtechTreeFarmerTE.java | 4 +- .../gregtech/GregtechWirelessChargers.java | 3 +- .../gregtech/NewHorizonsAccelerator.java | 4 +- .../xmod/growthcraft/fishtrap/FishTrapHandler.java | 10 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 16 +- .../gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java | 8 +- .../thaumcraft/common/ItemBlockThaumcraft.java | 1 + .../thaumcraft/common/tile/TCTileEntities.java | 4 +- .../xmod/thermalfoundation/HANDLER_TF.java | 12 +- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 18 +- .../recipe/TF_Gregtech_Recipes.java | 12 +- 260 files changed, 2982 insertions(+), 2447 deletions(-) create mode 100644 src/Java/gtPlusPlus/api/objects/Logger.java create mode 100644 src/Java/gtPlusPlus/core/util/array/AutoMap.java create mode 100644 src/Java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 22727fa130..6480a764a6 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -1,6 +1,5 @@ package gtPlusPlus; -import static gtPlusPlus.core.lib.CORE.DEBUG; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableUpdateChecker; @@ -18,9 +17,9 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Materials; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; import gtPlusPlus.api.analytics.SegmentAnalytics; import gtPlusPlus.api.analytics.SegmentHelper; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.commands.CommandMath; import gtPlusPlus.core.common.CommonProxy; @@ -39,6 +38,7 @@ import gtPlusPlus.core.util.player.PlayerUtils; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; +import gtPlusPlus.xmod.gregtech.loaders.GT_Material_Loader; import net.minecraft.item.Item; import net.minecraft.launchwrapper.Launch; import net.minecraftforge.oredict.OreDictionary; @@ -50,9 +50,12 @@ public class GTplusplus implements ActionListener { //Mod Instance @Mod.Instance(CORE.MODID) public static GTplusplus instance; + + //Material Loader + public static GT_Material_Loader mGregMatLoader; //GT_Proxy instance - protected static Meta_GT_Proxy gregtechproxy; + protected static Meta_GT_Proxy mGregProxy; //GT++ Proxy Instances @SidedProxy(clientSide = "gtPlusPlus.core.proxy.ClientProxy", serverSide = "gtPlusPlus.core.proxy.ServerProxy") @@ -61,18 +64,18 @@ public class GTplusplus implements ActionListener { // Loads Textures @SideOnly(value = Side.CLIENT) public static void loadTextures() { - Utils.LOG_INFO("Loading some textures on the client."); + Logger.INFO("Loading some textures on the client."); // Tools - Utils.LOG_WARNING("Processing texture: " + TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath()); + Logger.WARNING("Processing texture: " + TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath()); // Blocks - Utils.LOG_WARNING("Processing texture: " + TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile().getResourcePath()); + Logger.WARNING("Processing texture: " + TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile().getResourcePath()); } // Pre-Init @Mod.EventHandler public void preInit(final FMLPreInitializationEvent event) { - Utils.LOG_INFO("Loading " + CORE.name + " V" + CORE.VERSION); + Logger.INFO("Loading " + CORE.name + " V" + CORE.VERSION); if(!Utils.isServer()){ @@ -82,6 +85,7 @@ public class GTplusplus implements ActionListener { //Give this a go mate. initAnalytics(); setupMaterialBlacklist(); + setupMaterialWhitelist(); //HTTP Requests CORE.MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); @@ -93,13 +97,13 @@ public class GTplusplus implements ActionListener { //Check for Dev CORE.DEVENV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); if (enableUpdateChecker){ - Utils.LOG_INFO("Latest is " + CORE.MASTER_VERSION + ". Updated? " + Utils.isModUpToDate()); + Logger.INFO("Latest is " + CORE.MASTER_VERSION + ". Updated? " + Utils.isModUpToDate()); } //Utils.LOG_INFO("User's Country: " + CORE.USER_COUNTRY); // FirstCall(); Utils.registerEvent(new LoginEventHandler()); - Utils.LOG_INFO("Login Handler Initialized"); + Logger.INFO("Login Handler Initialized"); @@ -113,7 +117,7 @@ public class GTplusplus implements ActionListener { proxy.registerNetworkStuff(); //Set Variables for Fluorite Block handling - Utils.LOG_INFO("Setting some Variables for the block break event handler."); + Logger.INFO("Setting some Variables for the block break event handler."); BlockEventHandler.oreLimestone = OreDictionary.getOres("oreLimestone"); BlockEventHandler.blockLimestone = OreDictionary.getOres("limestone"); BlockEventHandler.fluoriteOre = ItemUtils.getSimpleStack(Item.getItemFromBlock(ModBlocks.blockOreFluorite)); @@ -124,19 +128,12 @@ public class GTplusplus implements ActionListener { @Mod.EventHandler public void postInit(final FMLPostInitializationEvent event) { proxy.postInit(event); - - if (DEBUG) { - this.dumpGtRecipeMap(Gregtech_Recipe_Map.sChemicalDehydratorRecipes); - this.dumpGtRecipeMap(Gregtech_Recipe_Map.sCokeOvenRecipes); - this.dumpGtRecipeMap(Gregtech_Recipe_Map.sMatterFab2Recipes); - this.dumpGtRecipeMap(Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes); - } BookHandler.runLater(); - Utils.LOG_INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); - Utils.LOG_INFO("| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess + " | Failed: " + Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); + Logger.INFO("| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess + " | Failed: " + RegistrationHandler.recipesFailed + " |"); - Utils.LOG_INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); - Utils.LOG_INFO("Finally, we are finished. Have some cripsy bacon as a reward."); + Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); + Logger.INFO("Finally, we are finished. Have some cripsy bacon as a reward."); } @EventHandler @@ -153,11 +150,9 @@ public class GTplusplus implements ActionListener { public void serverStopping(final FMLServerStoppingEvent event) { //Flush all data to Server at the end of the day. if (SegmentAnalytics.sAnalyticsMasterList.size() > 0){ - int i=0; for (SegmentAnalytics sa : SegmentAnalytics.sAnalyticsMasterList.values()){ sa.flushDataFinal(); SegmentAnalytics.LOG("Cleaned up Analytics Data for player "+sa.mLocalName+"."); - i++; } } @@ -170,16 +165,16 @@ public class GTplusplus implements ActionListener { protected void dumpGtRecipeMap(final GT_Recipe_Map r) { final Collection x = r.mRecipeList; - Utils.LOG_INFO("Dumping " + r.mUnlocalizedName + " Recipes for Debug."); + Logger.INFO("Dumping " + r.mUnlocalizedName + " Recipes for Debug."); for (final GT_Recipe newBo : x) { - Utils.LOG_INFO("========================"); - Utils.LOG_INFO("Dumping Input: " + ItemUtils.getArrayStackNames(newBo.mInputs)); - Utils.LOG_INFO("Dumping Inputs " + ItemUtils.getFluidArrayStackNames(newBo.mFluidInputs)); - Utils.LOG_INFO("Dumping Duration: " + newBo.mDuration); - Utils.LOG_INFO("Dumping EU/t: " + newBo.mEUt); - Utils.LOG_INFO("Dumping Output: " + ItemUtils.getArrayStackNames(newBo.mOutputs)); - Utils.LOG_INFO("Dumping Output: " + ItemUtils.getFluidArrayStackNames(newBo.mFluidOutputs)); - Utils.LOG_INFO("========================"); + Logger.INFO("========================"); + Logger.INFO("Dumping Input: " + ItemUtils.getArrayStackNames(newBo.mInputs)); + Logger.INFO("Dumping Inputs " + ItemUtils.getFluidArrayStackNames(newBo.mFluidInputs)); + Logger.INFO("Dumping Duration: " + newBo.mDuration); + Logger.INFO("Dumping EU/t: " + newBo.mEUt); + Logger.INFO("Dumping Output: " + ItemUtils.getArrayStackNames(newBo.mOutputs)); + Logger.INFO("Dumping Output: " + ItemUtils.getFluidArrayStackNames(newBo.mFluidOutputs)); + Logger.INFO("========================"); } } @@ -188,8 +183,7 @@ public class GTplusplus implements ActionListener { SegmentAnalytics.isEnabled = CORE.ConfigSwitches.enableUpdateChecker; if (!Utils.isServer() && PlayerUtils.isPlayerAlkalus()){ SegmentAnalytics.isEnabled = true; - } - + } new SegmentHelper(); } @@ -222,4 +216,18 @@ public class GTplusplus implements ActionListener { return false; } + + private void setupMaterialWhitelist() { + + mGregMatLoader = new GT_Material_Loader(); + + //Non GTNH Materials + if (!CORE.GTNH){ + //Mithril - Random Dungeon Loot + mGregMatLoader.enableMaterial(Materials.Mithril); + } + + //Force - Alloying + mGregMatLoader.enableMaterial(Materials.Force); + } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/GTplusplus_Secondary.java b/src/Java/gtPlusPlus/GTplusplus_Secondary.java index 0b6506095e..e3bdb89c3a 100644 --- a/src/Java/gtPlusPlus/GTplusplus_Secondary.java +++ b/src/Java/gtPlusPlus/GTplusplus_Secondary.java @@ -10,8 +10,8 @@ import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; import gtPlusPlus.core.world.darkworld.biome.Biome_DarkWorld; import gtPlusPlus.core.world.darkworld.block.blockDarkWorldGround; @@ -47,7 +47,7 @@ public class GTplusplus_Secondary implements IFuelHandler, IWorldGenerator{ @EventHandler public void load(final FMLInitializationEvent e) { - Utils.LOG_INFO("Begin resource allocation for " + MODID2 + " V" + VERSION2); + Logger.INFO("Begin resource allocation for " + MODID2 + " V" + VERSION2); //Load Dark World and Biome GameRegistry.registerFuelHandler(this); @@ -60,7 +60,7 @@ public class GTplusplus_Secondary implements IFuelHandler, IWorldGenerator{ // Pre-Init @Mod.EventHandler public void preInit(final FMLPreInitializationEvent event) { - Utils.LOG_INFO("Loading " + MODID2 + " V" + VERSION2); + Logger.INFO("Loading " + MODID2 + " V" + VERSION2); //Setup setVars(); @@ -129,7 +129,7 @@ public class GTplusplus_Secondary implements IFuelHandler, IWorldGenerator{ @EventHandler public static void postInit(final FMLPostInitializationEvent e) { - Utils.LOG_INFO("Finished loading Dark World plugin for GT++."); + Logger.INFO("Finished loading Dark World plugin for GT++."); } } diff --git a/src/Java/gtPlusPlus/api/analytics/AnalyticsLoggingPlugin.java b/src/Java/gtPlusPlus/api/analytics/AnalyticsLoggingPlugin.java index ff7d050a9e..2423eaa65c 100644 --- a/src/Java/gtPlusPlus/api/analytics/AnalyticsLoggingPlugin.java +++ b/src/Java/gtPlusPlus/api/analytics/AnalyticsLoggingPlugin.java @@ -6,7 +6,7 @@ import com.segment.analytics.Log; import com.segment.analytics.Plugin; import com.segment.analytics.messages.Message; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; /** * A {@link Plugin} implementation that redirects client logs to standard output and logs callback @@ -16,22 +16,22 @@ public class AnalyticsLoggingPlugin implements Plugin { @Override public void configure(Analytics.Builder builder) { builder.log(new Log() { @Override public void print(Level level, String format, Object... args) { - Utils.LOG_WARNING(level + ":\t" + String.format(format, args)); + Logger.WARNING(level + ":\t" + String.format(format, args)); } @Override public void print(Level level, Throwable error, String format, Object... args) { - Utils.LOG_WARNING(level + ":\t" + String.format(format, args)); + Logger.WARNING(level + ":\t" + String.format(format, args)); //Utils.LOG_WARNING(error); } }); builder.callback(new Callback() { @Override public void success(Message message) { - Utils.LOG_WARNING("Uploaded " + message); + Logger.WARNING("Uploaded " + message); } @Override public void failure(Message message, Throwable throwable) { - Utils.LOG_WARNING("Could not upload " + message); + Logger.WARNING("Could not upload " + message); //Utils.LOG_WARNING(throwable); } }); diff --git a/src/Java/gtPlusPlus/api/analytics/SegmentAnalytics.java b/src/Java/gtPlusPlus/api/analytics/SegmentAnalytics.java index cdd38fd374..c4ef82b9ef 100644 --- a/src/Java/gtPlusPlus/api/analytics/SegmentAnalytics.java +++ b/src/Java/gtPlusPlus/api/analytics/SegmentAnalytics.java @@ -10,6 +10,8 @@ import java.util.concurrent.Phaser; import com.mojang.authlib.GameProfile; import com.segment.analytics.Analytics; + +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.Utils; @@ -212,7 +214,7 @@ public class SegmentAnalytics { // Non-Dev Comments public static void LOG(final String s) { if (CORE.DEBUG){ - Utils.getLogger().info("[Analytics] "+s); + Logger.getLogger().info("[Analytics] "+s); } } diff --git a/src/Java/gtPlusPlus/api/objects/CSPRNG.java b/src/Java/gtPlusPlus/api/objects/CSPRNG.java index 6b78eaccfc..e55a650b67 100644 --- a/src/Java/gtPlusPlus/api/objects/CSPRNG.java +++ b/src/Java/gtPlusPlus/api/objects/CSPRNG.java @@ -34,14 +34,13 @@ */ package gtPlusPlus.api.objects; +import java.math.BigInteger; +import java.security.SecureRandom; import java.util.Random; import gtPlusPlus.api.interfaces.IRandomGenerator; import gtPlusPlus.core.util.Utils; -import java.security.SecureRandom; -import java.math.BigInteger; - /** * The Blum-Blum-Shub random number generator. * @@ -205,7 +204,8 @@ public class CSPRNG extends Random implements IRandomGenerator { * * @return int */ - public int next(int numBits) { + @Override + public int next(int numBits) { // TODO: find out how many LSB one can extract per cycle. // it is more than one. int result = 0; diff --git a/src/Java/gtPlusPlus/api/objects/Logger.java b/src/Java/gtPlusPlus/api/objects/Logger.java new file mode 100644 index 0000000000..44657d337a --- /dev/null +++ b/src/Java/gtPlusPlus/api/objects/Logger.java @@ -0,0 +1,131 @@ +package gtPlusPlus.api.objects; + +import org.apache.logging.log4j.LogManager; + +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.relauncher.FMLRelaunchLog; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.proxy.ClientProxy; + +public class Logger { + + // Logging Functions + public static final org.apache.logging.log4j.Logger modLogger = Logger.makeLogger(); + + // Generate GT++ Logger + public static org.apache.logging.log4j.Logger makeLogger() { + final org.apache.logging.log4j.Logger gtPlusPlusLogger = LogManager.getLogger("GT++"); + return gtPlusPlusLogger; + } + + public static final org.apache.logging.log4j.Logger getLogger(){ + return modLogger; + } + + // Non-Dev Comments + public static void INFO(final String s) { + modLogger.info(s); + } + + // Non-Dev Comments + public static void MACHINE_INFO(final String s) { + + boolean localPlayer = false; + try { + if (ClientProxy.playerName != null){ + if (ClientProxy.playerName.toLowerCase().contains("draknyte1")){ + localPlayer = true; + } + } + } + catch (final Throwable t){ + + } + + if (CORE.ConfigSwitches.MACHINE_INFO || localPlayer) { + final String name1 = gtPlusPlus.core.util.reflect.ReflectionUtils.getMethodName(2); + modLogger.info("Machine Info: " + s + " | " + name1); + } + } + + // Developer Comments + public static void WARNING(final String s) { + if (CORE.DEBUG) { + modLogger.warn(s); + } + } + + // Errors + public static void ERROR(final String s) { + if (CORE.DEBUG) { + modLogger.fatal(s); + } + } + + // Developer Logger + public static void SPECIFIC_WARNING(final String whatToLog, final String msg, final int line) { + // if (!CORE.DEBUG){ + FMLLog.warning("GT++ |" + line + "| " + whatToLog + " | " + msg); + // } + } + + // ASM Comments + public static void LOG_ASM(final String s) { + FMLRelaunchLog.info("", s); + } + + + + + + + + + + + /** + * Special Loggers + */ + + /** + * Special Logger for Bee related content + */ + public static void BEES(final String s) { + modLogger.info("[Bees] "+s); + } + /** + * Special Logger for Debugging Bee related content + */ + public static void DEBUG_BEES(final String s) { + if (CORE.DEVENV || CORE.DEBUG) + modLogger.info("[Debug][Bees] "+s); + } + + + + /** + * Special Logger for Materials related content + */ + public static void MATERIALS(final String s) { + modLogger.info("[Materials] "+s); + } + /** + * Special Logger for Debugging Materials related content + */ + public static void DEBUG_MATERIALS(final String s) { + if (CORE.DEVENV || CORE.DEBUG) + modLogger.info("[Debug][Materials] "+s); + } + + /** + * Special Logger for Bee related content + */ + public static void REFLECTION(final String s) { + if (CORE.DEVENV || CORE.DEBUG) + modLogger.info("[Reflection] "+s); + } + + + + +} diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java index 81d3a84dc9..cbd21a8888 100644 --- a/src/Java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.block; import cpw.mods.fml.common.registry.GameRegistry; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseOre; import gtPlusPlus.core.block.general.BlockCompressedObsidian; @@ -66,7 +67,7 @@ public final class ModBlocks { public static Block blockNet; public static void init() { - Utils.LOG_INFO("Initializing Blocks."); + Logger.INFO("Initializing Blocks."); //blockGriefSaver = new TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault"); registerBlocks(); @@ -74,7 +75,7 @@ public final class ModBlocks { public static void registerBlocks(){ - Utils.LOG_INFO("Registering Blocks."); + Logger.INFO("Registering Blocks."); GameRegistry.registerBlock(MatterFabricatorEffectBlock = new LightGlass(Material.glass, false).setHardness(0.1F).setBlockTextureName(CORE.MODID + ":" + "blockMFEffect").setStepSound(Block.soundTypeGlass), "blockMFEffect"); //Fluids diff --git a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java index 8ac4e2df8d..ea3d9c3ee9 100644 --- a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java +++ b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java @@ -7,10 +7,10 @@ import java.util.Random; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityReverter; -import gtPlusPlus.core.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -266,7 +266,7 @@ public class TowerDevice extends Block { public TileEntity createTileEntity(final World world, final int metadata) { if (metadata == 0) { - Utils.LOG_INFO("I have been created. [Antigriefer]"+this.getLocalizedName()); + Logger.INFO("I have been created. [Antigriefer]"+this.getLocalizedName()); return new TileEntityReverter(); } return null; diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java index 1b4c5ebd01..bd41980325 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java @@ -5,10 +5,10 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable; -import gtPlusPlus.core.util.Utils; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -70,7 +70,7 @@ public class Machine_ModularityTable extends BlockContainer final TileEntity te = world.getTileEntity(x, y, z); if ((te != null) && (te instanceof TileEntityModularityTable)){ player.openGui(GTplusplus.instance, 1, world, x, y, z); - Utils.LOG_INFO("Player opened GUI"); + Logger.INFO("Player opened GUI"); return true; } return false; diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java index 939015adf7..712d32aba7 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java @@ -6,11 +6,11 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.player.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import ic2.core.item.tool.ItemToolWrench; @@ -95,7 +95,7 @@ public class Machine_ProjectTable extends BlockContainer player.openGui(GTplusplus.instance, 0, world, x, y, z); return true; } - Utils.LOG_INFO("Holding a Wrench, doing wrench things instead."); + Logger.INFO("Holding a Wrench, doing wrench things instead."); } return false; } diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java index 724b438b13..4cad0977ed 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java @@ -3,10 +3,10 @@ package gtPlusPlus.core.block.machine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.base.BlockBaseNBT; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable; -import gtPlusPlus.core.util.Utils; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EnumCreatureType; @@ -55,7 +55,7 @@ public class Machine_TradeTable extends BlockBaseNBT return true; } else { - Utils.LOG_INFO("Bad TE"); + Logger.INFO("Bad TE"); } return false; } diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java index b5c54ad9a8..06df4ca480 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java @@ -6,11 +6,11 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.player.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import ic2.core.item.tool.ItemToolWrench; @@ -95,7 +95,7 @@ public class Machine_Workbench extends BlockContainer player.openGui(GTplusplus.instance, 3, world, x, y, z); return true; } - Utils.LOG_INFO("Holding a Wrench, doing wrench things instead."); + Logger.INFO("Holding a Wrench, doing wrench things instead."); } return false; } diff --git a/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java b/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java index ab56e11a9a..72693e3de7 100644 --- a/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java +++ b/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java @@ -65,7 +65,8 @@ public class ModelStaballoyConstruct extends ModelIronGolem /** * Sets the models various rotation angles then renders the model. */ - public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_) + @Override + public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_) { this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_); this.ironGolemHead.render(p_78088_7_); @@ -81,7 +82,8 @@ public class ModelStaballoyConstruct extends ModelIronGolem * and legs, where par1 represents the time(so that arms and legs swing back and forth) and par2 represents how * "far" arms and legs can swing at most. */ - public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_) + @Override + public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_) { this.ironGolemHead.rotateAngleY = p_78087_4_ / (180F / (float)Math.PI); this.ironGolemHead.rotateAngleX = p_78087_5_ / (180F / (float)Math.PI); @@ -95,15 +97,16 @@ public class ModelStaballoyConstruct extends ModelIronGolem * Used for easily adding entity-dependent animations. The second and third float params here are the same second * and third as in the setRotationAngles method. */ - public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_) + @Override + public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_) { EntityIronGolem entityirongolem = (EntityIronGolem)p_78086_1_; int i = entityirongolem.getAttackTimer(); if (i > 0) { - this.ironGolemRightArm.rotateAngleX = -2.0F + 1.5F * this.func_78172_a((float)i - p_78086_4_, 10.0F); - this.ironGolemLeftArm.rotateAngleX = -2.0F + 1.5F * this.func_78172_a((float)i - p_78086_4_, 10.0F); + this.ironGolemRightArm.rotateAngleX = -2.0F + 1.5F * this.func_78172_a(i - p_78086_4_, 10.0F); + this.ironGolemLeftArm.rotateAngleX = -2.0F + 1.5F * this.func_78172_a(i - p_78086_4_, 10.0F); } else { @@ -111,7 +114,7 @@ public class ModelStaballoyConstruct extends ModelIronGolem if (j > 0) { - this.ironGolemRightArm.rotateAngleX = -0.8F + 0.025F * this.func_78172_a((float)j, 70.0F); + this.ironGolemRightArm.rotateAngleX = -0.8F + 0.025F * this.func_78172_a(j, 70.0F); this.ironGolemLeftArm.rotateAngleX = 0.0F; } else diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java b/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java index bbbde96c8e..42071428a7 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java +++ b/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java @@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.util.Utils; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; @@ -19,7 +19,7 @@ public class RenderMiningExplosivesPrimed extends Render { public RenderMiningExplosivesPrimed(){ this.shadowSize = 0.5F; - Utils.LOG_INFO("Rendering Mining Explosion. 1"); + Logger.INFO("Rendering Mining Explosion. 1"); } /** @@ -29,7 +29,7 @@ public class RenderMiningExplosivesPrimed extends Render { * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that. */ public void doRender(final EntityTNTPrimed entity, final double p_76986_2_, final double p_76986_4_, final double p_76986_6_, final float p_76986_8_, final float p_76986_9_){ - Utils.LOG_INFO("Rendering Mining Explosion. 2"); + Logger.INFO("Rendering Mining Explosion. 2"); GL11.glPushMatrix(); GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); float f2; diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java b/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java index 378d03f1df..e86a3fa7ab 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java +++ b/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.client.renderer; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.Tessellator; @@ -12,8 +15,6 @@ import net.minecraft.item.ItemPotion; import net.minecraft.potion.PotionHelper; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; @SideOnly(Side.CLIENT) public class RenderPotionthrow extends Render @@ -38,7 +39,8 @@ public class RenderPotionthrow extends Render * (Render> 16 & 255) / 255.0F; - float f3 = (float)(i >> 8 & 255) / 255.0F; - float f4 = (float)(i & 255) / 255.0F; + float f2 = (i >> 16 & 255) / 255.0F; + float f3 = (i >> 8 & 255) / 255.0F; + float f4 = (i & 255) / 255.0F; GL11.glColor3f(f2, f3, f4); GL11.glPushMatrix(); this.func_77026_a(tessellator, ItemPotion.func_94589_d("overlay")); @@ -73,7 +75,8 @@ public class RenderPotionthrow extends Render /** * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture. */ - protected ResourceLocation getEntityTexture(Entity p_110775_1_) + @Override + protected ResourceLocation getEntityTexture(Entity p_110775_1_) { return TextureMap.locationItemsTexture; } @@ -91,10 +94,10 @@ public class RenderPotionthrow extends Render GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); p_77026_1_.startDrawingQuads(); p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.addVertexWithUV((double)(0.0F - f5), (double)(0.0F - f6), 0.0D, (double)f, (double)f3); - p_77026_1_.addVertexWithUV((double)(f4 - f5), (double)(0.0F - f6), 0.0D, (double)f1, (double)f3); - p_77026_1_.addVertexWithUV((double)(f4 - f5), (double)(f4 - f6), 0.0D, (double)f1, (double)f2); - p_77026_1_.addVertexWithUV((double)(0.0F - f5), (double)(f4 - f6), 0.0D, (double)f, (double)f2); + p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); + p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); + p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); + p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); p_77026_1_.draw(); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java b/src/Java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java index 20a3a0b2f4..8de64eef26 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java +++ b/src/Java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.client.renderer; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.client.model.ModelStaballoyConstruct; @@ -8,13 +11,9 @@ import gtPlusPlus.core.lib.CORE; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; @SideOnly(Side.CLIENT) public class RenderStaballoyConstruct extends RenderLiving { @@ -37,7 +36,7 @@ public class RenderStaballoyConstruct extends RenderLiving { */ public void doRender(EntityStaballoyConstruct p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { - super.doRender((EntityLiving) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); + super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); } /** @@ -51,7 +50,7 @@ public class RenderStaballoyConstruct extends RenderLiving { protected void rotateCorpse(EntityStaballoyConstruct p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_) { super.rotateCorpse(p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_); - if ((double) p_77043_1_.limbSwingAmount >= 0.01D) { + if (p_77043_1_.limbSwingAmount >= 0.01D) { float f3 = 13.0F; float f4 = p_77043_1_.limbSwing - p_77043_1_.limbSwingAmount * (1.0F - p_77043_4_) + 6.0F; float f5 = (Math.abs(f4 % f3 - f3 * 0.5F) - f3 * 0.25F) / (f3 * 0.25F); @@ -74,7 +73,7 @@ public class RenderStaballoyConstruct extends RenderLiving { int i = p_77029_1_.getBrightnessForRender(p_77029_2_); int j = i % 65536; int k = i / 65536; - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) j / 1.0F, (float) k / 1.0F); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, j / 1.0F, k / 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.bindTexture(TextureMap.locationBlocksTexture); this.field_147909_c.renderBlockAsItem(Blocks.red_flower, 0, 1.0F); @@ -91,15 +90,18 @@ public class RenderStaballoyConstruct extends RenderLiving { * void func_76986_a(T entity, double d, double d1, double d2, float f, * float f1). But JAD is pre 1.5 so doesn't do that. */ + @Override public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { this.doRender((EntityStaballoyConstruct) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); } + @Override protected void renderEquippedItems(EntityLivingBase p_77029_1_, float p_77029_2_) { this.renderEquippedItems((EntityStaballoyConstruct) p_77029_1_, p_77029_2_); } + @Override protected void rotateCorpse(EntityLivingBase p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_) { this.rotateCorpse((EntityStaballoyConstruct) p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_); } @@ -112,6 +114,7 @@ public class RenderStaballoyConstruct extends RenderLiving { * void func_76986_a(T entity, double d, double d1, double d2, float f, * float f1). But JAD is pre 1.5 so doesn't do that. */ + @Override public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { this.doRender((EntityStaballoyConstruct) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); @@ -121,6 +124,7 @@ public class RenderStaballoyConstruct extends RenderLiving { * Returns the location of an entity's texture. Doesn't seem to be called * unless you call Render.bindEntityTexture. */ + @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { return this.getEntityTexture((EntityStaballoyConstruct) p_110775_1_); } @@ -133,6 +137,7 @@ public class RenderStaballoyConstruct extends RenderLiving { * void func_76986_a(T entity, double d, double d1, double d2, float f, * float f1). But JAD is pre 1.5 so doesn't do that. */ + @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { this.doRender((EntityStaballoyConstruct) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); diff --git a/src/Java/gtPlusPlus/core/commands/CommandMath.java b/src/Java/gtPlusPlus/core/commands/CommandMath.java index 966f73c589..27c963bf81 100644 --- a/src/Java/gtPlusPlus/core/commands/CommandMath.java +++ b/src/Java/gtPlusPlus/core/commands/CommandMath.java @@ -3,7 +3,7 @@ package gtPlusPlus.core.commands; import java.util.ArrayList; import java.util.List; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.player.PlayerUtils; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; @@ -82,23 +82,23 @@ public class CommandMath implements ICommand System.out.println("Processing on Server side - Home Teleport engaged by: "+P.getDisplayName()); final int XP_TOTAL = P.experienceTotal; - Utils.LOG_WARNING("Total Xp:" + XP_TOTAL); + Logger.WARNING("Total Xp:" + XP_TOTAL); final ChunkCoordinates X = P.getPlayerCoordinates(); - Utils.LOG_WARNING("Player Location: "+X); + Logger.WARNING("Player Location: "+X); ChunkCoordinates Y = null; - Utils.LOG_WARNING("Bed Location: "+Y); + Logger.WARNING("Bed Location: "+Y); try { if (P.getBedLocation(0) == null){ Y = W.getSpawnPoint(); - Utils.LOG_WARNING("Spawn Location: "+Y); + Logger.WARNING("Spawn Location: "+Y); } else if (P.getBedLocation(0) != null){ Y = P.getBedLocation(0); - Utils.LOG_WARNING("Bed Location: "+Y); + Logger.WARNING("Bed Location: "+Y); } else { Y = W.getSpawnPoint(); - Utils.LOG_WARNING("Spawn Location: "+Y); + Logger.WARNING("Spawn Location: "+Y); } } catch(final NullPointerException e) { @@ -106,37 +106,37 @@ public class CommandMath implements ICommand } if (Y == null) { Y = W.getSpawnPoint(); - Utils.LOG_WARNING("Spawn Location: "+Y); + Logger.WARNING("Spawn Location: "+Y); } final int x1 = X.posX; - Utils.LOG_WARNING("X1: "+x1); + Logger.WARNING("X1: "+x1); final int x2 = Y.posX; - Utils.LOG_WARNING("X2: "+x2); + Logger.WARNING("X2: "+x2); final int y1 = X.posY; - Utils.LOG_WARNING("Y1: "+y1); + Logger.WARNING("Y1: "+y1); final int y2 = Y.posY; - Utils.LOG_WARNING("Y2: "+y2); + Logger.WARNING("Y2: "+y2); final int z1 = X.posZ; - Utils.LOG_WARNING("Z1: "+z1); + Logger.WARNING("Z1: "+z1); final int z2 = Y.posZ; - Utils.LOG_WARNING("Z2: "+z2); + Logger.WARNING("Z2: "+z2); final double d = Math.sqrt(((x2-x1)*(x2-x1))+((y2-y1)*(y2-y1))+((z2-z1)*(z2-z1))); final String xpCost = String.valueOf((int)(d*0.15)); - Utils.LOG_WARNING("d:" + d); - Utils.LOG_WARNING("-----------------------------------------"); - Utils.LOG_WARNING("Actual math formulae"); - Utils.LOG_WARNING(String.valueOf(d)); - Utils.LOG_WARNING("-----------------------------------------"); - Utils.LOG_WARNING("Xp Cost based on answer B."); - Utils.LOG_WARNING(String.valueOf(d*0.15) + " | " + String.valueOf(xpCost)); - Utils.LOG_WARNING("-----------------------------------------"); - Utils.LOG_WARNING("Xp Total"); - Utils.LOG_WARNING(String.valueOf(XP_TOTAL)); - Utils.LOG_WARNING("-----------------------------------------"); + Logger.WARNING("d:" + d); + Logger.WARNING("-----------------------------------------"); + Logger.WARNING("Actual math formulae"); + Logger.WARNING(String.valueOf(d)); + Logger.WARNING("-----------------------------------------"); + Logger.WARNING("Xp Cost based on answer B."); + Logger.WARNING(String.valueOf(d*0.15) + " | " + String.valueOf(xpCost)); + Logger.WARNING("-----------------------------------------"); + Logger.WARNING("Xp Total"); + Logger.WARNING(String.valueOf(XP_TOTAL)); + Logger.WARNING("-----------------------------------------"); diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index 1360932dfb..11be6f5f2d 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -4,6 +4,7 @@ import static gtPlusPlus.core.lib.CORE.DEBUG; import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.registry.GameRegistry; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.entity.InternalEntityRegistry; @@ -34,12 +35,12 @@ public class CommonProxy { Utils.registerEvent(this); if (LoadedMods.Gregtech){ if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - Utils.LOG_INFO("We're using Gregtech 5.09 Experimental."); + Logger.INFO("We're using Gregtech 5.09 Experimental."); } else { - Utils.LOG_INFO("We're using Gregtech 5.08 or an earlier fork."); + Logger.INFO("We're using Gregtech 5.08 or an earlier fork."); } - Utils.LOG_INFO("Setting up our own GT_Proxy."); + Logger.INFO("Setting up our own GT_Proxy."); GtProxy = new Meta_GT_Proxy(); } else { @@ -48,27 +49,27 @@ public class CommonProxy { } public void preInit(final FMLPreInitializationEvent e) { - Utils.LOG_INFO("Doing some house cleaning."); + Logger.INFO("Doing some house cleaning."); LoadedMods.checkLoaded(); - Utils.LOG_INFO("Making sure we're ready to party!"); + Logger.INFO("Making sure we're ready to party!"); if (!DEBUG){ - Utils.LOG_WARNING("Development mode not enabled."); + Logger.WARNING("Development mode not enabled."); } else if (DEBUG){ - Utils.LOG_INFO("Development mode enabled."); + Logger.INFO("Development mode enabled."); } else { - Utils.LOG_WARNING("Development mode not set."); + Logger.WARNING("Development mode not set."); } AddToCreativeTab.initialiseTabs(); COMPAT_IntermodStaging.preInit(); BookHandler.run(); //Registration of entities and renderers - Utils.LOG_INFO("[Proxy] Calling Entity registrator."); + Logger.INFO("[Proxy] Calling Entity registrator."); registerEntities(); - Utils.LOG_INFO("[Proxy] Calling Tile Entity registrator."); + Logger.INFO("[Proxy] Calling Tile Entity registrator."); registerTileEntities(); @@ -103,7 +104,7 @@ public class CommonProxy { * End of Subscribe Event registration. */ - Utils.LOG_INFO("[Proxy] Calling Render registrator."); + Logger.INFO("[Proxy] Calling Render registrator."); registerRenderThings(); //Compat Handling @@ -113,7 +114,7 @@ public class CommonProxy { } public void postInit(final FMLPostInitializationEvent e) { - Utils.LOG_INFO("Cleaning up, doing postInit."); + Logger.INFO("Cleaning up, doing postInit."); PlayerCache.initCache(); //Circuits @@ -126,7 +127,7 @@ public class CommonProxy { if (!CORE.burnables.isEmpty()){ BurnableFuelHandler fuelHandler = new BurnableFuelHandler(); GameRegistry.registerFuelHandler(fuelHandler); - Utils.LOG_INFO("[Fuel Handler] Registering "+fuelHandler.getClass().getName()); + Logger.INFO("[Fuel Handler] Registering "+fuelHandler.getClass().getName()); } //Compat Handling diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java index c365a19231..55a0a8ac10 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java @@ -1,9 +1,9 @@ package gtPlusPlus.core.common.compat; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.general.*; import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.util.Utils; public class COMPAT_Baubles { @@ -17,7 +17,7 @@ public class COMPAT_Baubles { } public static void baublesLoaded(){ - Utils.LOG_INFO("Baubles Found - Loading Wearables."); + Logger.INFO("Baubles Found - Loading Wearables."); ModItems.itemPersonalCloakingDevice = new ItemCloakingDevice(0); //itemPersonalCloakingDeviceCharged = new ItemCloakingDevice(0).set; ModItems.itemPersonalHealingDevice = new ItemHealingDevice(); @@ -27,7 +27,7 @@ public class COMPAT_Baubles { } public static void baublesNotLoaded(){ - Utils.LOG_INFO("Baubles Not Found - Skipping Resources."); + Logger.INFO("Baubles Not Found - Skipping Resources."); } } diff --git a/src/Java/gtPlusPlus/core/container/Container_HeliumGenerator.java b/src/Java/gtPlusPlus/core/container/Container_HeliumGenerator.java index ffa778a8c6..e45d708761 100644 --- a/src/Java/gtPlusPlus/core/container/Container_HeliumGenerator.java +++ b/src/Java/gtPlusPlus/core/container/Container_HeliumGenerator.java @@ -1,11 +1,11 @@ package gtPlusPlus.core.container; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.inventories.InventoryHeliumGenerator; import gtPlusPlus.core.slots.SlotFuelRod; import gtPlusPlus.core.slots.SlotNoInput; import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator; -import gtPlusPlus.core.util.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -54,7 +54,7 @@ public class Container_HeliumGenerator extends Container { { for (var7 = 0; var7 < 3; ++var7) { - Utils.LOG_INFO("Adding slots at var:"+(o)+" x:"+(8 + var7 * 18)+" y:"+(9 + var6 * 18)); + Logger.INFO("Adding slots at var:"+(o)+" x:"+(8 + var7 * 18)+" y:"+(9 + var6 * 18)); this.addSlotToContainer(new SlotFuelRod(this.inventoryChest, o, 8 + (var7 * 18), 18 + (var6 * 18))); this.slotStorage[o] = o; o++; @@ -66,7 +66,7 @@ public class Container_HeliumGenerator extends Container { { for (var7 = 0; var7 < 3; ++var7) { - Utils.LOG_INFO("Adding slots at var:"+(o)+" x:"+(90+8+(var7 * 18))+" y:"+(9 + var6 * 18)); + Logger.INFO("Adding slots at var:"+(o)+" x:"+(90+8+(var7 * 18))+" y:"+(9 + var6 * 18)); this.addSlotToContainer(new SlotFuelRod(this.inventoryChest, o, 116 + (var7 * 18), 18 + (var6 * 18))); this.slotStorage[o] = o; o++; diff --git a/src/Java/gtPlusPlus/core/container/Container_ModularityTable.java b/src/Java/gtPlusPlus/core/container/Container_ModularityTable.java index d870750039..cfa1eed690 100644 --- a/src/Java/gtPlusPlus/core/container/Container_ModularityTable.java +++ b/src/Java/gtPlusPlus/core/container/Container_Modu