diff options
5 files changed, 4 insertions, 155 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 6ed81f5df5..6bdef2de4b 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -9,6 +9,7 @@ import gtPlusPlus.core.util.recipe.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -818,7 +819,7 @@ public class RECIPES_Machines { RECIPE_TreeFarmController); //Industrial Tree Farm Frame RecipeUtils.addShapedGregtechRecipe( - "dirt", "dirt", "dirt", + ItemUtils.getSimpleStack(Blocks.dirt), ItemUtils.getSimpleStack(Blocks.dirt), ItemUtils.getSimpleStack(Blocks.dirt), "plankWood", "frameGtTumbaga", "plankWood", "plankWood", "plankWood", "plankWood", RECIPE_TreeFarmFrame); diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_BLOCK_ShapeSpawner.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_BLOCK_ShapeSpawner.java deleted file mode 100644 index 28a47d9b14..0000000000 --- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_BLOCK_ShapeSpawner.java +++ /dev/null @@ -1,140 +0,0 @@ -package gtPlusPlus.core.util.debug; - -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gtPlusPlus.core.util.Utils; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - -public class DEBUG_BLOCK_ShapeSpawner extends DEBUG_MULTIBLOCK_ShapeSpawner { - - private static boolean controller; - - public DEBUG_BLOCK_ShapeSpawner(final int aID, final String aName, final String aNameRegional) { - super(aID, aName, aNameRegional); - } - - public DEBUG_BLOCK_ShapeSpawner(final String aName) { - super(aName); - } - - @Override - public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new DEBUG_BLOCK_ShapeSpawner(this.mName); - } - - - @Override - public String[] getDescription() { - return new String[]{ - "Controller Block for the Testing", - "Create the shapes for Multiblocks.",}; - } - - - @Override - public ITexture[] getTexture(final IGregTechTileEntity arg0, final byte arg1, - final byte arg2, final byte arg3, final boolean arg4, final boolean arg5) { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isCorrectMachinePart(final ItemStack aStack) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean checkRecipe(final ItemStack aStack) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean checkMachine(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) { - - final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; - final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; - - if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) { - return false; - } - - int stepX = aBaseMetaTileEntity.getXCoord(); - final int stepY = aBaseMetaTileEntity.getYCoord(); - int stepZ = aBaseMetaTileEntity.getZCoord(); - final int temp = 0; - - Utils.LOG_INFO("Starting Block located @ "+"[X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); - - final int tAmount = 0; - switch (xDir) { - case -1: - stepX++; - Utils.LOG_INFO("Modifying stepX + accomodate a "+xDir+" xDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); - break; - - case 1: - stepX--; - Utils.LOG_INFO("Modifying stepX - accomodate a "+xDir+" xDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); - break; - } - switch (zDir) { - case -1: - stepZ++; - Utils.LOG_INFO("Modifying stepZ + accomodate a "+zDir+" zDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); - break; - - case 1: - stepZ--; - Utils.LOG_INFO("Modifying stepZ - accomodate a "+zDir+" zDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); - break; - } - - for (int i = stepX-1; i <= (stepX+1); i++){ - for (int j = stepZ-1; j <= (stepZ+1); j++){ - for (int h = stepY-1; h <= (stepY+1); h++){ - - - Utils.LOG_INFO("Block Facing - X:"+xDir+" Z:"+zDir); - Utils.LOG_INFO("(h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))"); - Utils.LOG_INFO(" "+(h != 0)+" || "+((((xDir + i) != 0)+" || "+((zDir + j) != 0))+" && "+((i != 0)+" || "+(j != 0)))); - } - } - } - return false; - } - - @Override - public int getMaxEfficiency(final ItemStack aStack) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int getPollutionPerTick(final ItemStack aStack) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int getDamageToComponent(final ItemStack aStack) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int getAmountOfOutputs() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public boolean explodesOnComponentBreak(final ItemStack aStack) { - // TODO Auto-generated method stub - return false; - } - -} diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java index 1150fe6602..4edd696ecc 100644 --- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java @@ -1,16 +1,12 @@ package gtPlusPlus.core.util.materials; -import java.util.ArrayList; import java.util.List; import gregtech.api.enums.*; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; -import gregtech.api.objects.MaterialStack; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; public class MaterialUtils { @@ -24,14 +20,6 @@ public class MaterialUtils { boolean.class, int.class, int.class, int.class, Dyes.class, int.class, List.class , List.class}}; - public static Materials addGtMaterial(final String enumNameForMaterial, final TextureSet aIconSet, final float aToolSpeed, final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG, final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower, final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired, final boolean aTransparent, final int aOreValue, final int aDensityMultiplier, final int aDensityDivider, final Dyes aColor, final int aExtraData, final List<MaterialStack> aMaterialList, final List<TC_AspectStack> aAspects) - { - Utils.LOG_INFO("Attempting to add GT material: "+enumNameForMaterial); - return EnumHelper.addEnum(Materials.class, enumNameForMaterial, commonTypes, firstID++, aIconSet, aToolSpeed, aToolDurability, aToolQuality, aTypes, aR, aG, aB, aA, aLocalName, - aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, - aColor, aExtraData, aMaterialList, aAspects); - } - public static List<?> oreDictValuesForEntry(final String oredictName){ List<?> oredictItemNames; if(OreDictionary.doesOreNameExist(oredictName)){ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java index 38aea63cca..780bbae820 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java @@ -144,7 +144,6 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool implements } - @Override public void addAdditionalToolTips(final List aList, final ItemStack aStack) { final long tMaxDamage = getToolMaxDamage(aStack); final Materials tMaterial = getPrimaryMaterial(aStack); @@ -169,6 +168,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool implements } } + @Override public void addAdditionalToolTips(final List aList, final ItemStack aStack, final EntityPlayer aPlayer) { final long tMaxDamage = getToolMaxDamage(aStack); final Materials tMaterial = getPrimaryMaterial(aStack); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java index aea0014e0c..f2a538d778 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java @@ -2089,6 +2089,7 @@ public class GregtechBaseMetaTileEntityLossless extends BaseTileEntity implement } + @Override public ITexture[] getTexture(final Block arg0, final byte aSide) { final ITexture rIcon = this.getCoverTexture(aSide); if (rIcon != null) { @@ -2100,7 +2101,6 @@ public class GregtechBaseMetaTileEntityLossless extends BaseTileEntity implement return Textures.BlockIcons.ERROR_RENDERING; } - @Override public ITexture[] getTexture(final byte aSide) { final ITexture rIcon = this.getCoverTexture(aSide); if (rIcon != null) { |