Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Bugfixes 5 fix: Removed commented code

Browse source
This commit is contained in:
Muramasa 2016-08-14 07:32:19 +01:00
parent 25fe49f9c5
commit 1abb196a2f
15 changed files with 20 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
View file

@ -1357,7 +1357,6 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
@Override
public byte getOutputRedstoneSignal(byte aSide) {
return getCoverBehaviorAtSide(aSide).manipulatesSidedRedstoneOutput(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this) ? mSidedRedstone[aSide] : 0;
// return (byte)(getCoverBehaviorAtSide(aSide).manipulatesSidedRedstoneOutput(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this) || (mRedstone && getCoverBehaviorAtSide(aSide).letsRedstoneGoOut(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this))?mSidedRedstone[aSide]&15:0);
}
@Override

4
src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
View file

@ -34,9 +34,7 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi
fontRendererObj.drawString("Running perfectly.", 10, 170, 16448255);
}
}
//if (this.mContainer != null) {
fontRendererObj.drawString(GT_Utility.formatNumbers(this.mContainer.mEnergy) + " EU", 50, 155, 0x00ff0000);
//}
fontRendererObj.drawString(GT_Utility.formatNumbers(this.mContainer.mEnergy) + " EU", 50, 155, 0x00ff0000);
}
}

9
src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
View file

@ -206,12 +206,9 @@ public class GT_MetaTileEntity_Scanner
@Override
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
if (mProgresstime >= (mMaxProgresstime - 1)) {
//try {
if (this.mOutputItems[0].getUnlocalizedName().equals("gt.metaitem.01.32707")) {
GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "scanning");
}
//} catch (Exception e) {
//}
if (this.mOutputItems[0].getUnlocalizedName().equals("gt.metaitem.01.32707")) {
GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "scanning");
}
}
super.onPostTick(aBaseMetaTileEntity, aTick);
}

9
src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java
View file

@ -34,13 +34,8 @@ public class GT_MetaTileEntity_AlloySmelter_Bronze
GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[1], null, getAllInputs());
if ((tRecipe != null) && (canOutput(tRecipe.mOutputs)) && (tRecipe.isRecipeInputEqual(true, null, getAllInputs()))) {
this.mOutputItems[0] = tRecipe.getOutput(0);
//if (tRecipe.mEUt <= 16) {
this.mEUt = tRecipe.mEUt;
this.mMaxProgresstime = (tRecipe.mDuration * 2);
/*} else {
this.mEUt = tRecipe.mEUt;
this.mMaxProgresstime = (tRecipe.mDuration * 2);
}*/
this.mEUt = tRecipe.mEUt;
this.mMaxProgresstime = (tRecipe.mDuration * 2);
return 2;
}
return 0;

9
src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java
View file

@ -34,13 +34,8 @@ public class GT_MetaTileEntity_AlloySmelter_Steel
GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[2], null, getAllInputs());
if ((tRecipe != null) && (canOutput(tRecipe.mOutputs)) && (tRecipe.isRecipeInputEqual(true, null, getAllInputs()))) {
this.mOutputItems[0] = tRecipe.getOutput(0);
//if (tRecipe.mEUt <= 16) {
this.mEUt = (tRecipe.mEUt * 3);
this.mMaxProgresstime = tRecipe.mDuration;
/*} else {
this.mEUt = (tRecipe.mEUt * 3);
this.mMaxProgresstime = tRecipe.mDuration;
}*/
this.mEUt = (tRecipe.mEUt * 3);
this.mMaxProgresstime = tRecipe.mDuration;
return 2;
}
return 0;

9
src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java
View file

@ -34,13 +34,8 @@ public class GT_MetaTileEntity_ForgeHammer_Bronze
GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[1], null, getAllInputs());
if ((tRecipe != null) && (canOutput(tRecipe.mOutputs)) && (tRecipe.isRecipeInputEqual(true, null, getAllInputs()))) {
this.mOutputItems[0] = tRecipe.getOutput(0);
//if (tRecipe.mEUt <= 16) {
this.mEUt = tRecipe.mEUt;
this.mMaxProgresstime = (tRecipe.mDuration * 2);
/*} else {
this.mEUt = tRecipe.mEUt;
this.mMaxProgresstime = (tRecipe.mDuration * 2);
}*/
this.mEUt = tRecipe.mEUt;
this.mMaxProgresstime = (tRecipe.mDuration * 2);
return 2;
}
return 0;

9
src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java
View file

@ -34,13 +34,8 @@ public class GT_MetaTileEntity_ForgeHammer_Steel
GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[2], null, getAllInputs());
if ((tRecipe != null) && (canOutput(tRecipe.mOutputs)) && (tRecipe.isRecipeInputEqual(true, null, getAllInputs()))) {
this.mOutputItems[0] = tRecipe.getOutput(0);
//if (tRecipe.mEUt <= 16) {
this.mEUt = (tRecipe.mEUt * 3);
this.mMaxProgresstime = tRecipe.mDuration;
/*} else {
this.mEUt = (tRecipe.mEUt * 3);
this.mMaxProgresstime = tRecipe.mDuration;
}*/
this.mEUt = (tRecipe.mEUt * 3);
this.mMaxProgresstime = tRecipe.mDuration;
return 2;
}
return 0;

2
src/main/java/gregtech/common/tools/GT_Tool_Axe.java
View file

@ -80,7 +80,7 @@ public class GT_Tool_Axe
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
String tTool = aBlock.getHarvestTool(aMetaData);
return (/*(tTool != null) && */(tTool.equals("axe"))) || (aBlock.getMaterial() == Material.wood);
return ((tTool.equals("axe"))) || (aBlock.getMaterial() == Material.wood);
}
public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

2
src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
View file

@ -60,7 +60,7 @@ public class GT_Tool_BranchCutter
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
String tTool = aBlock.getHarvestTool(aMetaData);
return (/*(tTool != null) && */(tTool.equals("grafter"))) || (aBlock.getMaterial() == Material.leaves);
return ((tTool.equals("grafter"))) || (aBlock.getMaterial() == Material.leaves);
}
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

2
src/main/java/gregtech/common/tools/GT_Tool_File.java
View file

@ -75,7 +75,7 @@ public class GT_Tool_File
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
String tTool = aBlock.getHarvestTool(aMetaData);
return /*(tTool != null) && */(tTool.equals("file"));
return (tTool.equals("file"));
}
public ItemStack getBrokenItem(ItemStack aStack) {

2
src/main/java/gregtech/common/tools/GT_Tool_Plow.java
View file

@ -31,7 +31,7 @@ public class GT_Tool_Plow
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
String tTool = aBlock.getHarvestTool(aMetaData);
return (/*(tTool != null) && */(tTool.equals("plow"))) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.craftedSnow);
return ((tTool.equals("plow"))) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.craftedSnow);
}
public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

2
src/main/java/gregtech/common/tools/GT_Tool_Plunger.java
View file

@ -43,7 +43,7 @@ public class GT_Tool_Plunger
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
String tTool = aBlock.getHarvestTool(aMetaData);
return /*(tTool != null) && */(tTool.equals("plunger"));
return (tTool.equals("plunger"));
}
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

2
src/main/java/gregtech/common/tools/GT_Tool_Sense.java
View file

@ -31,7 +31,7 @@ public class GT_Tool_Sense
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
String tTool = aBlock.getHarvestTool(aMetaData);
return (/*(tTool != null) && */((tTool.equals("sense")) || (tTool.equals("scythe")))) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.leaves);
return (((tTool.equals("sense")) || (tTool.equals("scythe")))) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.leaves);
}
public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

2
src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java
View file

@ -84,7 +84,7 @@ public class GT_Tool_SoftHammer
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
String tTool = aBlock.getHarvestTool(aMetaData);
return /*(tTool != null) && */(tTool.equals("softhammer"));
return (tTool.equals("softhammer"));
}
public ItemStack getBrokenItem(ItemStack aStack) {

2
src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java
View file

@ -79,7 +79,7 @@ public class GT_Tool_UniversalSpade
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
String tTool = aBlock.getHarvestTool(aMetaData);
return (/*(tTool != null) && */((tTool.equals("shovel")) || (tTool.equals("axe")) || (tTool.equals("saw")) || (tTool.equals("sword")) || (tTool.equals("crowbar")))) || (aBlock.getMaterial() == Material.sand) || (aBlock.getMaterial() == Material.grass) || (aBlock.getMaterial() == Material.ground) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.clay) || (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.vine) || (aBlock.getMaterial() == Material.wood) || (aBlock.getMaterial() == Material.cactus) || (aBlock.getMaterial() == Material.circuits) || (aBlock.getMaterial() == Material.gourd) || (aBlock.getMaterial() == Material.web) || (aBlock.getMaterial() == Material.cloth) || (aBlock.getMaterial() == Material.carpet) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.cake) || (aBlock.getMaterial() == Material.tnt) || (aBlock.getMaterial() == Material.sponge);
return (((tTool.equals("shovel")) || (tTool.equals("axe")) || (tTool.equals("saw")) || (tTool.equals("sword")) || (tTool.equals("crowbar")))) || (aBlock.getMaterial() == Material.sand) || (aBlock.getMaterial() == Material.grass) || (aBlock.getMaterial() == Material.ground) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.clay) || (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.vine) || (aBlock.getMaterial() == Material.wood) || (aBlock.getMaterial() == Material.cactus) || (aBlock.getMaterial() == Material.circuits) || (aBlock.getMaterial() == Material.gourd) || (aBlock.getMaterial() == Material.web) || (aBlock.getMaterial() == Material.cloth) || (aBlock.getMaterial() == Material.carpet) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.cake) || (aBlock.getMaterial() == Material.tnt) || (aBlock.getMaterial() == Material.sponge);
}
public ItemStack getBrokenItem(ItemStack aStack) {