aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-10-04 23:22:52 +0200
committerGitHub <noreply@github.com>2023-10-04 21:22:52 +0000
commite0d5a220e764f9a921d5cd98a3e1e2e64ad6c591 (patch)
treef998981e355c22edeae24f47286defeedf03213f /src/main
parent9f75b1d13967a7fee94b39da61fac361ae3170fa (diff)
downloadGT5-Unofficial-e0d5a220e764f9a921d5cd98a3e1e2e64ad6c591.tar.gz
GT5-Unofficial-e0d5a220e764f9a921d5cd98a3e1e2e64ad6c591.tar.bz2
GT5-Unofficial-e0d5a220e764f9a921d5cd98a3e1e2e64ad6c591.zip
Code cleanup (#2309)
* guard clause technique on GT_ItemIterator * removing oredict for ars magica 2 items * removing oredict for mystcraft items * convert big if ladder into a swtich statement * enhanced switch * clean non GTNH compat and identify other compats * spotlessApply (#2310) Co-authored-by: GitHub GTNH Actions <> * more guard clauses * reordering condition * removing dead code * removing optional block * deprecating mIC2Classic * spotless apply * deprecate modloaded variables * spotlessApply --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/api/GregTech_API.java5
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java3
-rw-r--r--src/main/java/gregtech/api/items/GT_BreederCell_Item.java2
-rw-r--r--src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java3
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java9
-rw-r--r--src/main/java/gregtech/api/util/GT_GC_Compat.java7
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java3
-rw-r--r--src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java4
-rw-r--r--src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java5
-rw-r--r--src/main/java/gregtech/common/render/items/UniversiumRenderer.java7
-rw-r--r--src/main/java/gregtech/loaders/load/GT_ItemIterator.java439
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Achievements.java22
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java45
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java17
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java31
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java28
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java221
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java1
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java14
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java63
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java35
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java93
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_ExtremeDieselFuelLoader.java8
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_FakeRecipeLoader.java17
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_PostLoad.java109
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java55
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java18
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java19
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java62
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java628
30 files changed, 931 insertions, 1042 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index ded3a6c9d7..de295e2aa6 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -278,7 +278,10 @@ public class GregTech_API {
sMachineExplosions = true, sMachineFlammable = true, sMachineNonWrenchExplosions = true,
sMachineRainExplosions = true, sMachineThunderExplosions = true, sMachineFireExplosions = true,
sMachineWireFire = true, mOutputRF = false, mInputRF = false, meIOLoaded = false, mRFExplosions = false,
- mServerStarted = false, mIC2Classic = false, mMagneticraft = false, mImmersiveEngineering = false,
+ mServerStarted = false;
+
+ @Deprecated
+ public static boolean mIC2Classic = false, mMagneticraft = false, mImmersiveEngineering = false,
mGTPlusPlus = false, mTranslocator = false, mTConstruct = false, mGalacticraft = false, mHodgepodge = false,
mAvaritia = false;
/**
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index 5a756519e3..f0ee636f8b 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -3,6 +3,7 @@ package gregtech.api.enums;
import static gregtech.api.enums.GT_Values.B;
import static gregtech.api.enums.GT_Values.D2;
import static gregtech.api.enums.GT_Values.M;
+import static gregtech.api.enums.Mods.GTPlusPlus;
import java.util.ArrayList;
import java.util.Arrays;
@@ -1280,7 +1281,7 @@ public enum OrePrefixes {
plateQuadruple.mDisabledItems.add(aMaterial);
if (!enableUnusedQuinPlates && !(aMaterial == Materials.Paper))
plateQuintuple.mDisabledItems.add(aMaterial);
- if (!(enableUnusedDensePlates || GregTech_API.mGTPlusPlus)
+ if (!(enableUnusedDensePlates || GTPlusPlus.isModLoaded())
&& !(aMaterial == Materials.Iron || aMaterial == Materials.Copper
|| aMaterial == Materials.Lead
|| aMaterial == Materials.Paper
diff --git a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java b/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
index 587d469017..3d51415783 100644
--- a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
@@ -68,7 +68,7 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp
@Override
public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) {
if ((entity instanceof EntityLivingBase entityLiving)) {
- if (!GregTech_API.mIC2Classic && !GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
+ if (!GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
IC2Potion.radiation.applyTo(entityLiving, 20, 1);
}
}
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
index c38510f750..8698bac886 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
+++ b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
@@ -7,7 +7,6 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
-import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_Utility;
import ic2.api.reactor.IReactor;
@@ -176,7 +175,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
@Override
public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) {
if (this.sRadiation > 0 && (entity instanceof EntityLivingBase entityLiving)) {
- if (!GregTech_API.mIC2Classic && !GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
+ if (!GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10);
}
}
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
index 862650d3d5..7162815a17 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
@@ -2,6 +2,8 @@ package gregtech.api.metatileentity.implementations;
import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES;
import static gregtech.api.enums.GT_Values.D1;
+import static gregtech.api.enums.Mods.TinkerConstruct;
+import static gregtech.api.enums.Mods.Translocator;
import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.BOTTOM;
import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.LEFT;
import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.RIGHT;
@@ -38,7 +40,6 @@ import org.apache.commons.lang3.tuple.MutableTriple;
import cpw.mods.fml.common.Optional;
import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Mods;
@@ -549,15 +550,15 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
? (IGregTechTileEntity) tileEntity
: null;
- if (coverBehavior instanceof GT_Cover_Drain || (GregTech_API.mTConstruct && isTConstructFaucet(tileEntity)))
- return true;
+ if (coverBehavior instanceof GT_Cover_Drain
+ || (TinkerConstruct.isModLoaded() && isTConstructFaucet(tileEntity))) return true;
final IFluidHandler fTileEntity = (tileEntity instanceof IFluidHandler) ? (IFluidHandler) tileEntity : null;
if (fTileEntity != null) {
final FluidTankInfo[] tInfo = fTileEntity.getTankInfo(tSide);
if (tInfo != null) {
- return tInfo.length > 0 || (GregTech_API.mTranslocator && isTranslocator(tileEntity))
+ return tInfo.length > 0 || (Translocator.isModLoaded() && isTranslocator(tileEntity))
|| gTileEntity != null
&& gTileEntity.getCoverBehaviorAtSideNew(tSide) instanceof GT_Cover_FluidRegulator;
}
diff --git a/src/main/java/gregtech/api/util/GT_GC_Compat.java b/src/main/java/gregtech/api/util/GT_GC_Compat.java
index a441fa4be1..24710ab0ac 100644
--- a/src/main/java/gregtech/api/util/GT_GC_Compat.java
+++ b/src/main/java/gregtech/api/util/GT_GC_Compat.java
@@ -1,9 +1,10 @@
package gregtech.api.util;
+import static gregtech.api.enums.Mods.GalacticraftCore;
+
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
-import gregtech.api.GregTech_API;
import micdoodle8.mods.galacticraft.api.power.EnergySource;
import micdoodle8.mods.galacticraft.api.power.EnergySource.EnergySourceAdjacent;
import micdoodle8.mods.galacticraft.api.power.IEnergyHandlerGC;
@@ -15,7 +16,7 @@ public class GT_GC_Compat {
public static long insertEnergyInto(TileEntity tTileEntity, long aVoltage, ForgeDirection tDirection) {
// GC Compat
- if (GregTech_API.mGalacticraft && tTileEntity instanceof IEnergyHandlerGC) {
+ if (GalacticraftCore.isModLoaded() && tTileEntity instanceof IEnergyHandlerGC) {
if (!(tTileEntity instanceof IConnector)
|| ((IConnector) tTileEntity).canConnect(tDirection, NetworkType.POWER)) {
EnergySource eSource = new EnergySourceAdjacent(tDirection);
@@ -44,7 +45,7 @@ public class GT_GC_Compat {
public static boolean canConnect(TileEntity tTileEntity, ForgeDirection tDirection) {
// GC Compat
- return GregTech_API.mGalacticraft && tTileEntity instanceof IEnergyHandlerGC
+ return GalacticraftCore.isModLoaded() && tTileEntity instanceof IEnergyHandlerGC
&& (!(tTileEntity instanceof IConnector)
|| ((IConnector) tTileEntity).canConnect(tDirection, NetworkType.POWER));
}
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 0bac435d9a..b61ec8336f 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -10,6 +10,7 @@ import static gregtech.api.enums.GT_Values.NW;
import static gregtech.api.enums.GT_Values.V;
import static gregtech.api.enums.GT_Values.W;
import static gregtech.api.enums.Materials.FLUID_MAP;
+import static gregtech.api.enums.Mods.Translocator;
import static gregtech.common.GT_UndergroundOil.undergroundOilReadInformation;
import static net.minecraftforge.common.util.ForgeDirection.DOWN;
import static net.minecraftforge.common.util.ForgeDirection.EAST;
@@ -573,7 +574,7 @@ public class GT_Utility {
if (TE_CHECK && tileEntity instanceof IItemDuct) return true;
if (BC_CHECK && tileEntity instanceof buildcraft.api.transport.IPipeTile pipeTile)
return pipeTile.isPipeConnected(side);
- return GregTech_API.mTranslocator && tileEntity instanceof codechicken.translocator.TileItemTranslocator;
+ return Translocator.isModLoaded() && tileEntity instanceof codechicken.translocator.TileItemTranslocator;
}
/**
diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java b/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java
index e6a0ed750b..2788fd15c2 100644
--- a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java
+++ b/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java
@@ -9,6 +9,7 @@ import static gregtech.api.enums.ItemList.Large_Fluid_Cell_StainlessSteel;
import static gregtech.api.enums.ItemList.Large_Fluid_Cell_Steel;
import static gregtech.api.enums.ItemList.Large_Fluid_Cell_Titanium;
import static gregtech.api.enums.ItemList.Large_Fluid_Cell_TungstenSteel;
+import static gregtech.api.enums.Mods.HodgePodge;
import javax.annotation.Nullable;
@@ -25,7 +26,6 @@ import org.lwjgl.opengl.GL11;
import com.mitchej123.hodgepodge.textures.IPatchedTextureAtlasSprite;
-import gregtech.api.GregTech_API;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Textures;
import gregtech.api.items.GT_MetaGenerated_Item;
@@ -194,7 +194,7 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer {
}
protected void markNeedsAnimationUpdate(IIcon icon) {
- if (GregTech_API.mHodgepodge && icon instanceof IPatchedTextureAtlasSprite) {
+ if (HodgePodge.isModLoaded() && icon instanceof IPatchedTextureAtlasSprite) {
((IPatchedTextureAtlasSprite) icon).markNeedsAnimationUpdate();
}
}
diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java
index 727064d3ea..ef06731fbe 100644
--- a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java
+++ b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java
@@ -1,5 +1,7 @@
package gregtech.common.render.items;
+import static gregtech.api.enums.Mods.HodgePodge;
+
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
@@ -13,7 +15,6 @@ import org.lwjgl.opengl.GL11;
import com.mitchej123.hodgepodge.textures.IPatchedTextureAtlasSprite;
import codechicken.lib.render.TextureUtils;
-import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
import gregtech.api.util.GT_Utility;
import gregtech.common.render.GT_RenderUtil;
@@ -158,7 +159,7 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer {
}
protected void markNeedsAnimationUpdate(IIcon icon) {
- if (GregTech_API.mHodgepodge && icon instanceof IPatchedTextureAtlasSprite) {
+ if (HodgePodge.isModLoaded() && icon instanceof IPatchedTextureAtlasSprite) {
((IPatchedTextureAtlasSprite) icon).markNeedsAnimationUpdate();
}
}
diff --git a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java
index 14e2ca2d8e..b0e2c39cb7 100644
--- a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java
+++ b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java
@@ -1,5 +1,7 @@
package gregtech.common.render.items;
+import static gregtech.api.enums.Mods.Avaritia;
+
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.RenderHelper;
@@ -17,7 +19,6 @@ import org.lwjgl.opengl.GL12;
import codechicken.lib.render.TextureUtils;
import fox.spiteful.avaritia.render.CosmicRenderShenanigans;
-import gregtech.api.GregTech_API;
import gregtech.api.enums.ItemList;
import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
@@ -81,7 +82,9 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer {
private void magicRenderMethod(ItemRenderType type, ItemStack aStack, IIcon tIcon, boolean fluidDisplay,
Object... data) {
- if (!GregTech_API.mAvaritia) return;
+ if (!Avaritia.isModLoaded()) {
+ return;
+ }
RenderItem r = RenderItem.getInstance();
Minecraft mc = Minecraft.getMinecraft();
diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
index 84f7610824..b50fe65dc5 100644
--- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
+++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
@@ -3,6 +3,7 @@ package gregtech.loaders.load;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCannerRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeBuilder.WILDCARD;
import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
@@ -22,7 +23,6 @@ import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OreDictNames;
import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.ToolDictNames;
import gregtech.api.items.GT_Generic_Item;
import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_ModHandler;
@@ -126,13 +126,13 @@ public class GT_ItemIterator implements Runnable {
GT_Log.out.println(
"GT_Mod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)");
GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Items.rotten_flesh, 2, 32767), ItemList.IC2_Food_Can_Empty.get(1L))
+ .itemInputs(new ItemStack(Items.rotten_flesh, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L))
.itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
.duration(10 * SECONDS)
.eut(1)
.addTo(sCannerRecipes);
GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Items.spider_eye, 2, 32767), ItemList.IC2_Food_Can_Empty.get(1L))
+ .itemInputs(new ItemStack(Items.spider_eye, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L))
.itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
.duration(5 * SECONDS)
.eut(1)
@@ -144,13 +144,13 @@ public class GT_ItemIterator implements Runnable {
.eut(1)
.addTo(sCannerRecipes);
GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Items.cake, 1, 32767), ItemList.IC2_Food_Can_Empty.get(12L))
+ .itemInputs(new ItemStack(Items.cake, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(12L))
.itemOutputs(ItemList.IC2_Food_Can_Filled.get(12L))
.duration(30 * SECONDS)
.eut(1)
.addTo(sCannerRecipes);
GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Items.mushroom_stew, 1, 32767), ItemList.IC2_Food_Can_Empty.get(6L))
+ .itemInputs(new ItemStack(Items.mushroom_stew, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(6L))
.itemOutputs(ItemList.IC2_Food_Can_Filled.get(6L), new ItemStack(Items.bowl, 1))
.duration(15 * SECONDS)
.eut(1)
@@ -162,294 +162,161 @@ public class GT_ItemIterator implements Runnable {
/* (tName.equals("tile.sedimentaryStone")) || **/
for (Object o : Item.itemRegistry) {
Object tObject;
- if (((tObject = o) instanceof Item) && (!(tObject instanceof GT_Generic_Item))) {
- Item tItem = (Item) tObject;
- String tName;
- if ((tName = tItem.getUnlocalizedName()) != null) {
- if ((tItem instanceof IToolCrowbar)) {
- if ((!tItem.isDamageable())
- && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) {
- if ((GregTech_API.sRecipeFile.get(
- ConfigCategories.Recipes.disabledrecipes,
- "infiniteDurabilityRCCrowbars",
- false)) && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) {
- GT_Log.out.println("GT_Mod: Removed infinite RC Crowbar: " + tName);
- }
- } else if (GregTech_API.registerCrowbar(new ItemStack(tItem, 1, 32767))) {
- GT_Log.out.println("GT_Mod: Registered valid RC Crowbar: " + tName);
- }
- }
- if ((tItem instanceof IToolWrench)) {
- if ((!tItem.isDamageable())
- && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) {
- if ((GregTech_API.sRecipeFile.get(
- ConfigCategories.Recipes.disabledrecipes,
- "infiniteDurabilityBCWrenches",
- false)) && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) {
- GT_Log.out.println("GT_Mod: Removed infinite BC Wrench: " + tName);
- }
- } else if (GregTech_API.registerWrench(new ItemStack(tItem, 1, 32767))) {
- GT_Log.out.println("GT_Mod: Registered valid BC Wrench: " + tName);
- }
- }
- Block tBlock = GT_Utility.getBlockFromStack(new ItemStack(tItem, 1, 0));
- if (tBlock != null) {
- if (tName.endsWith("beehives")) {
- tBlock.setHarvestLevel("scoop", 0);
- gregtech.common.tools.GT_Tool_Scoop.sBeeHiveMaterial = tBlock.getMaterial();
- }
- if (OrePrefixes.stone.mDefaultStackSize
- < tItem.getItemStackLimit(new ItemStack(tItem, 1, 0))) {
- if ((tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.stone))
- || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.netherrack))
- || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.end_stone))) {
- tItem.setMaxStackSize(OrePrefixes.stone.mDefaultStackSize);
- }
- }
- }
- if (((tItem instanceof ItemFood)) && (tItem != ItemList.IC2_Food_Can_Filled.getItem())
- && (tItem != ItemList.IC2_Food_Can_Spoiled.getItem())) {
- int tFoodValue = ((ItemFood) tItem).func_150905_g(new ItemStack(tItem, 1, 0));
- if (tFoodValue > 0) {
- GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
- recipeBuilder.itemInputs(
- new ItemStack(tItem, 1, 32767),
- ItemList.IC2_Food_Can_Empty.get(tFoodValue));
- if (GT_Utility.getContainerItem(new ItemStack(tItem, 1, 0), true) == null) {
- recipeBuilder.itemOutputs(ItemList.IC2_Food_Can_Filled.get(tFoodValue));
- } else {
- recipeBuilder.itemOutputs(
- ItemList.IC2_Food_Can_Filled.get(tFoodValue),
- GT_Utility.getContainerItem(new ItemStack(tItem, 1, 0), true));
- }
- recipeBuilder.duration(tFoodValue * 5 * SECONDS)
- .eut(1)
- .addTo(sCannerRecipes);
- }
- }
- if ((tItem instanceof IFluidContainerItem)) {
- GT_OreDictUnificator.addToBlacklist(new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("tile.ArsMagica:ore_vinteum")) {
- GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Vinteum, new ItemStack(tItem, 1, 0));
- }
- if (tName.equals("item.ArsMagica:purified_vinteum")) {
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(tItem, 1, 0))
- .metadata(FUEL_VALUE, 256)
- .metadata(FUEL_TYPE, 5)
- .duration(0)
- .eut(0)
- .addTo(GT_RecipeConstants.Fuel);
- }
- if ((tName.equals("item.fieryBlood")) || (tName.equals("item.fieryTears"))) {
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(tItem, 1, 0))
- .metadata(FUEL_VALUE, 2048)
- .metadata(FUEL_TYPE, 5)
- .duration(0)
- .eut(0)
- .addTo(GT_RecipeConstants.Fuel);
- }
- if (tName.equals("tile.TFRoots")) {
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(tItem, 1, 0))
- .itemOutputs(new ItemStack(Items.stick, 2), new ItemStack(Items.stick, 1))
- .outputChances(10000, 3000)
- .duration(20 * SECONDS)
- .eut(2)
- .addTo(sMaceratorRecipes);
- GT_ModHandler.addSawmillRecipe(
- new ItemStack(tItem, 1, 0),
- new ItemStack(Items.stick, 4),
- new ItemStack(Items.stick, 2));
+ if (!(((tObject = o) instanceof Item) && (!(tObject instanceof GT_Generic_Item)))) {
+ continue;
+ }
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(tItem, 1, 1))
- .itemOutputs(new ItemStack(Items.stick, 4))
- .metadata(FUEL_VALUE, 32)
- .metadata(FUEL_TYPE, 5)
- .duration(0)
- .eut(0)
- .addTo(GT_RecipeConstants.Fuel);
- }
- if (tName.equals("item.tconstruct.manual")) {
- GT_OreDictUnificator.registerOre("bookTinkersManual", new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("item.ArsMagica:spell_parchment")) {
- GT_OreDictUnificator.registerOre("paperArsSpellParchment", new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("item.ArsMagica:spell_recipe")) {
- GT_OreDictUnificator.registerOre("paperArsSpellRecipe", new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("item.ArsMagica:spell_book")) {
- GT_OreDictUnificator.registerOre("bookArsSpells", new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("item.myst.page")) {
- GT_OreDictUnificator.registerOre("paperMystcraft", new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("item.myst.agebook")) {
- GT_OreDictUnificator.registerOre("bookMystcraftAge", new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("item.myst.linkbook")) {
- GT_OreDictUnificator.registerOre("bookMystcraftLink", new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("item.myst.notebook")) {
- GT_OreDictUnificator.registerOre("bookNotes", new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("item.itemManuelBook")) {
- GT_OreDictUnificator.registerOre("bookWritten", new ItemStack(tItem, 1, 0));
- }
- if (tName.equals("item.blueprintItem")) {
- GT_OreDictUnificator.registerOre("paperBlueprint", new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("item.ccprintout")) {
- GT_OreDictUnificator.registerOre("paperWritten", new ItemStack(tItem, 1, 0));
- GT_OreDictUnificator.registerOre("paperWritten", new ItemStack(tItem, 1, 1));
- GT_OreDictUnificator.registerOre("bookWritten", new ItemStack(tItem, 1, 2));
- }
- if (tName.equals("item.blueprintItem")) {
- GT_OreDictUnificator.registerOre("paperBlueprint", new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("item.wirelessmap")) {
- GT_OreDictUnificator.registerOre("paperMap", new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("item.ItemResearchNotes")) {
- GT_OreDictUnificator.registerOre("paperResearch", new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("item.ItemThaumonomicon")) {
- GT_OreDictUnificator.registerOre("bookThaumonomicon", new ItemStack(tItem, 1, 32767));
- }
- if (tName.equals("item.ligniteCoal")) {
- GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Lignite, new ItemStack(tItem, 1, 0));
- }
- if ((tName.equals("tile.extrabiomes.redrock")) || (tName.equals("tile.bop.redRocks"))) {
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 1));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 2));
- }
- if (tName.equals("tile.rpstone")) {
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 0));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 1));
-