diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
5 files changed, 69 insertions, 65 deletions
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java index 1375c53608..0e7f5b4707 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -39,6 +39,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { this.setCreativeTab(AddToCreativeTab.tabBlock); this.setStepSound(soundTypeStone); this.setBlockName("Ore"+Utils.sanitizeString(Utils.sanitizeString(material.getUnlocalizedName()))); + this.setBlockTextureName("stone"); try { GameRegistry.registerBlock(this, ItemBlockOre.class, Utils.sanitizeString("ore"+Utils.sanitizeString(this.blockMaterial.getLocalizedName()))); GT_OreDictUnificator.registerOre("ore"+Utils.sanitizeString(this.blockMaterial.getLocalizedName()), ItemUtils.getSimpleStack(this)); diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 176288f261..78cea37735 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -932,7 +932,7 @@ public final class ModItems { } public static void registerCustomTokens() { - ItemGenericToken.register(0, "Bit-Coin", 16, "Can be used on the dark web"); + ItemGenericToken.register(0, "BitCoin", 16, "Can be used on the dark web"); ItemGenericToken.register(1, "Hand Pump Trade Token I", 1, "Craft into a Tier I Hand pump"); ItemGenericToken.register(2, "Hand Pump Trade Token II", 1, "Craft into a Tier II Hand pump"); ItemGenericToken.register(3, "Hand Pump Trade Token III", 1, "Craft into a Tier III Hand pump"); diff --git a/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java index e6c63391cd..dfd5eca203 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java @@ -51,12 +51,13 @@ public class ItemGenericToken extends CoreItem { public static boolean register(int id, String aLocalName, int aMaxStack, String[] aDescript, EnumRarity aRarity, EnumChatFormatting aCustomNameColour) { - int[][] sizes = new int[2][4]; + int[][] sizes = new int[2][6]; sizes[0][0] = mLocalNames.size(); sizes[0][1] = mMaxStackSizes.size(); sizes[0][2] = mDescriptionArrays.size(); sizes[0][3] = mRarities.size(); sizes[0][4] = mCustomNameColours.size(); + //sizes[0][5] = mIcons.size(); mLocalNames.put(id, aLocalName); mMaxStackSizes.put(id, aMaxStack); mDescriptionArrays.put(id, aDescript); @@ -67,6 +68,7 @@ public class ItemGenericToken extends CoreItem { sizes[1][2] = mDescriptionArrays.size(); sizes[1][3] = mRarities.size(); sizes[1][4] = mCustomNameColours.size(); + //sizes[1][5] = mIcons.size(); boolean b = sizes[0][0] > sizes[1][0] && sizes[0][1] > sizes[1][1] && sizes[0][2] > sizes[1][2] && sizes[0][3] > sizes[1][3] && sizes[0][4] > sizes[1][4]; return b; @@ -152,7 +154,7 @@ public class ItemGenericToken extends CoreItem { @Override @SideOnly(Side.CLIENT) public final void registerIcons(final IIconRegister aIconRegister) { - for (int i = 0, j = mIcons.size(); i < j; i++) { + for (int i = 0, j = mLocalNames.size(); i < j; i++) { mIcons.put(i, aIconRegister.registerIcon(CORE.MODID + ":" + "token" + "/" + i)); } } diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java index 9b5245a76d..bdddd26255 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java +++ b/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java @@ -782,7 +782,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } // Handle no stored fluid first if (aStoredFluid == null) { - Logger.INFO("Pump is empty, filling with tank fluids."); + Logger.WARNING("Pump is empty, filling with tank fluids."); FluidStack toConsume; int amountToConsume = 0; if (resource.amount >= aCapacity) { @@ -796,32 +796,32 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri return amountToConsume; } } else { - Logger.INFO("Pump is Partially full, filling with tank fluids."); + Logger.WARNING("Pump is Partially full, filling with tank fluids."); if (aStoredFluid.isFluidEqual(resource)) { - Logger.INFO("Found matching fluids."); + Logger.WARNING("Found matching fluids."); int aSpaceLeft = (aCapacity - aStoredAmount); - Logger.INFO( + Logger.WARNING( "Capacity: " + aCapacity + " | Stored: " + aStoredAmount + " | Space left: " + aSpaceLeft); FluidStack toConsume; int amountToConsume = 0; if (resource.amount >= aSpaceLeft) { amountToConsume = aSpaceLeft; - Logger.INFO("More or equal fluid amount to pump container space."); + Logger.WARNING("More or equal fluid amount to pump container space."); } else { amountToConsume = resource.amount; - Logger.INFO("Less fluid than container space"); + Logger.WARNING("Less fluid than container space"); } - Logger.INFO("Amount to consume: " + amountToConsume); + Logger.WARNING("Amount to consume: " + amountToConsume); toConsume = FluidUtils.getFluidStack(resource, (aStoredAmount + amountToConsume)); if (toConsume != null && amountToConsume > 0) { - Logger.INFO("Storing Fluid"); + Logger.WARNING("Storing Fluid"); storeFluid(container, toConsume); return amountToConsume; } else { - Logger.INFO("Not storing fluid"); + Logger.WARNING("Not storing fluid"); } } else { - Logger.INFO("Fluids did not match."); + Logger.WARNING("Fluids did not match."); } } } @@ -925,7 +925,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } if (!canUse(aStack, removal) && aTier > 0) { PlayerUtils.messagePlayer(aPlayer, "Not enough power."); - Logger.INFO("No Power"); + Logger.WARNING("No Power"); return false; } @@ -972,12 +972,12 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri public boolean drainIFluidTank(TileEntity tTileEntity, ItemStack aStack, World aWorld, EntityPlayer aPlayer, int aX, int aY, int aZ) { if (tTileEntity == null) { - Logger.INFO("Invalid Tile, somehow."); + Logger.WARNING("Invalid Tile, somehow."); return false; } if ((tTileEntity instanceof IFluidTank || tTileEntity instanceof IFluidHandler)) { if (this.getFluid(aStack) == null || (this.getFluid(aStack) != null && this.getFluid(aStack).amount < this.getCapacity(aStack))) { - Logger.INFO("Trying to find Stored Fluid - Behaviour Class."); + Logger.WARNING("Trying to find Stored Fluid - Behaviour Class."); FluidStack aStored = getStoredFluidOfVanillaTank(tTileEntity); if (aStored != null) { int mAmountInserted = fill(aStack, aStored); @@ -989,22 +989,22 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri newStackRemainingInTank = FluidUtils.getFluidStack(aStored, (aStored.amount - mAmountInserted)); } boolean b = setStoredFluidOfVanillaTank(tTileEntity, newStackRemainingInTank); - Logger.INFO("Cleared Tank? " + b + " | mAmountInserted: " + mAmountInserted); - Logger.INFO("Returning " + b + " - drainTankVanilla."); + Logger.WARNING("Cleared Tank? " + b + " | mAmountInserted: " + mAmountInserted); + Logger.WARNING("Returning " + b + " - drainTankVanilla."); if (b) { PlayerUtils.messagePlayer(aPlayer, "Drained "+mAmountInserted+"L of "+aStored.getLocalizedName()+"."); } return b; } } else { - Logger.INFO("Found no valid Fluidstack - drainTankVanilla."); + Logger.WARNING("Found no valid Fluidstack - drainTankVanilla."); } } else { - Logger.INFO("Pump is full."); + Logger.WARNING("Pump is full."); } } - Logger.INFO("Could not drain vanilla tank."); + Logger.WARNING("Could not drain vanilla tank."); return false; } @@ -1018,16 +1018,16 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri return false; } if ((tTileEntity instanceof IGregTechTileEntity)) { - Logger.INFO("Right Clicking on GT Tile - drainTankGT."); + Logger.WARNING("Right Clicking on GT Tile - drainTankGT."); if (((IGregTechTileEntity) tTileEntity).getTimer() < 50L) { - Logger.INFO("Returning False - Behaviour Class. Timer < 50"); + Logger.WARNING("Returning False - Behaviour Class. Timer < 50"); return false; } else if ((!aWorld.isRemote) && (!((IGregTechTileEntity) tTileEntity).isUseableByPlayer(aPlayer))) { - Logger.INFO("Returning True - drainTankGT. NotUsable()"); + Logger.WARNING("Returning True - drainTankGT. NotUsable()"); return true; } else { if (this.getFluid(aStack) == null || (this.getFluid(aStack) != null && this.getFluid(aStack).amount < this.getCapacity(aStack))) { - Logger.INFO("Trying to find Stored Fluid - drainTankGT."); + Logger.WARNING("Trying to find Stored Fluid - drainTankGT."); FluidStack aStored = getStoredFluidOfGTMachine((IGregTechTileEntity) tTileEntity); if (aStored != null) { int mAmountInserted = fill(aStack, aStored); @@ -1039,23 +1039,23 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri newStackRemainingInTank = FluidUtils.getFluidStack(aStored, (aStored.amount - mAmountInserted)); } boolean b = setStoredFluidOfGTMachine((IGregTechTileEntity) tTileEntity, newStackRemainingInTank); - Logger.INFO("Cleared Tank? " + b + " | mAmountInserted: " + mAmountInserted); - Logger.INFO("Returning " + b + " - drainTankGT."); + Logger.WARNING("Cleared Tank? " + b + " | mAmountInserted: " + mAmountInserted); + Logger.WARNING("Returning " + b + " - drainTankGT."); if (b) { PlayerUtils.messagePlayer(aPlayer, "Drained "+mAmountInserted+"L of "+aStored.getLocalizedName()+"."); } return b; } } else { - Logger.INFO("Found no valid Fluidstack - drainTankGT."); + Logger.WARNING("Found no valid Fluidstack - drainTankGT."); } } else { - Logger.INFO("Pump is full."); + Logger.WARNING("Pump is full."); } } } - Logger.INFO("Could not drain GT tank."); + Logger.WARNING("Could not drain GT tank."); return false; } @@ -1079,7 +1079,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri public FluidStack getStoredFluidOfVanillaTank(IFluidTank aTileEntity) { FluidStack f = aTileEntity.getFluid(); - Logger.INFO("Returning Fluid stack from tile. Found: " + Logger.WARNING("Returning Fluid stack from tile. Found: " + (f != null ? f.getLocalizedName() + " - " + f.amount + "L" : "Nothing")); return f.copy(); } @@ -1101,14 +1101,14 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } public boolean setStoredFluidOfVanillaTank(TileEntity aTileEntity, FluidStack aSetFluid) { - Logger.INFO("Trying to clear Tile's tank. - Behaviour Class. [1]"); + Logger.WARNING("Trying to clear Tile's tank. - Behaviour Class. [1]"); if (aTileEntity == null) { return false; } else if ((aTileEntity instanceof IFluidTank || aTileEntity instanceof IFluidHandler)) { if (aTileEntity instanceof IFluidTank) { - Logger.INFO("Tile Was instanceof IFluidTank."); + Logger.WARNING("Tile Was instanceof IFluidTank."); FluidStack f = ((IFluidTank) aTileEntity).getFluid(); if (aSetFluid == null) { aSetFluid = f; @@ -1123,21 +1123,21 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } if (newStack.isFluidEqual(aSetFluid) && newStack.amount == aSetFluid.amount) { - Logger.INFO("Removed fluid from vanilla IFluidTank successfully."); + Logger.WARNING("Removed fluid from vanilla IFluidTank successfully."); return true; } else { - Logger.INFO("Failed trying to remove fluid from vanilla IFluidTank."); + Logger.WARNING("Failed trying to remove fluid from vanilla IFluidTank."); return false; } } else { - Logger.INFO("Tile Was instanceof IFluidHandler."); + Logger.WARNING("Tile Was instanceof IFluidHandler."); FluidStack containedStack = null; if ((IFluidHandler) aTileEntity != null) { FluidTankInfo[] a1 = (((IFluidHandler) aTileEntity).getTankInfo(ForgeDirection.UNKNOWN)); if (a1 != null) { if (a1[0] != null) { - Logger.INFO("Found Fluid in Tank."); + Logger.WARNING("Found Fluid in Tank."); containedStack = a1[0].fluid; } } @@ -1148,30 +1148,30 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri aSetFluid.amount = 0; } int toDrain = (containedStack.amount - aSetFluid.amount); - Logger.INFO("Found "+containedStack.amount+"L of "+containedStack.getLocalizedName()+". Trying to drain "+toDrain+"L."); + Logger.WARNING("Found "+containedStack.amount+"L of "+containedStack.getLocalizedName()+". Trying to drain "+toDrain+"L."); FluidStack newStack; if (toDrain <= 0) { - Logger.INFO("Draining Nothing"); + Logger.WARNING("Draining Nothing"); newStack = containedStack; } else { - Logger.INFO("Draining Something"); + Logger.WARNING("Draining Something"); newStack = ((IFluidTank) aTileEntity).drain(toDrain, true); } if (newStack.isFluidEqual(aSetFluid) && newStack.amount == aSetFluid.amount) { - Logger.INFO("Removed fluid from vanilla IFluidHandler successfully."); + Logger.WARNING("Removed fluid from vanilla IFluidHandler successfully."); return true; } else { - Logger.INFO("Failed trying to remove fluid from vanilla IFluidHandler."); + Logger.WARNING("Failed trying to remove fluid from vanilla IFluidHandler."); return false; } } else { - Logger.INFO("Could not drain vanilla tank, IFluidHandler claims there is no fluid."); + Logger.WARNING("Could not drain vanilla tank, IFluidHandler claims there is no fluid."); return false; } } } else { - Logger.INFO("Bad Tank Tile to drain."); + Logger.WARNING("Bad Tank Tile to drain."); return false; } @@ -1191,7 +1191,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri return null; } if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) { - Logger.INFO("Tile Was Instanceof BasicTank."); + Logger.WARNING("Tile Was Instanceof BasicTank."); return getStoredFluidOfGTMachine((GT_MetaTileEntity_BasicTank) aMetaTileEntity); } else { return null; @@ -1200,13 +1200,13 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri public FluidStack getStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity) { FluidStack f = aTileEntity.mFluid; - Logger.INFO("Returning Fluid stack from tile. Found: " + Logger.WARNING("Returning Fluid stack from tile. Found: " + (f != null ? f.getLocalizedName() + " - " + f.amount + "L" : "Nothing")); return f.copy(); } public boolean setStoredFluidOfGTMachine(IGregTechTileEntity aTileEntity, FluidStack aSetFluid) { - Logger.INFO("Trying to clear Tile's tank. - Behaviour Class. [1]"); + Logger.WARNING("Trying to clear Tile's tank. - Behaviour Class. [1]"); if (aTileEntity == null) { return false; } @@ -1216,7 +1216,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri return false; } if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) { - Logger.INFO("Trying to clear Tile's tank. - Behaviour Class. [2]"); + Logger.WARNING("Trying to clear Tile's tank. - Behaviour Class. [2]"); return setStoredFluidOfGTMachine((GT_MetaTileEntity_BasicTank) aMetaTileEntity, aSetFluid); } else { return false; @@ -1227,10 +1227,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri try { aTileEntity.mFluid = aSetFluid; boolean b = aTileEntity.mFluid == aSetFluid; - Logger.INFO("Trying to set Tile's tank. - Behaviour Class. [3] " + b); + Logger.WARNING("Trying to set Tile's tank. - Behaviour Class. [3] " + b); return b; } catch (Throwable t) { - Logger.INFO("Trying to clear Tile's tank. FAILED - Behaviour Class. [x]"); + Logger.WARNING("Trying to clear Tile's tank. FAILED - Behaviour Class. [x]"); return false; } } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java index 3d4a071d82..243e169d48 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -284,39 +284,40 @@ public class RECIPES_General { return true; } - private static boolean addHandPumpRecipes() { - boolean a[] = new boolean[4]; - a[0] = RecipeUtils.recipeBuilder( + private static void addHandPumpRecipes() { + /*if (RecipeUtils.recipeBuilder( CI.electricPump_LV, "circuitBasic", null, "ringBrass", CI.electricMotor_LV, "circuitBasic", "plateSteel", "plateSteel", "rodBrass", - ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1)); - Logger.INFO("Added recipe for Hand Pump I - "+a[0]); - a[1] = RecipeUtils.recipeBuilder( + ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1))) + Logger.INFO("Added recipe for Hand Pump I - true"); + if (RecipeUtils.recipeBuilder( CI.electricPump_MV, "circuitAdvanced", null, "ringMagnalium", CI.electricMotor_MV, "circuitAdvanced", "plateAluminium", "plateAluminium", "rodMagnalium", - ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1)); - Logger.INFO("Added recipe for Hand Pump II - "+a[1]); - a[2] = RecipeUtils.recipeBuilder( + ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1))) + Logger.INFO("Added recipe for Hand Pump II - true"); + if (RecipeUtils.recipeBuilder( CI.electricPump_HV, "circuitData", null, "ringChrome", CI.electricMotor_HV, "circuitData", "plateStainlessSteel", "plateStainlessSteel", "rodChrome", - ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1)); - Logger.INFO("Added recipe for Hand Pump III - "+a[2]); - a[3] = RecipeUtils.recipeBuilder( + ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1))) + Logger.INFO("Added recipe for Hand Pump III - true"); + if (RecipeUtils.recipeBuilder( CI.electricPump_EV, "circuitElite", null, "ringTitanium", CI.electricMotor_EV, "circuitElite", "plateStungstenSteel", "plateTungstenSteel", "rodTitanium", - ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1)); - Logger.INFO("Added recipe for Hand Pump IV - "+a[3]); + ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1))) + Logger.INFO("Added recipe for Hand Pump IV - true");*/ + + GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1000, 1), 30, 30); GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1001, 1), 120, 120); GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1002, 1), 480, 480); GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1003, 1), 1820, 1820); - return a[0] && a[1] && a[2] && a[3]; + } |