aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core/item
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-09 01:08:26 +0200
committerGitHub <noreply@github.com>2023-04-09 01:08:26 +0200
commit26caa265b7eae49767947e1ff4e6cfc8166b07f5 (patch)
tree0fc0332da7a843cf153bf75fcc2e20601bbf18ee /src/main/java/gtPlusPlus/core/item
parentc33b3ba66194c7441fbd437530d21a51aa4395d5 (diff)
downloadGT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.gz
GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.bz2
GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.zip
clean up GT++ code (#589)
* yeet big reactor support * yeet IC2 classic support * yeet pneumaticraft support * yeet More Planets support * yeet Immersive Engineering support * yeet Psychedilicraft support * yeet Beyond Reality Core support * sort mods to see what must be purged * yeet simply jetpacks * yeet RFTools * yeet xReliquary * yeet RedTech * yeet Mekanism * yeet GrowthCraft * yeet ihl * leftover cleaning * yeet thermal fondation support * yeet compact windmills support * spotless * remove constants from LoadedMods (part 1 / 2) * spotless * remove constants from LoadedMods (part 2 / 2) * use mod id enum instead of strings + optimize imports * Loaded.isModLoaded -> enum * restore RA init * missing ! * start organizing recipes stuff * fix crash on world load in dev * remove unused class * remove HazmatUtils.java * move all the removals * remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack) * move some pyrolyse oven recipes to its own file * sa * bump GT version * bump GT5U version * spotless apply * use Everglades entry from the mod enum --------- Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/core/item')
-rw-r--r--src/main/java/gtPlusPlus/core/item/ModItems.java209
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java24
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java7
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java7
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java21
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java8
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java9
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java6
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java11
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/CoreItem.java7
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java11
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java7
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java7
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java11
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java12
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java15
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java9
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java29
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java9
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java4
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java12
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java7
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java14
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java11
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java19
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java7
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java13
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java7
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/BufferCore.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java23
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java23
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java18
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java15
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java6
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java4
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java11
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java11
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java26
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java7
-rw-r--r--src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java18
-rw-r--r--src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java26
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java6
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java22
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java7
-rw-r--r--src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java7
87 files changed, 583 insertions, 405 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index 3b9a1b48c6..dd07d2b138 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -1,58 +1,122 @@
package gtPlusPlus.core.item;
-import static gtPlusPlus.core.creative.AddToCreativeTab.*;
+import static gregtech.api.enums.Mods.Baubles;
+import static gregtech.api.enums.Mods.EnderIO;
+import static gregtech.api.enums.Mods.Forestry;
+import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.enums.Mods.GregTech;
+import static gregtech.api.enums.Mods.Thaumcraft;
+import static gtPlusPlus.core.creative.AddToCreativeTab.tabMachines;
+import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT;
-import net.minecraft.item.*;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.util.EnumHelper;
-import net.minecraftforge.fluids.*;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.*;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
import gtPlusPlus.core.block.base.BlockBaseModular;
import gtPlusPlus.core.common.compat.COMPAT_Baubles;
import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.*;
+import gtPlusPlus.core.item.base.BaseEuItem;
+import gtPlusPlus.core.item.base.BaseItemBackpack;
import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes;
+import gtPlusPlus.core.item.base.BaseItemDamageable;
+import gtPlusPlus.core.item.base.BaseItemTCShard;
+import gtPlusPlus.core.item.base.CoreItem;
import gtPlusPlus.core.item.base.dusts.BaseItemDust;
import gtPlusPlus.core.item.base.foil.BaseItemFoil;
-import gtPlusPlus.core.item.base.foods.*;
+import gtPlusPlus.core.item.base.foods.BaseItemFood;
+import gtPlusPlus.core.item.base.foods.BaseItemHotFood;
import gtPlusPlus.core.item.base.gears.BaseItemSmallGear;
-import gtPlusPlus.core.item.base.ingots.*;
+import gtPlusPlus.core.item.base.ingots.BaseItemIngot;
+import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD;
import gtPlusPlus.core.item.base.misc.BaseItemMisc;
import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes;
-import gtPlusPlus.core.item.base.plates.*;
-import gtPlusPlus.core.item.bauble.*;
-import gtPlusPlus.core.item.chemistry.*;
+import gtPlusPlus.core.item.base.plates.BaseItemPlate;
+import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble;
+import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble;
+import gtPlusPlus.core.item.bauble.HealthBoostBauble;
+import gtPlusPlus.core.item.bauble.ModularBauble;
+import gtPlusPlus.core.item.bauble.MonsterKillerBaseBauble;
+import gtPlusPlus.core.item.chemistry.AgriculturalChem;
+import gtPlusPlus.core.item.chemistry.CoalTar;
+import gtPlusPlus.core.item.chemistry.GenericChem;
+import gtPlusPlus.core.item.chemistry.IonParticles;
+import gtPlusPlus.core.item.chemistry.MilledOreProcessing;
+import gtPlusPlus.core.item.chemistry.NuclearChem;
+import gtPlusPlus.core.item.chemistry.RocketFuels;
+import gtPlusPlus.core.item.chemistry.StandardBaseParticles;
import gtPlusPlus.core.item.crafting.ItemDummyResearch;
-import gtPlusPlus.core.item.effects.RarityUncommon;
import gtPlusPlus.core.item.food.BaseItemMetaFood;
-import gtPlusPlus.core.item.general.*;
+import gtPlusPlus.core.item.general.BaseItemGrindle;
+import gtPlusPlus.core.item.general.BufferCore;
+import gtPlusPlus.core.item.general.ItemAirFilter;
+import gtPlusPlus.core.item.general.ItemAreaClear;
+import gtPlusPlus.core.item.general.ItemBasicFirestarter;
+import gtPlusPlus.core.item.general.ItemBasicScrubberTurbine;
+import gtPlusPlus.core.item.general.ItemBlueprint;
+import gtPlusPlus.core.item.general.ItemControlCore;
+import gtPlusPlus.core.item.general.ItemEmpty;
+import gtPlusPlus.core.item.general.ItemGemShards;
+import gtPlusPlus.core.item.general.ItemGenericToken;
+import gtPlusPlus.core.item.general.ItemGiantEgg;
+import gtPlusPlus.core.item.general.ItemHalfCompleteCasings;
+import gtPlusPlus.core.item.general.ItemLavaFilter;
+import gtPlusPlus.core.item.general.ItemMagicFeather;
+import gtPlusPlus.core.item.general.ItemSunnariumBit;
import gtPlusPlus.core.item.general.books.ItemBaseBook;
import gtPlusPlus.core.item.general.capture.ItemEntityCatcher;
-import gtPlusPlus.core.item.general.chassis.*;
+import gtPlusPlus.core.item.general.chassis.ItemBoilerChassis;
+import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoil;
+import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire;
import gtPlusPlus.core.item.general.spawn.ItemCustomSpawnEgg;
-import gtPlusPlus.core.item.general.throwables.*;
+import gtPlusPlus.core.item.general.throwables.ItemHydrofluoricAcidPotion;
+import gtPlusPlus.core.item.general.throwables.ItemSulfuricAcidPotion;
+import gtPlusPlus.core.item.general.throwables.ItemThrowableBomb;
import gtPlusPlus.core.item.init.ItemsFoods;
import gtPlusPlus.core.item.materials.DustDecayable;
-import gtPlusPlus.core.item.tool.misc.*;
-import gtPlusPlus.core.item.tool.misc.box.*;
-import gtPlusPlus.core.item.tool.staballoy.*;
+import gtPlusPlus.core.item.tool.misc.DebugScanner;
+import gtPlusPlus.core.item.tool.misc.GregtechPump;
+import gtPlusPlus.core.item.tool.misc.SandstoneHammer;
+import gtPlusPlus.core.item.tool.misc.box.AutoLunchBox;
+import gtPlusPlus.core.item.tool.misc.box.MagicToolBag;
+import gtPlusPlus.core.item.tool.misc.box.UniversalToolBox;
+import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
+import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase;
+import gtPlusPlus.core.item.tool.staballoy.StaballoyAxe;
+import gtPlusPlus.core.item.tool.staballoy.StaballoyPickaxe;
import gtPlusPlus.core.item.wearable.WearableLoader;
-import gtPlusPlus.core.lib.*;
+import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.CORE.ConfigSwitches;
-import gtPlusPlus.core.material.*;
-import gtPlusPlus.core.material.nuclear.*;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.material.NONMATERIAL;
+import gtPlusPlus.core.material.nuclear.FLUORIDES;
+import gtPlusPlus.core.material.nuclear.NUCLIDE;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.data.StringUtils;
import gtPlusPlus.core.util.debug.DEBUG_INIT;
-import gtPlusPlus.core.util.minecraft.*;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.everglades.GTplusplus_Everglades;
import gtPlusPlus.preloader.CORE_Preloader;
@@ -89,16 +153,7 @@ public final class ModItems {
public static Item itemDustEnergeticAlloy;
public static Item itemDustVibrantAlloy;
public static Item itemDustConductiveIron;
- // Big Reactors
- public static Item itemPlateBlutonium;
- public static Item itemPlateCyanite;
- public static Item itemPlateLudicrite;
- // Pneumaticraft
- public static Item itemPlateCompressedIron;
- // SimplyJetpacks
- public static Item itemPlateEnrichedSoularium;
- // rfTools
- public static Item itemPlateDimensionShard;
+
// Staballoy
public static Item itemStaballoyPickaxe;
public static Item itemStaballoyAxe;
@@ -386,17 +441,17 @@ public final class ModItems {
// Some Simple forms of materials
itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines)
- .setTextureName(CORE.MODID + ":itemStickyRubber");
+ .setTextureName(GTPlusPlus.ID + ":itemStickyRubber");
GameRegistry.reg