From 24905c16017decae4ee60ce4128b6d26de66baf5 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Thu, 22 Feb 2018 13:55:56 +1000 Subject: % Minor project cleanup. --- src/Java/gregtech/api/util/Recipe_GT.java | 2 +- src/Java/gtPlusPlus/GTplusplus.java | 10 +- src/Java/gtPlusPlus/api/enums/Quality.java | 61 ++ .../gtPlusPlus/api/helpers/MaterialHelper.java | 2 +- .../gtPlusPlus/api/objects/minecraft/FluidGT6.java | 30 + .../core/block/base/BlockBaseModular.java | 2 +- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 2 +- .../core/block/general/BlockTankXpConverter.java | 4 +- .../core/block/general/FluidTankInfinite.java | 2 +- .../gtPlusPlus/core/block/machine/FishTrap.java | 2 +- .../core/block/machine/Machine_ProjectTable.java | 2 +- .../core/block/machine/Machine_Workbench.java | 2 +- .../block/machine/Machine_WorkbenchAdvanced.java | 2 +- src/Java/gtPlusPlus/core/commands/CommandMath.java | 4 +- .../common/compat/COMPAT_CompactWindmills.java | 2 +- .../core/common/compat/COMPAT_EnderIO.java | 2 +- .../core/common/compat/COMPAT_ExtraUtils.java | 4 +- .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 2 +- .../core/common/compat/COMPAT_MorePlanets.java | 2 +- .../core/common/compat/COMPAT_Thaumcraft.java | 2 +- .../core/container/Container_Workbench.java | 2 +- .../container/Container_WorkbenchAdvanced.java | 2 +- .../core/entity/EntityTeslaTowerLightning.java | 2 +- .../entity/monster/EntityStaballoyConstruct.java | 2 +- .../projectile/EntityHydrofluoricAcidPotion.java | 2 +- .../projectile/EntitySulfuricAcidPotion.java | 2 +- .../gtPlusPlus/core/gui/item/GuiBaseGrindle.java | 2 +- .../gtPlusPlus/core/gui/item/GuiScreenGrindle.java | 2 +- src/Java/gtPlusPlus/core/handler/BookHandler.java | 4 +- .../core/handler/BurnableFuelHandler.java | 2 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 4 +- .../core/handler/analytics/SegmentAnalytics.java | 6 +- .../core/handler/events/LoginEventHandler.java | 2 +- .../events/PickaxeBlockBreakEventHandler.java | 2 +- src/Java/gtPlusPlus/core/item/ModItems.java | 8 +- .../core/item/base/BaseItemBackpack.java | 2 +- .../core/item/base/BaseItemBurnable.java | 2 +- .../core/item/base/BaseItemComponent.java | 6 +- .../gtPlusPlus/core/item/base/BaseItemLoot.java | 4 +- .../gtPlusPlus/core/item/base/BaseItemTCShard.java | 2 +- .../core/item/base/cell/BaseItemCell.java | 4 +- .../core/item/base/dusts/BaseItemDust.java | 4 +- .../core/item/base/dusts/BaseItemDustUnique.java | 4 +- .../core/item/base/foods/BaseItemHotFood.java | 2 +- .../core/item/base/ingots/BaseItemIngot.java | 2 +- .../core/item/base/ingots/BaseItemIngotHot.java | 2 +- .../core/item/base/ingots/BaseItemIngot_OLD.java | 4 +- .../core/item/base/itemblock/ItemBlockFluid.java | 2 +- .../core/item/base/itemblock/ItemBlockGtBlock.java | 4 +- .../item/base/itemblock/ItemBlockGtFrameBox.java | 2 +- .../core/item/base/itemblock/ItemBlockNBT.java | 2 +- .../core/item/base/itemblock/ItemBlockOre.java | 2 +- .../core/item/base/misc/BaseItemMisc.java | 2 +- .../core/item/base/ore/BaseOreComponent.java | 4 +- .../core/item/base/plates/BaseItemPlate.java | 2 +- .../core/item/base/plates/BaseItemPlate_OLD.java | 6 +- .../core/item/base/rods/BaseItemRodLong.java | 2 +- .../core/item/base/screws/BaseItemScrew.java | 2 +- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 4 +- .../gtPlusPlus/core/item/bauble/ModularBauble.java | 10 +- .../gtPlusPlus/core/item/chemistry/CoalTar.java | 4 +- .../core/item/general/BaseItemGrindle.java | 2 +- .../core/item/general/ItemAreaClear.java | 2 +- .../core/item/general/ItemBasicFirestarter.java | 2 +- .../core/item/general/ItemBlueprint.java | 4 +- .../core/item/general/ItemCloakingDevice.java | 2 +- .../core/item/general/ItemHealingDevice.java | 4 +- .../core/item/general/ItemSlowBuildingRing.java | 2 +- .../core/item/general/RF2EU_Battery.java | 2 +- .../core/item/general/books/ItemBaseBook.java | 2 +- .../item/general/capture/ItemEntityCatcher.java | 4 +- src/Java/gtPlusPlus/core/item/init/ItemsFoods.java | 2 +- .../gtPlusPlus/core/item/init/ItemsMultiTools.java | 2 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 4 +- .../core/item/tool/staballoy/MultiSpadeBase.java | 4 +- .../core/item/tool/staballoy/StaballoyPickaxe.java | 2 +- .../core/item/tool/staballoy/StaballoySpade.java | 2 +- src/Java/gtPlusPlus/core/lib/CORE.java | 6 +- src/Java/gtPlusPlus/core/material/ALLOY.java | 2 +- src/Java/gtPlusPlus/core/material/ELEMENT.java | 12 +- src/Java/gtPlusPlus/core/material/Material.java | 10 +- .../core/material/MaterialGenerator.java | 4 +- .../gtPlusPlus/core/material/MaterialStack.java | 2 +- src/Java/gtPlusPlus/core/material/NONMATERIAL.java | 2 +- .../gtPlusPlus/core/material/nuclear/NUCLIDE.java | 2 +- src/Java/gtPlusPlus/core/proxy/ClientProxy.java | 2 +- .../core/recipe/Gregtech_Recipe_Adder.java | 2 +- .../core/recipe/LOADER_Machine_Components.java | 2 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 4 +- .../gtPlusPlus/core/recipe/RECIPES_General.java | 6 +- .../core/recipe/RECIPES_LaserEngraver.java | 2 +- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 89 +-- .../core/recipe/RECIPES_MachineComponents.java | 2 +- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 4 +- .../core/recipe/RECIPES_Old_Circuits.java | 4 +- src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java | 4 +- .../gtPlusPlus/core/recipe/RECIPE_Batteries.java | 4 +- .../gtPlusPlus/core/recipe/ShapedRecipeObject.java | 2 +- src/Java/gtPlusPlus/core/recipe/common/CI.java | 2 +- .../core/slots/SlotModularBaubleUpgrades.java | 4 +- .../tileentities/general/TileEntityFishTrap.java | 2 +- .../general/TileEntityHeliumGenerator.java | 2 +- .../general/TileEntityXpConverter.java | 4 +- .../machines/TileEntityModularityTable.java | 8 +- .../machines/TileEntityProjectTable.java | 10 +- .../machines/TileEntityTradeTable.java | 2 +- src/Java/gtPlusPlus/core/util/BaseHandler.java | 11 - src/Java/gtPlusPlus/core/util/ClassUtils.java | 76 --- src/Java/gtPlusPlus/core/util/Log.java | 24 - src/Java/gtPlusPlus/core/util/LoggingUtils.java | 49 -- src/Java/gtPlusPlus/core/util/PollutionUtils.java | 54 -- src/Java/gtPlusPlus/core/util/Quality.java | 61 -- src/Java/gtPlusPlus/core/util/StringUtils.java | 97 --- src/Java/gtPlusPlus/core/util/SystemUtils.java | 77 --- src/Java/gtPlusPlus/core/util/Utils.java | 7 +- .../gtPlusPlus/core/util/UtilsChatFormatting.java | 129 ---- src/Java/gtPlusPlus/core/util/UtilsRarity.java | 18 - src/Java/gtPlusPlus/core/util/UtilsText.java | 2 +- .../gtPlusPlus/core/util/array/ArrayUtils.java | 34 - src/Java/gtPlusPlus/core/util/data/ArrayUtils.java | 34 + src/Java/gtPlusPlus/core/util/data/EnumUtils.java | 41 ++ .../gtPlusPlus/core/util/data/LocaleUtils.java | 91 +++ .../gtPlusPlus/core/util/data/LoggingUtils.java | 49 ++ .../gtPlusPlus/core/util/data/StringUtils.java | 97 +++ .../gtPlusPlus/core/util/data/UUIDGenerator.java | 451 +++++++++++++ src/Java/gtPlusPlus/core/util/data/UUIDUtils.java | 25 + .../core/util/enchanting/EnchantingUtils.java | 102 --- .../gtPlusPlus/core/util/entity/EntityUtils.java | 113 ---- src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java | 30 - .../gtPlusPlus/core/util/fluid/FluidUtils.java | 551 ---------------- src/Java/gtPlusPlus/core/util/geo/GeoUtils.java | 107 --- .../util/gregtech/material/MaterialBuilder.java | 254 -------- .../gregtech/recipehandlers/GregtechRecipe.java | 74 --- .../gtPlusPlus/core/util/input/KeyboardUtils.java | 23 - .../core/util/inventory/InventoryUtils.java | 60 -- src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 722 --------------------- .../gtPlusPlus/core/util/locale/LocaleUtils.java | 91 --- .../core/util/materials/MaterialUtils.java | 253 -------- .../core/util/minecraft/EnchantingUtils.java | 102 +++ .../core/util/minecraft/EntityUtils.java | 113 ++++ .../gtPlusPlus/core/util/minecraft/FluidUtils.java | 550 ++++++++++++++++ .../core/util/minecraft/InventoryUtils.java | 60 ++ .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 717 ++++++++++++++++++++ .../core/util/minecraft/MaterialUtils.java | 205 ++++++ .../core/util/minecraft/ModularArmourUtils.java | 159 +++++ .../gtPlusPlus/core/util/minecraft/NBTUtils.java | 453 +++++++++++++ .../core/util/minecraft/PlayerUtils.java | 175 +++++ .../core/util/minecraft/RecipeUtils.java | 479 ++++++++++++++ .../core/util/minecraft/ShapelessUtils.java | 55 ++ .../core/util/minecraft/UtilsMining.java | 214 ++++++ .../util/minecraft/gregtech/PollutionUtils.java | 54 ++ .../gregtech/material/MaterialBuilder.java | 254 ++++++++ .../gregtech/recipehandlers/GregtechRecipe.java | 74 +++ .../minecraft/particles/BlockBreakParticles.java | 17 + .../particles/EntityParticleFXMysterious.java | 17 + .../core/util/nbt/ModularArmourUtils.java | 159 ----- src/Java/gtPlusPlus/core/util/nbt/NBTUtils.java | 454 ------------- .../core/util/networking/NetworkUtils.java | 153 ----- .../core/util/particles/BlockBreakParticles.java | 17 - .../util/particles/EntityParticleFXMysterious.java | 17 - .../gtPlusPlus/core/util/player/PlayerUtils.java | 175 ----- .../gtPlusPlus/core/util/player/UtilsMining.java | 214 ------ .../gtPlusPlus/core/util/recipe/RecipeUtils.java | 481 -------------- .../core/util/recipe/shapeless/ShapelessUtils.java | 55 -- .../core/util/reflect/AddGregtechRecipe.java | 4 +- .../core/util/reflect/ReflectionUtils.java | 74 ++- src/Java/gtPlusPlus/core/util/sys/GeoUtils.java | 106 +++ .../gtPlusPlus/core/util/sys/KeyboardUtils.java | 23 + src/Java/gtPlusPlus/core/util/sys/Log.java | 24 + .../gtPlusPlus/core/util/sys/NetworkUtils.java | 153 +++++ src/Java/gtPlusPlus/core/util/sys/SystemUtils.java | 77 +++ .../gtPlusPlus/core/util/uuid/UUIDGenerator.java | 451 ------------- src/Java/gtPlusPlus/core/util/uuid/UUIDUtils.java | 25 - src/Java/gtPlusPlus/core/util/wrapper/var.java | 67 -- .../core/world/darkworld/gen/gt/WorldGen_Ores.java | 2 +- .../gtPlusPlus/preloader/Preloader_GT_OreDict.java | 2 +- .../transformers/Preloader_ClassTransformer2.java | 4 +- .../xmod/bop/blocks/base/LeavesBase.java | 2 +- .../gtPlusPlus/xmod/bop/blocks/base/LogBase.java | 2 +- .../xmod/bop/blocks/base/SaplingBase.java | 2 +- .../blocks/rainforest/LeavesRainforestTree.java | 2 +- .../xmod/eio/handler/HandlerTooltip_EIO.java | 2 +- .../forestry/bees/custom/GTPP_Bee_Definition.java | 2 +- .../xmod/forestry/bees/custom/GTPP_Bees.java | 4 +- .../xmod/forestry/bees/custom/ItemCustomComb.java | 2 +- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 4 +- .../base/GregtechMetaTransformerHiAmp.java | 2 +- .../base/GregtechMeta_MultiBlockBase.java | 4 +- .../base/machines/GregtechMetaSafeBlockBase.java | 2 +- .../common/blocks/fluid/GregtechFluidHandler.java | 6 +- .../gregtech/common/helpers/ChargingHelper.java | 2 +- .../gregtech/common/helpers/TreeFarmHelper.java | 6 +- .../common/items/MetaGeneratedGregtechItems.java | 4 +- .../GT_MetaTileEntity_TesseractGenerator.java | 2 +- .../GT_MetaTileEntity_TesseractTerminal.java | 2 +- .../generators/GregtechMetaTileEntity_RTG.java | 2 +- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 2 +- .../GregtechMetaAtmosphericReconditioner.java | 2 +- .../basic/GregtechMetaPollutionCreator.java | 4 +- .../basic/GregtechMetaPollutionDetector.java | 4 +- .../basic/GregtechMetaWirelessCharger.java | 4 +- .../machines/multi/GT4Entity_AutoCrafter.java | 6 +- .../machines/multi/GregtechMTE_NuclearReactor.java | 2 +- .../machines/multi/GregtechMTE_TeslaTower.java | 4 +- .../GregtechMetaTileEntityGeneratorArray.java | 2 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 6 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 2 +- .../GregtechMetaTileEntity_MassFabricator.java | 6 +- .../multi/GregtechMetaTileEntity_MultiTank.java | 2 +- .../storage/GregtechMetaEnergyBuffer.java | 2 +- .../xmod/gregtech/loaders/GT_Material_Loader.java | 2 +- .../loaders/ProcessingToolHeadChoocher.java | 2 +- .../xmod/gregtech/loaders/RecipeGen_Assembler.java | 4 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 4 +- .../loaders/RecipeGen_BlastSmelterGT_Ex.java | 2 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 4 +- .../loaders/RecipeGen_MaterialProcessing.java | 2 +- .../xmod/gregtech/loaders/RecipeGen_Ore.java | 4 +- .../xmod/gregtech/loaders/RecipeGen_Recycling.java | 2 +- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 2 +- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 2 +- .../recipes/machines/RECIPEHANDLER_Dehydrator.java | 2 +- .../registration/gregtech/Gregtech4Content.java | 4 +- .../gregtech/GregtechAdvancedBoilers.java | 2 +- .../gregtech/GregtechComponentAssembler.java | 2 +- .../registration/gregtech/GregtechConduits.java | 6 +- .../registration/gregtech/GregtechDehydrator.java | 4 +- .../gregtech/GregtechMiniRaFusion.java | 6 +- .../gregtech/GregtechNitroDieselFix.java | 4 +- .../gregtech/GregtechSimpleWasher.java | 2 +- .../xmod/growthcraft/fishtrap/FishTrapHandler.java | 4 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 4 +- .../gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java | 6 +- .../xmod/thermalfoundation/item/TF_Items.java | 2 +- .../recipe/TF_Gregtech_Recipes.java | 2 +- 235 files changed, 5300 insertions(+), 5638 deletions(-) create mode 100644 src/Java/gtPlusPlus/api/enums/Quality.java create mode 100644 src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java delete mode 100644 src/Java/gtPlusPlus/core/util/BaseHandler.java delete mode 100644 src/Java/gtPlusPlus/core/util/ClassUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/Log.java delete mode 100644 src/Java/gtPlusPlus/core/util/LoggingUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/PollutionUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/Quality.java delete mode 100644 src/Java/gtPlusPlus/core/util/StringUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/SystemUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/UtilsChatFormatting.java delete mode 100644 src/Java/gtPlusPlus/core/util/UtilsRarity.java delete mode 100644 src/Java/gtPlusPlus/core/util/array/ArrayUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/data/ArrayUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/data/EnumUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/data/LocaleUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/data/LoggingUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/data/StringUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/data/UUIDGenerator.java create mode 100644 src/Java/gtPlusPlus/core/util/data/UUIDUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/enchanting/EnchantingUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/entity/EntityUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java delete mode 100644 src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/geo/GeoUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/gregtech/material/MaterialBuilder.java delete mode 100644 src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java delete mode 100644 src/Java/gtPlusPlus/core/util/input/KeyboardUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/inventory/InventoryUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/item/ItemUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/locale/LocaleUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/InventoryUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/UtilsMining.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/particles/BlockBreakParticles.java create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java delete mode 100644 src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/nbt/NBTUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/networking/NetworkUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/particles/BlockBreakParticles.java delete mode 100644 src/Java/gtPlusPlus/core/util/particles/EntityParticleFXMysterious.java delete mode 100644 src/Java/gtPlusPlus/core/util/player/PlayerUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/player/UtilsMining.java delete mode 100644 src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/recipe/shapeless/ShapelessUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/sys/GeoUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/sys/KeyboardUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/sys/Log.java create mode 100644 src/Java/gtPlusPlus/core/util/sys/NetworkUtils.java create mode 100644 src/Java/gtPlusPlus/core/util/sys/SystemUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/uuid/UUIDGenerator.java delete mode 100644 src/Java/gtPlusPlus/core/util/uuid/UUIDUtils.java delete mode 100644 src/Java/gtPlusPlus/core/util/wrapper/var.java (limited to 'src/Java') diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java index 5a7121397c..38f07e9f7e 100644 --- a/src/Java/gregtech/api/util/Recipe_GT.java +++ b/src/Java/gregtech/api/util/Recipe_GT.java @@ -11,7 +11,7 @@ import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Recipe.GT_Recipe_Map_Assembler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index d782df664c..1fa7997a26 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -37,11 +37,11 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.geo.GeoUtils; -import gtPlusPlus.core.util.item.ItemUtils; -import gtPlusPlus.core.util.locale.LocaleUtils; -import gtPlusPlus.core.util.networking.NetworkUtils; -import gtPlusPlus.core.util.player.PlayerUtils; +import gtPlusPlus.core.util.data.LocaleUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; +import gtPlusPlus.core.util.sys.GeoUtils; +import gtPlusPlus.core.util.sys.NetworkUtils; import gtPlusPlus.plugin.manager.Core_Manager; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; diff --git a/src/Java/gtPlusPlus/api/enums/Quality.java b/src/Java/gtPlusPlus/api/enums/Quality.java new file mode 100644 index 0000000000..0c59cd58fb --- /dev/null +++ b/src/Java/gtPlusPlus/api/enums/Quality.java @@ -0,0 +1,61 @@ +package gtPlusPlus.api.enums; + +import gtPlusPlus.core.util.math.MathUtils; +import net.minecraft.util.EnumChatFormatting; + +public enum Quality { + + // Magic Blue + // Rare Yellow + // Set Green + // Unique Gold/Purple + // Trade-off Brown + + POOR("Poor", EnumChatFormatting.GRAY), COMMON("Common", EnumChatFormatting.WHITE), UNCOMMON("Uncommon", + EnumChatFormatting.DARK_GREEN), MAGIC("Magic", EnumChatFormatting.BLUE), RARE("Rare", + EnumChatFormatting.YELLOW), UNIQUE("Unique", EnumChatFormatting.GOLD), ARTIFACT("Artifact", + EnumChatFormatting.AQUA), SET("Set Piece", EnumChatFormatting.GREEN), TRADEOFF("Trade-off", + EnumChatFormatting.DARK_RED), EPIC("Epic", EnumChatFormatting.LIGHT_PURPLE); + + private String LOOT; + private EnumChatFormatting COLOUR; + + private Quality(final String lootTier, final EnumChatFormatting tooltipColour) { + this.LOOT = lootTier; + this.COLOUR = tooltipColour; + } + + public String getQuality() { + return this.LOOT; + } + + protected EnumChatFormatting getColour() { + return this.COLOUR; + } + + public String formatted() { + return this.COLOUR + this.LOOT; + } + + public static Quality getRandomQuality() { + final int lootChance = MathUtils.randInt(0, 100); + if (lootChance <= 10) { + return Quality.POOR; + } else if (lootChance <= 45) { + return Quality.COMMON; + } else if (lootChance <= 65) { + return Quality.UNCOMMON; + } else if (lootChance <= 82) { + return Quality.MAGIC; + } else if (lootChance <= 92) { + return Quality.EPIC; + } else if (lootChance <= 97) { + return Quality.RARE; + } else if (lootChance <= 99) { + return Quality.ARTIFACT; + } else { + return null; + } + } + +} diff --git a/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java b/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java index bb30727992..b1398f1367 100644 --- a/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java +++ b/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java @@ -3,7 +3,7 @@ package gtPlusPlus.api.helpers; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.item.ItemStack; public class MaterialHelper { diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java new file mode 100644 index 0000000000..d5922242f4 --- /dev/null +++ b/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java @@ -0,0 +1,30 @@ +package gtPlusPlus.api.objects.minecraft; + +import gregtech.api.GregTech_API; +import gtPlusPlus.core.lib.CORE; +import net.minecraftforge.fluids.Fluid; + +public class FluidGT6 extends Fluid implements Runnable +{ + private final short[] mRGBa; + public final String mTextureName; + + public FluidGT6(final String aName, final String aTextureName, final short[] aRGBa) { + super(aName); + this.mRGBa = aRGBa; + this.mTextureName = aTextureName; + if (GregTech_API.sGTBlockIconload != null) { + GregTech_API.sGTBlockIconload.add(this); + } + } + + @Override + public int getColor() { + return (Math.max(0, Math.min(255, this.mRGBa[0])) << 16) | (Math.max(0, Math.min(255, this.mRGBa[1])) << 8) | Math.max(0, Math.min(255, this.mRGBa[2])); + } + + @Override + public void run() { + this.setIcons(GregTech_API.sBlockIcons.registerIcon(CORE.MODID+ ":" + "fluids/fluid." + this.mTextureName)); + } +} diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java index f8a9eb2b2f..2f7b3338d7 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -10,8 +10,8 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockGtFrameBox; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java index 2f2050f21b..d444f11261 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -21,8 +21,8 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockOre; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java index 56ba60a5f3..fab163398d 100644 --- a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java +++ b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java @@ -15,8 +15,8 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityXpConverter; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.enchanting.EnchantingUtils; -import gtPlusPlus.core.util.player.PlayerUtils; +import gtPlusPlus.core.util.minecraft.EnchantingUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java index fe698dfdd0..3b2f73de86 100644 --- a/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java +++ b/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid; -import gtPlusPlus.core.util.player.PlayerUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java index a08d50d27a..b4273a008d 100644 --- a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java +++ b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java @@ -10,7 +10,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; -import gtPlusPlus.core.util.inventory.InventoryUtils; +import gtPlusPlus.core.util.minecraft.InventoryUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java index 4d48e7e793..199736c07d 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java @@ -13,7 +13,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; -import gtPlusPlus.core.util.player.PlayerUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import ic2.core.item.tool.ItemToolWrench; import net.minecraft.block.BlockContainer; diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java index 06df4ca480..4d38115725 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java @@ -11,7 +11,7 @@ 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.player.PlayerUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import ic2.core.item.tool.ItemToolWrench; import net.minecraft.block.BlockContainer; diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java index 2e647a1a26..5129bc56ab 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java @@ -10,7 +10,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.player.PlayerUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; import ic2.core.item.tool.ItemToolWrench; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/src/Java/gtPlusPlus/core/commands/CommandMath.java b/src/Java/gtPlusPlus/core/commands/CommandMath.java index 8e8dfbc36c..1022eb0629 100644 --- a/src/Java/gtPlusPlus/core/commands/CommandMath.java +++ b/src/Java/gtPlusPlus/core/commands/CommandMath.java @@ -5,8 +5,8 @@ import java.util.List; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.util.item.ItemUtils; -import gtPlusPlus.core.util.player.PlayerUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java index 9efd2b4a6c..6bf21c695f 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java @@ -4,7 +4,7 @@ import static gtPlusPlus.core.handler.COMPAT_HANDLER.AddRecipeQueue; import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; import gtPlusPlus.core.recipe.ShapedRecipeObject; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java index f5eee3e8c5..74af212502 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.common.compat; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.item.ItemStack; public class COMPAT_EnderIO { diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java index 763ae3f283..873b5b638a 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java @@ -2,8 +2,8 @@ package gtPlusPlus.core.common.compat; import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.recipe.RECIPES_Tools; -import gtPlusPlus.core.util.item.ItemUtils; -import gtPlusPlus.core.util.recipe.RecipeUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.RecipeUtils; import net.minecraft.item.ItemStack; public class COMPAT_ExtraUtils { diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java index 74e6d931fd..30ab5f4372 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java @@ -6,7 +6,7 @@ import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.ShapedRecipeObject; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java index bf47d2eb4b..b7da7c436e 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java @@ -1,6 +1,6 @@ package gtPlusPlus.core.common.compat; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; public class COMPAT_MorePlanets { diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java index 4fcce4013d..0241d0a0fb 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java @@ -2,8 +2,8 @@ package gtPlusPlus.core.common.compat; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.lib.CORE.ConfigSwitches; +import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.util.item.ItemUtils; public class COMPAT_Thaumcraft { diff --git a/src/Java/gtPlusPlus/core/container/Container_Workbench.java b/src/Java/gtPlusPlus/core/container/Container_Workbench.java index e3b7e9d614..1438a66bda 100644 --- a/src/Java/gtPlusPlus/core/container/Container_Workbench.java +++ b/src/Java/gtPlusPlus/core/container/Container_Workbench.java @@ -8,7 +8,7 @@ import gtPlusPlus.core.inventories.*; import gtPlusPlus.core.item.general.ItemBlueprint; import gtPlusPlus.core.slots.*; import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.*; diff --git a/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java b/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java index 453b965bc7..8b138e81bf 100644 --- a/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java +++ b/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java @@ -8,7 +8,7 @@ import gtPlusPlus.core.inventories.*; import gtPlusPlus.core.item.general.ItemBlueprint; import gtPlusPlus.core.slots.*; import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.*; diff --git a/src/Java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java b/src/Java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java index d1528747a1..d8558c4fa3 100644 --- a/src/Java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java +++ b/src/Java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java @@ -6,7 +6,7 @@ import java.util.UUID; import gtPlusPlus.api.damage.DamageTeslaTower; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.random.XSTR; -import gtPlusPlus.core.util.entity.EntityUtils; +import gtPlusPlus.core.util.minecraft.EntityUtils; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.effect.EntityWeatherEffect; diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java index 92fdcb578a..b9ba4dfd4e 100644 --- a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java +++ b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java @@ -5,8 +5,8 @@ import java.lang.reflect.Field; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.core.world.explosions.ExplosionHandler; import net.minecraft.block.Block; diff --git a/src/Java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java b/src/Java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java index 7517011673..8b5a90f2ea 100644 --- a/src/Java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java +++ b/src/Java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java @@ -2,8 +2,8 @@ package gtPlusPlus.core.entity.projectile; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.util.entity.EntityUtils; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.EntityUtils; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/Java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java b/src/Java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java index dfab6fa8ec..87219fb9fc 100644 --- a/src/Java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java +++ b/src/Java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java @@ -2,8 +2,8 @@ package gtPlusPlus.core.entity.projectile; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.util.entity.EntityUtils; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.EntityUtils; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java b/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java index c7c14e9103..11610bcc5f 100644 --- a/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java +++ b/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java @@ -11,7 +11,7 @@ import gtPlusPlus.core.inventories.BaseInventoryBackpack; import gtPlusPlus.core.inventories.BaseInventoryGrindle; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.nbt.NBTUtils; +import gtPlusPlus.core.util.minecraft.NBTUtils; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java b/src/Java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java index 991937ff03..bc505ef036 100644 --- a/src/Java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java +++ b/src/Java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java @@ -12,7 +12,7 @@ import gtPlusPlus.core.inventories.BaseInventoryGrindle; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.nbt.NBTUtils; +import gtPlusPlus.core.util.minecraft.NBTUtils; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.client.Minecraft; diff --git a/src/Java/gtPlusPlus/core/handler/BookHandler.java b/src/Java/gtPlusPlus/core/handler/BookHandler.java index f62d3d869d..69d0c0045e 100644 --- a/src/Java/gtPlusPlus/core/handler/BookHandler.java +++ b/src/Java/gtPlusPlus/core/handler/BookHandler.java @@ -5,8 +5,8 @@ import java.util.Map; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.util.item.ItemUtils; -import gtPlusPlus.core.util.recipe.RecipeUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.RecipeUtils; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java b/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java index 8bcdaca6a8..366070766b 100644 --- a/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java +++ b/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java @@ -3,7 +3,7 @@ package gtPlusPlus.core.handler; import cpw.mods.fml.common.IFuelHandler; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 42d8021899..7a190e6734 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -14,8 +14,8 @@ import gtPlusPlus.core.handler.Recipes.RegistrationHandler; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.*; -import gtPlusPlus.core.util.item.ItemUtils; -import gtPlusPlus.core.util.recipe.RecipeUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.gregtech.registration.gregtech.*; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java b/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java index a217f896cf..4d2d2d4a6e 100644 --- a/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java +++ b/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java @@ -15,9 +15,9 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.player.PlayerUtils; -import gtPlusPlus.core.util.uuid.UUIDGenerator; -import gtPlusPlus.core.util.uuid.UUIDUtils; +import gtPlusPlus.core.util.data.UUIDGenerator; +import gtPlusPlus.core.util.data.UUIDUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; import ic2.core.IC2; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java index c8c6a23bca..64d5fcf1c0 100644 --- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java @@ -11,8 +11,8 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.proxy.ClientProxy; import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.player.PlayerCache; -import gtPlusPlus.core.util.player.PlayerUtils; import ic2.core.IC2; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java index bdc9489f1d..d5ddcddaba 100644 --- a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java @@ -5,7 +5,7 @@ import java.util.UUID; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.metatileentity.*; -import gtPlusPlus.core.util.player.PlayerUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 98043d9775..ce2c49bead 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -63,12 +63,12 @@ import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.material.nuclear.NUCLIDE; -import gtPlusPlus.core.util.StringUtils; import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.debug.DEBUG_INIT; -import gtPlusPlus.core.util.fluid.FluidUtils; -import gtPlusPlus.core.util.item.ItemUtils; -import gtPlusPlus.core.util.materials.MaterialUtils; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.xmod.eio.material.MaterialEIO; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java b/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java index a878ab5254..01c7cb23f1 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java @@ -8,8 +8,8 @@ import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.GuiHandler; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java index 76d66069f5..c11effde74 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.item.base; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java index 8b68d955e3..33be067f9f 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -12,10 +12,10 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.entity.EntityUtils; -import gtPlusPlus.core.util.input.KeyboardUtils; -import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.EntityUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.sys.KeyboardUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemLoot.java b/src/Java/gtPlusPlus/core/item/base/BaseItemLoot.java index 1c92fd8455..32ea8540f9 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemLoot.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemLoot.java @@ -3,10 +3,10 @@ package gtPlusPlus.core.item.base; import java.util.List; import gregtech.api.enums.Materials; +import gtPlusPlus.api.enums.Quality; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Quality; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java b/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java index 7eff231e86..8b48085d15 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java @@ -7,7 +7,7 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index 275e7bbb3a..17d1866445 100644 --- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -6,8 +6,8 @@ import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.fluid.FluidUtils; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import ic2.core.Ic2Items; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java index e75d2a69e8..030eefc76d 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java @@ -11,9 +11,9 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.util.entity.EntityUtils; -import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.EntityUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index 64155df7c4..00a565e025 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -8,9 +8,9 @@ import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.StringUtils; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java index 5f737b47a0..820697f918 100644 --- a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java +++ b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java @@ -4,8 +4,8 @@ import java.util.List; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java index 26b3ff2ce7..1461071c32 100644 --- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java +++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java @@ -4,7 +4,7 @@ import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.item.ItemStack; public class BaseItemIngot extends BaseItemComponent{ diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index 329fae509a..63e523fbc1 100644 --- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -8,7 +8,7 @@ import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java index 8534172bbb..239e86538f 100644 --- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java +++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java @@ -6,9 +6,9 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.entity.EntityUtils; -import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.EntityUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java index f7da55cc2c..3a2e85dfb2 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java @@ -5,8 +5,8 @@ import java.util.List; import gtPlusPlus.core.fluids.BlockFluidBase; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java index 80db3a908e..879494497a 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java @@ -6,8 +6,8 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.block.base.BlockBaseModular; import gtPlusPlus.core.block.base.BlockBaseOre; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.entity.EntityUtils; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.EntityUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java index 5196fb7134..c5bf48c306 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.item.base.itemblock; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.block.base.BlockBaseModular; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java index aed0145303..ef0a53d05f 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java @@ -6,7 +6,7 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.tileentities.base.TileEntityBase; -import gtPlusPlus.core.util.player.PlayerUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java index 7aae98ca22..e97218437e 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java @@ -8,7 +8,7 @@ import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.ORES; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.entity.EntityUtils; +import gtPlusPlus.core.util.minecraft.EntityUtils; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java index 96dd2c5a16..3804085112 100644 --- a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java +++ b/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java @@ -10,7 +10,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java index d11deecc17..1ad0caa0e8 100644 --- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java +++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java @@ -12,8 +12,8 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.entity.EntityUtils; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.EntityUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java index 231b593356..34d44cd43e 100644 --- a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java +++ b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java @@ -3,7 +3,7 @@ package gtPlusPlus.core.item.base.plates; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.state.MaterialState; -import gtPlusPlus.core.util.materials.MaterialUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; public class BaseItemPlate extends BaseItemComponent{ diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java index 86f61c7251..50a056b948 100644 --- a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java +++ b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java @@ -6,10 +6,10 @@ import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.StringUtils; -import gtPlusPlus.core.util.entity.EntityUtils; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.EntityUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java index 1ac307d68c..73c1684f00 100644 --- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java +++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java @@ -4,7 +4,7 @@ import gregtech.api.enums.GT_Values; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.item.ItemStack; public class BaseItemRodLong extends BaseItemComponent{ diff --git a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java index 733a8aa9d7..661e9cd836 100644 --- a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java +++ b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java @@ -4,7 +4,7 @@ import gregtech.api.enums.GT_Values; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.item.ItemStack; public class BaseItemScrew extends BaseItemComponent{ diff --git a/src/Java/gtPlusPlus/core/item/b