diff --git a/src/main/java/gregtechmod/api/GregTech_API.java b/src/main/java/gregtechmod/api/GregTech_API.java index a87e529..b61e1be 100644 --- a/src/main/java/gregtechmod/api/GregTech_API.java +++ b/src/main/java/gregtechmod/api/GregTech_API.java @@ -529,7 +529,7 @@ public class GregTech_API { * Best is you make a Runnable with all Cover Registrations, and add it to the Cover Registration ArrayList ontop of this File. */ public static void registerCover(ItemStack aStack, IIcon aCover) { - int tStack = GT_Utility.stackToInt1(aStack); + int tStack = GT_Utility.stackToInt(aStack); if (tStack != 0 && sCovers.get(tStack) == null) { sCoversItems.put(tStack, aStack.copy()); sCovers.put(tStack, aCover); @@ -574,7 +574,7 @@ public class GregTech_API { * returns a Cover behavior, guaranteed to not return null after preload */ public static GT_CoverBehavior getCoverBehavior(ItemStack aStack) { - return getCoverBehavior(GT_Utility.stackToInt1(aStack)); + return getCoverBehavior(GT_Utility.stackToInt(aStack)); } /** diff --git a/src/main/java/gregtechmod/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtechmod/api/metatileentity/BaseMetaPipeEntity.java index f4808d7..21971e3 100644 --- a/src/main/java/gregtechmod/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtechmod/api/metatileentity/BaseMetaPipeEntity.java @@ -604,7 +604,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE if (getCoverIDAtSide(cSide) == 0) { if (GT_Utility.isItemStackInIntList(aPlayer.inventory.getCurrentItem(), GregTech_API.sCovers.keySet())) { - if (GregTech_API.getCoverBehavior(aPlayer.inventory.getCurrentItem()).isCoverPlaceable(cSide, GT_Utility.stackToInt1(aPlayer.inventory.getCurrentItem()), this) && mMetaTileEntity.allowCoverOnSide(cSide, GT_Utility.stackToInt1(aPlayer.inventory.getCurrentItem()))) { + if (GregTech_API.getCoverBehavior(aPlayer.inventory.getCurrentItem()).isCoverPlaceable(cSide, GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem()), this) && mMetaTileEntity.allowCoverOnSide(cSide, GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem()))) { setCoverItemAtSide(cSide, aPlayer.inventory.getCurrentItem()); if (!aPlayer.capabilities.isCreativeMode) aPlayer.inventory.getCurrentItem().stackSize--; GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(100), 1.0F, -1, xCoord, yCoord, zCoord); @@ -850,7 +850,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE @Override public void setCoverItemAtSide(byte aSide, ItemStack aCover) { - setCoverIDAtSide(aSide, GT_Utility.stackToInt1(aCover)); + setCoverIDAtSide(aSide, GT_Utility.stackToInt(aCover)); } @Override diff --git a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntity.java index 71abc6b..2a8595a 100644 --- a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntity.java @@ -888,7 +888,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE if (getCoverIDAtSide(aSide) == 0) { if (GT_Utility.isItemStackInIntList(aPlayer.inventory.getCurrentItem(), GregTech_API.sCovers.keySet())) { - if (GregTech_API.getCoverBehavior(aPlayer.inventory.getCurrentItem()).isCoverPlaceable(aSide, GT_Utility.stackToInt1(aPlayer.inventory.getCurrentItem()), this) && mMetaTileEntity.allowCoverOnSide(aSide, GT_Utility.stackToInt1(aPlayer.inventory.getCurrentItem()))) { + if (GregTech_API.getCoverBehavior(aPlayer.inventory.getCurrentItem()).isCoverPlaceable(aSide, GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem()), this) && mMetaTileEntity.allowCoverOnSide(aSide, GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem()))) { setCoverItemAtSide(aSide, aPlayer.inventory.getCurrentItem()); if (!aPlayer.capabilities.isCreativeMode) aPlayer.inventory.getCurrentItem().stackSize--; GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(100), 1.0F, -1, xCoord, yCoord, zCoord); @@ -1287,7 +1287,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE @Override public void setCoverItemAtSide(byte aSide, ItemStack aCover) { - setCoverIDAtSide(aSide, GT_Utility.stackToInt1(aCover)); + setCoverIDAtSide(aSide, GT_Utility.stackToInt(aCover)); } @Override diff --git a/src/main/java/gregtechmod/api/recipe/RecipeMap.java b/src/main/java/gregtechmod/api/recipe/RecipeMap.java index d090dcf..c435853 100644 --- a/src/main/java/gregtechmod/api/recipe/RecipeMap.java +++ b/src/main/java/gregtechmod/api/recipe/RecipeMap.java @@ -96,7 +96,7 @@ public class RecipeMap> { for (ItemStack item : input) { if (GT_Utility.isStackValid(item)) { - List recipesItems = MAPPINGS.get(GT_Utility.stackToInt1(item)); + List recipesItems = MAPPINGS.get(GT_Utility.stackToInt(item)); List recipesItemsWild = MAPPINGS.get(GT_Utility.stackToInt(item, true)); if (recipesItems != null) recipesTotal.addAll(recipesItems); @@ -175,7 +175,7 @@ public class RecipeMap> { for (Ingredient ingr : recipe.getInputs()) { for (ItemStack var : ingr.getVariants()) { - int value = GT_Utility.stackToInt1(var); + int value = GT_Utility.stackToInt(var); int wild = GT_Utility.stackToInt(var, true); List var1 = MAPPINGS.get(value); List var2 = MAPPINGS.get(wild); diff --git a/src/main/java/gregtechmod/api/util/GT_CoverBehavior.java b/src/main/java/gregtechmod/api/util/GT_CoverBehavior.java index bee531c..3e2734f 100644 --- a/src/main/java/gregtechmod/api/util/GT_CoverBehavior.java +++ b/src/main/java/gregtechmod/api/util/GT_CoverBehavior.java @@ -15,7 +15,7 @@ public abstract class GT_CoverBehavior { * Gives all Covers which are out of these Stacks a special behavior. */ public GT_CoverBehavior(ItemStack[] aCovers) { - for (ItemStack tCover : aCovers) GregTech_API.sCoverBehaviors.put(GT_Utility.stackToInt1(tCover), this); + for (ItemStack tCover : aCovers) GregTech_API.sCoverBehaviors.put(GT_Utility.stackToInt(tCover), this); } /** @@ -29,7 +29,7 @@ public abstract class GT_CoverBehavior { * Gives Cover which is out of this Stack a special behavior. */ public GT_CoverBehavior(ItemStack aCover) { - GregTech_API.sCoverBehaviors.put(GT_Utility.stackToInt1(aCover), this); + GregTech_API.sCoverBehaviors.put(GT_Utility.stackToInt(aCover), this); } /** diff --git a/src/main/java/gregtechmod/api/util/GT_OreDictUnificator.java b/src/main/java/gregtechmod/api/util/GT_OreDictUnificator.java index 3fcf4a3..c36c878 100644 --- a/src/main/java/gregtechmod/api/util/GT_OreDictUnificator.java +++ b/src/main/java/gregtechmod/api/util/GT_OreDictUnificator.java @@ -104,7 +104,6 @@ public class GT_OreDictUnificator { isAddingOre++; aStack = GT_Utility.copyAmount(1, aStack); if (!aAlreadyRegistered) sToRegister.put(aStack, aName.toString()); - addAssociation(aName, aStack); if (aOverwrite || GT_Utility.isStackInvalid(sName2OreMap.get(aName.toString()))) { sName2OreMap.put(aName.toString(), aStack); } diff --git a/src/main/java/gregtechmod/api/util/GT_Utility.java b/src/main/java/gregtechmod/api/util/GT_Utility.java index 336ef7d..a92e9fb 100644 --- a/src/main/java/gregtechmod/api/util/GT_Utility.java +++ b/src/main/java/gregtechmod/api/util/GT_Utility.java @@ -41,7 +41,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -850,7 +849,7 @@ public class GT_Utility { return parseNumberToString(chance * 1.0D / 100.0D); } - public static int stackToInt1(ItemStack aStack) { + public static int stackToInt(ItemStack aStack) { if (isStackInvalid(aStack)) return -1; return stackToInt(aStack, aStack.getItemDamage() == GregTech_API.ITEM_WILDCARD_DAMAGE); } @@ -867,16 +866,6 @@ public class GT_Utility { return code; } - public static int stackToInt(ItemStack aStack) { - if (isStackInvalid(aStack)) return 0; - return Item.getIdFromItem(aStack.getItem()) | (Items.feather.getDamage(aStack) << 16); - } - - public static int stackToWildcard(ItemStack aStack) { - if (isStackInvalid(aStack)) return 0; - return Item.getIdFromItem(aStack.getItem()) | (GregTech_API.ITEM_WILDCARD_DAMAGE << 16); - } - public static int fluidStackToInt(FluidStack fluid) { int code = 1; code = 31*code + fluid.getFluid().hashCode(); diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneWirelessBase.java index 468797f..ead340e 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneWirelessBase.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneWirelessBase.java @@ -25,7 +25,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (((aX > 0.375 && aX < 0.625) || aSide > 3) && ((aY > 0.375 && aY < 0.625) || aSide < 2) && ((aZ > 0.375 && aZ < 0.625) || aSide == 2 || aSide == 3)) { GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte)0); - aCoverVariable = GT_Utility.stackToInt1(aPlayer.inventory.getCurrentItem()); + aCoverVariable = GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem()); aTileEntity.setCoverDataAtSide(aSide, aCoverVariable); GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.GT_Tesseract.message.1", aCoverVariable)); return true; diff --git a/src/main/java/gregtechmod/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gregtechmod/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java index 103ddc2..b988c43 100644 --- a/src/main/java/gregtechmod/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java +++ b/src/main/java/gregtechmod/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java @@ -129,7 +129,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends MetaTileEntity imple } public void stackGateData(int aIndex, ItemStack aStack) { - mGateData[aIndex] = GT_Utility.stackToInt1(aStack); + mGateData[aIndex] = GT_Utility.stackToInt(aStack); validateGateData(); } diff --git a/src/main/java/gregtechmod/loaders/preload/GT_ItemLoader.java b/src/main/java/gregtechmod/loaders/preload/GT_ItemLoader.java index b925a23..2d0d757 100644 --- a/src/main/java/gregtechmod/loaders/preload/GT_ItemLoader.java +++ b/src/main/java/gregtechmod/loaders/preload/GT_ItemLoader.java @@ -270,7 +270,6 @@ public class GT_ItemLoader implements Runnable { GregTech_API.sItemList[9] = new GT_MetaGenerated_Item_02(); GT_Items.Circuit_Integrated.set((GregTech_API.sItemList[10] = new GT_IntegratedCircuit_Item("GregTech_Integrated_Circuit"))); - GT_OreDictUnificator.addToBlacklist(GT_Items.Circuit_Integrated.getWildcard(1)); GT_Log.log.info("Register Regular Items."); GT_Items.Display_Fluid.set((GregTech_API.sItemList[15] = new GT_FluidDisplayItem("GregTech_FluidDisplay"))); // FIXME REMOVE @@ -428,6 +427,10 @@ public class GT_ItemLoader implements Runnable { } } + GT_Log.log.info("Loading item related stuff"); + GT_OreDictUnificator.addToBlacklist(GT_Items.Circuit_Integrated.getWildcard(1)); + + GT_Log.log.info("Hiding certain Items from NEI."); try { Class.forName("codechicken.nei.api.API");