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/cofh/energy/EnergyStorage.java | 12 +- src/Java/cofh/energy/IEnergyHandler.java | 20 +- src/Java/cofh/energy/ItemEnergyContainer.java | 12 +- src/Java/cofh/energy/TileEnergyHandler.java | 21 +- src/Java/gregtech/api/util/CustomRecipeMap.java | 48 ++-- .../api/util/MultiblockRecipeMapHandler.java | 18 +- src/Java/gregtech/api/util/Recipe_GT.java | 52 ++-- 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 +- 267 files changed, 3083 insertions(+), 2529 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') diff --git a/src/Java/cofh/energy/EnergyStorage.java b/src/Java/cofh/energy/EnergyStorage.java index e48fc7b8ac..c29b1a814f 100644 --- a/src/Java/cofh/energy/EnergyStorage.java +++ b/src/Java/cofh/energy/EnergyStorage.java @@ -99,7 +99,8 @@ public class EnergyStorage } } - public int receiveEnergy(int maxReceive, boolean simulate) + @Override +public int receiveEnergy(int maxReceive, boolean simulate) { int energyReceived = Math.min(this.capacity - this.energy, Math.min(this.maxReceive, maxReceive)); if (!simulate) { @@ -108,7 +109,8 @@ public class EnergyStorage return energyReceived; } - public int extractEnergy(int maxExtract, boolean simulate) + @Override +public int extractEnergy(int maxExtract, boolean simulate) { int energyExtracted = Math.min(this.energy, Math.min(this.maxExtract, maxExtract)); if (!simulate) { @@ -117,12 +119,14 @@ public class EnergyStorage return energyExtracted; } - public int getEnergyStored() + @Override +public int getEnergyStored() { return this.energy; } - public int getMaxEnergyStored() + @Override +public int getMaxEnergyStored() { return this.capacity; } diff --git a/src/Java/cofh/energy/IEnergyHandler.java b/src/Java/cofh/energy/IEnergyHandler.java index 89ea0b4eb7..81424a971f 100644 --- a/src/Java/cofh/energy/IEnergyHandler.java +++ b/src/Java/cofh/energy/IEnergyHandler.java @@ -3,13 +3,17 @@ package cofh.energy; import net.minecraftforge.common.util.ForgeDirection; public abstract interface IEnergyHandler - extends IEnergyProvider, IEnergyReceiver +extends IEnergyProvider, IEnergyReceiver { - public abstract int receiveEnergy(ForgeDirection paramForgeDirection, int paramInt, boolean paramBoolean); - - public abstract int extractEnergy(ForgeDirection paramForgeDirection, int paramInt, boolean paramBoolean); - - public abstract int getEnergyStored(ForgeDirection paramForgeDirection); - - public abstract int getMaxEnergyStored(ForgeDirection paramForgeDirection); + @Override + public abstract int receiveEnergy(ForgeDirection paramForgeDirection, int paramInt, boolean paramBoolean); + + @Override + public abstract int extractEnergy(ForgeDirection paramForgeDirection, int paramInt, boolean paramBoolean); + + @Override + public abstract int getEnergyStored(ForgeDirection paramForgeDirection); + + @Override + public abstract int getMaxEnergyStored(ForgeDirection paramForgeDirection); } diff --git a/src/Java/cofh/energy/ItemEnergyContainer.java b/src/Java/cofh/energy/ItemEnergyContainer.java index 697532abe3..3467aeaf03 100644 --- a/src/Java/cofh/energy/ItemEnergyContainer.java +++ b/src/Java/cofh/energy/ItemEnergyContainer.java @@ -53,7 +53,8 @@ public class ItemEnergyContainer this.maxExtract = maxExtract; } - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) + @Override +public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { if (container.stackTagCompound == null) { container.stackTagCompound = new NBTTagCompound(); @@ -68,7 +69,8 @@ public class ItemEnergyContainer return energyReceived; } - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) + @Override +public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) { return 0; @@ -83,7 +85,8 @@ public class ItemEnergyContainer return energyExtracted; } - public int getEnergyStored(ItemStack container) + @Override +public int getEnergyStored(ItemStack container) { if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) { return 0; @@ -91,7 +94,8 @@ public class ItemEnergyContainer return container.stackTagCompound.getInteger("Energy"); } - public int getMaxEnergyStored(ItemStack container) + @Override +public int getMaxEnergyStored(ItemStack container) { return this.capacity; } diff --git a/src/Java/cofh/energy/TileEnergyHandler.java b/src/Java/cofh/energy/TileEnergyHandler.java index 24cd3c0e34..f8e3ea4291 100644 --- a/src/Java/cofh/energy/TileEnergyHandler.java +++ b/src/Java/cofh/energy/TileEnergyHandler.java @@ -10,39 +10,46 @@ public class TileEnergyHandler { protected EnergyStorage storage = new EnergyStorage(32000); - public void readFromNBT(NBTTagCompound nbt) + @Override +public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); this.storage.readFromNBT(nbt); } - public void writeToNBT(NBTTagCompound nbt) + @Override +public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); this.storage.writeToNBT(nbt); } - public boolean canConnectEnergy(ForgeDirection from) + @Override +public boolean canConnectEnergy(ForgeDirection from) { return true; } - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) + @Override +public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { return this.storage.receiveEnergy(maxReceive, simulate); } - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) + @Override +public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { return this.storage.extractEnergy(maxExtract, simulate); } - public int getEnergyStored(ForgeDirection from) + @Override +public int getEnergyStored(ForgeDirection from) { return this.storage.getEnergyStored(); } - public int getMaxEnergyStored(ForgeDirection from) + @Override +public int getMaxEnergyStored(ForgeDirection from) { return this.storage.getMaxEnergyStored(); } diff --git a/src/Java/gregtech/api/util/CustomRecipeMap.java b/src/Java/gregtech/api/util/CustomRecipeMap.java index a4a1b0b061..5096947886 100644 --- a/src/Java/gregtech/api/util/CustomRecipeMap.java +++ b/src/Java/gregtech/api/util/CustomRecipeMap.java @@ -7,7 +7,7 @@ import java.util.*; import gregtech.api.GregTech_API; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; import gregtech.api.objects.GT_ItemStack; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -214,7 +214,7 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{ public GT_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final GT_Recipe aRecipe, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack aSpecialSlot, ItemStack... aInputs) { // No Recipes? Well, nothing to be found then. if (this.mRecipeList.isEmpty()) { - Utils.LOG_WARNING("BAD RECIPE"); + Logger.WARNING("BAD RECIPE"); return null; } @@ -223,7 +223,7 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{ if (GregTech_API.sPostloadFinished) { if (this.mMinimalInputFluids > 0) { if (aFluids == null) { - Utils.LOG_WARNING("BAD RECIPE [1]"); + Logger.WARNING("BAD RECIPE [1]"); return null; } int tAmount = 0; @@ -233,13 +233,13 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{ } } if (tAmount < this.mMinimalInputFluids) { - Utils.LOG_WARNING("BAD RECIPE [2]"); + Logger.WARNING("BAD RECIPE [2]"); return null; } } if (this.mMinimalInputItems > 0) { if (aInputs == null) { - Utils.LOG_WARNING("BAD RECIPE [3]"); + Logger.WARNING("BAD RECIPE [3]"); return null; } int tAmount = 0; @@ -249,7 +249,7 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{ } } if (tAmount < this.mMinimalInputItems) { - Utils.LOG_WARNING("BAD RECIPE [4]"); + Logger.WARNING("BAD RECIPE [4]"); return null; } } @@ -263,38 +263,38 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{ // Check the Recipe which has been used last time in order to not have to search for it again, if possible. if (aRecipe != null) { if (!aRecipe.mFakeRecipe && aRecipe.mCanBeBuffered && aRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) { - Utils.LOG_WARNING("BAD RECIPE [a]"); + Logger.WARNING("BAD RECIPE [a]"); return aRecipe.mEnabled && ((aVoltage * this.mAmperage) >= aRecipe.mEUt) ? aRecipe : null; } } // Now look for the Recipes inside the Item HashMaps, but only when the Recipes usually have Items. if ((this.mUsualInputCount > 0) && (aInputs != null)) { - Utils.LOG_WARNING("BAD RECIPE [b0]"); + Logger.WARNING("BAD RECIPE [b0]"); for (final ItemStack tStack : aInputs) { - Utils.LOG_WARNING("BAD RECIPE [b1]"); + Logger.WARNING("BAD RECIPE [b1]"); if (tStack != null) { - Utils.LOG_WARNING("BAD RECIPE [b2] | "+tStack.getDisplayName()); + Logger.WARNING("BAD RECIPE [b2] | "+tStack.getDisplayName()); Collection tRecipes = this.mRecipeItemMap.get(new GT_ItemStack(tStack)); if (tRecipes != null) { - Utils.LOG_WARNING("BAD RECIPE [b3]"); + Logger.WARNING("BAD RECIPE [b3]"); for (final GT_Recipe tRecipe : tRecipes) { - Utils.LOG_WARNING("BAD RECIPE [b4]"); + Logger.WARNING("BAD RECIPE [b4]"); if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) { - Utils.LOG_WARNING("BAD RECIPE [b5]"); + Logger.WARNING("BAD RECIPE [b5]"); return tRecipe.mEnabled && ((aVoltage * this.mAmperage) >= tRecipe.mEUt) ? tRecipe : null; } } } - Utils.LOG_WARNING("BAD RECIPE [b6]"); + Logger.WARNING("BAD RECIPE [b6]"); tRecipes = this.mRecipeItemMap.get(new GT_ItemStack(GT_Utility.copyMetaData(W, tStack))); if (tRecipes != null) { - Utils.LOG_WARNING("BAD RECIPE [b7]"); + Logger.WARNING("BAD RECIPE [b7]"); for (final GT_Recipe tRecipe : tRecipes) { - Utils.LOG_WARNING("BAD RECIPE [b8]"); + Logger.WARNING("BAD RECIPE [b8]"); if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) { - Utils.LOG_WARNING("BAD RECIPE [b9]"); + Logger.WARNING("BAD RECIPE [b9]"); return tRecipe.mEnabled && ((aVoltage * this.mAmperage) >= tRecipe.mEUt) ? tRecipe : null; } } @@ -305,19 +305,19 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{ // If the minimal Amount of Items for the Recipe is 0, then it could be a Fluid-Only Recipe, so check that Map too. if ((this.mMinimalInputItems == 0) && (aFluids != null && aFluids.length > 0)) { - Utils.LOG_WARNING("BAD RECIPE [c0] "+aFluids.length); + Logger.WARNING("BAD RECIPE [c0] "+aFluids.length); for (final FluidStack aFluid : aFluids) { - Utils.LOG_WARNING("BAD RECIPE [c1]"); + Logger.WARNING("BAD RECIPE [c1]"); if (aFluid != null) { - Utils.LOG_WARNING("BAD RECIPE [c2]"); + Logger.WARNING("BAD RECIPE [c2]"); final Collection tRecipes = this.mRecipeFluidMap.get(aFluid.getFluid()); if (tRecipes != null) { - Utils.LOG_WARNING("BAD RECIPE [c3]"); + Logger.WARNING("BAD RECIPE [c3]"); for (final GT_Recipe tRecipe : tRecipes) { - Utils.LOG_WARNING("BAD RECIPE [c4]"); + Logger.WARNING("BAD RECIPE [c4]"); if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) { - Utils.LOG_WARNING("BAD RECIPE [c5]"); + Logger.WARNING("BAD RECIPE [c5]"); return tRecipe.mEnabled && ((aVoltage * this.mAmperage) >= tRecipe.mEUt) ? tRecipe : null; } } @@ -327,7 +327,7 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{ } // And nothing has been found. - Utils.LOG_WARNING("BAD RECIPE [5]"); + Logger.WARNING("BAD RECIPE [5]"); return null; } diff --git a/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java b/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java index 7a4e1a533a..a93748390b 100644 --- a/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java +++ b/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java @@ -5,8 +5,8 @@ import java.util.Collection; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -139,10 +139,10 @@ public class MultiblockRecipeMapHandler{ for (final GT_Recipe newBo : x) { int duration = MathUtils.findPercentageOfInt(newBo.mDuration, 80); if (newMap.addRecipe(new GT_Recipe(true, newBo.mInputs, newBo.mOutputs, newBo.mSpecialItems, newBo.mChances, newBo.mFluidInputs, newBo.mFluidOutputs, duration, newBo.mEUt, newBo.mSpecialValue), false, true, true) != null){ - Utils.LOG_INFO("Successfully added a simple recipe to the "+newMap.mNEIName+" map."); + Logger.INFO("Successfully added a simple recipe to the "+newMap.mNEIName+" map."); } else { - Utils.LOG_INFO("Failed adding a simple recipe to the "+newMap.mNEIName+" map."); + Logger.INFO("Failed adding a simple recipe to the "+newMap.mNEIName+" map."); } } } @@ -162,29 +162,29 @@ public class MultiblockRecipeMapHandler{ if (newBo.mChances != null){ outputChances = newBo.mChances.clone(); for (int g=0;g 0) && (aSpecialValue > 0)) { switch (aType) { // Diesel Generator case 0: - Utils.LOG_INFO("Added fuel "+aInput1.getDisplayName()+" is ROCKET FUEL - continuing"); + Logger.INFO("Added fuel "+aInput1.getDisplayName()+" is ROCKET FUEL - continuing"); Gregtech_Recipe_Map.sRocketFuels.addRecipe(this); break; // Gas Turbine @@ -374,23 +374,23 @@ public class Recipe_GT extends GT_Recipe{ }*/ public GT_Recipe addRecipe(final GT_Recipe aRecipe) { - Utils.LOG_INFO("Adding Recipe Method 1"); + Logger.INFO("Adding Recipe Method 1"); return this.addRecipe(aRecipe, true, false, false); } protected GT_Recipe addRecipe(final GT_Recipe aRecipe, final boolean aCheckForCollisions, final boolean aFakeRecipe, final boolean aHidden) { - Utils.LOG_INFO("Adding Recipe Method 2 - This Checks if hidden, fake or if duplicate recipes exists, I think."); + Logger.INFO("Adding Recipe Method 2 - This Checks if hidden, fake or if duplicate recipes exists, I think."); aRecipe.mHidden = aHidden; aRecipe.mFakeRecipe = aFakeRecipe; - Utils.LOG_INFO("Logging some data about this method: GregtechRecipe["+aRecipe.toString()+"] | aCheckForCollisions["+aCheckForCollisions+"] | aFakeRecipe["+aFakeRecipe+"] | aHidden["+aHidden+"]"); - Utils.LOG_INFO("Logging some data about this method: mMinimalInputFluids["+this.mMinimalInputFluids+"] | mMinimalInputItems["+this.mMinimalInputItems+"] | aRecipe.mFluidInputs.length["+aRecipe.mFluidInputs.length+"] | aRecipe.mInputs.length["+aRecipe.mInputs.length+"]"); + Logger.INFO("Logging some data about this method: GregtechRecipe["+aRecipe.toString()+"] | aCheckForCollisions["+aCheckForCollisions+"] | aFakeRecipe["+aFakeRecipe+"] | aHidden["+aHidden+"]"); + Logger.INFO("Logging some data about this method: mMinimalInputFluids["+this.mMinimalInputFluids+"] | mMinimalInputItems["+this.mMinimalInputItems+"] | aRecipe.mFluidInputs.length["+aRecipe.mFluidInputs.length+"] | aRecipe.mInputs.length["+aRecipe.mInputs.length+"]"); if ((aRecipe.mFluidInputs.length < this.mMinimalInputFluids) && (aRecipe.mInputs.length < this.mMinimalInputItems)){ - Utils.LOG_INFO("Step 2 failed"); + Logger.INFO("Step 2 failed"); return null;} - Utils.LOG_INFO("Logging some data about this method: aCheckForCollisions["+aCheckForCollisions+"] | findRecipe != null ["+(this.findRecipe(null, false, Long.MAX_VALUE, aRecipe.mFluidInputs, aRecipe.mInputs) != null)+"]"); + Logger.INFO("Logging some data about this method: aCheckForCollisions["+aCheckForCollisions+"] | findRecipe != null ["+(this.findRecipe(null, false, Long.MAX_VALUE, aRecipe.mFluidInputs, aRecipe.mInputs) != null)+"]"); if (aCheckForCollisions && (this.findRecipe(null, false, Long.MAX_VALUE, aRecipe.mFluidInputs, aRecipe.mInputs) != null)){ - Utils.LOG_INFO("Step 2 failed - 2"); + Logger.INFO("Step 2 failed - 2"); return null; } return this.add(aRecipe); @@ -420,11 +420,11 @@ public class Recipe_GT extends GT_Recipe{ } public GT_Recipe add(final GT_Recipe aRecipe) { - Utils.LOG_INFO("Adding Recipe Method 3"); + Logger.INFO("Adding Recipe Method 3"); this.mRecipeList.add(aRecipe); for (final FluidStack aFluid : aRecipe.mFluidInputs) { if (aFluid != null) { - Utils.LOG_INFO("Fluid is valid - getting some kind of fluid instance to add to the recipe hashmap."); + Logger.INFO("Fluid is valid - getting some kind of fluid instance to add to the recipe hashmap."); Collection tList = this.mRecipeFluidMap.get(aFluid.getFluid()); if (tList == null) { this.mRecipeFluidMap.put(aFluid.getFluid(), tList = new HashSet<>(1)); @@ -588,28 +588,28 @@ public class Recipe_GT extends GT_Recipe{ } protected GT_Recipe addToItemMap(final GT_Recipe aRecipe) { - Utils.LOG_INFO("Adding Recipe Method 4"); + Logger.INFO("Adding Recipe Method 4"); for (final ItemStack aStack : aRecipe.mInputs) { if (aStack != null) { - Utils.LOG_INFO("Method 4 - Manipulating "+aStack.getDisplayName()); + Logger.INFO("Method 4 - Manipulating "+aStack.getDisplayName()); final GT_ItemStack tStack = new GT_ItemStack(aStack); - Utils.LOG_INFO("Method 4 - Made gt stack of item "+tStack.toStack().getDisplayName()); + Logger.INFO("Method 4 - Made gt stack of item "+tStack.toStack().getDisplayName()); Collection tList = this.mRecipeItemMap.get(tStack); if (tList != null){ - Utils.LOG_INFO("Method 4 - Gt Recipe Hashmap: "+tList.toString()); + Logger.INFO("Method 4 - Gt Recipe Hashmap: "+tList.toString()); } if (tList == null){ - Utils.LOG_INFO("Method 4 - brrr list was NUll"); + Logger.INFO("Method 4 - brrr list was NUll"); this.mRecipeItemMap.put(tStack, tList = new HashSet<>(1)); - Utils.LOG_INFO("Method 4 - Attemping backup method for Gt Recipe Hashmap:"); + Logger.INFO("Method 4 - Attemping backup method for Gt Recipe Hashmap:"); while (tList.iterator().hasNext()){ - Utils.LOG_INFO(tList.iterator().next().toString()); + Logger.INFO(tList.iterator().next().toString()); } } tList.add(aRecipe); - Utils.LOG_INFO("Method 4 - Added recipe to map? I think."); + Logger.INFO("Method 4 - Added recipe to map? I think."); } } return aRecipe; @@ -796,27 +796,27 @@ public class Recipe_GT extends GT_Recipe{ } public GT_Recipe addFuel(final ItemStack aInput, final ItemStack aOutput, final int aFuelValueInEU) { - Utils.LOG_INFO("Adding Fuel using method 1"); + Logger.INFO("Adding Fuel using method 1"); return this.addFuel(aInput, aOutput, null, null, 10000, aFuelValueInEU); } public GT_Recipe addFuel(final ItemStack aInput, final ItemStack aOutput, final int aChance, final int aFuelValueInEU) { - Utils.LOG_INFO("Adding Fuel using method 2"); + Logger.INFO("Adding Fuel using method 2"); return this.addFuel(aInput, aOutput, null, null, aChance, aFuelValueInEU); } public GT_Recipe addFuel(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aFuelValueInEU) { - Utils.LOG_INFO("Adding Fuel using method 3"); + Logger.INFO("Adding Fuel using method 3"); return this.addFuel(null, null, aFluidInput, aFluidOutput, 10000, aFuelValueInEU); } public GT_Recipe addFuel(final ItemStack aInput, final ItemStack aOutput, final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aFuelValueInEU) { - Utils.LOG_INFO("Adding Fuel using method 4"); + Logger.INFO("Adding Fuel using method 4"); return this.addFuel(aInput, aOutput, aFluidInput, aFluidOutput, 10000, aFuelValueInEU); } public GT_Recipe addFuel(final ItemStack aInput, final ItemStack aOutput, final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aChance, final int aFuelValueInEU) { - Utils.LOG_INFO("Adding Fuel using method 5"); + Logger.INFO("Adding Fuel using method 5"); return this.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput}, null, new int[]{aChance}, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, 0, 0, aFuelValueInEU); } } 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.