diff options
Diffstat (limited to 'src/Java/gtPlusPlus')
3 files changed, 15 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java index 7b66ca5a82..d01b400fab 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java @@ -44,10 +44,12 @@ public class MultiSpadeBase extends StaballoySpade{ this.setCreativeTab(AddToCreativeTab.tabTools); try { this.isValid = this.addRecipe(); - } + } catch (final Throwable e){} if ((colour != 0) && this.isValid){ - GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName)); + if (GameRegistry.findItem(CORE.MODID, Utils.sanitizeString(unlocalizedName)) == null) { + GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName)); + } } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java index a50b5e125b..e427587be0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java @@ -20,10 +20,10 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc super(aName, aTier, aDescription, aTextures); } - public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String[] aDescription, + /*public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); - } + }*/ public ITexture[] getTexturesActive(final ITexture aBaseTexture) { return new ITexture[]{aBaseTexture, TexturesGtBlock.OVERLAYS_ENERGY_OUT_MULTI_BUFFER[this.mTier]}; @@ -42,7 +42,7 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc } public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return (MetaTileEntity) new GT_MetaTileEntity_Hatch_DynamoBuffer(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return (MetaTileEntity) new GT_MetaTileEntity_Hatch_DynamoBuffer(this.mName, this.mTier, this.mDescription, this.mTextures); } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java index e55db9d1ab..e199497537 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java @@ -93,8 +93,8 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G if (aSide == aFacing) { return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[this.casingTextureIndex], new GT_RenderedTexture( - (IIconContainer) (aActive ? Textures.BlockIcons.OVERLAY_FRONT_ORE_DRILL_ACTIVE - : Textures.BlockIcons.OVERLAY_FRONT_ORE_DRILL)) }; + (IIconContainer) (aActive ? Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE + : Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT)) }; } return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[this.casingTextureIndex] }; } @@ -104,6 +104,11 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "OreDrillingPlant.png"); } + + + public int getAmountOfOutputs() { + return 1; + } public void saveNBTData(final NBTTagCompound aNBT) { super.saveNBTData(aNBT); @@ -221,7 +226,7 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G } private void setElectricityStats() { - this.mEfficiency = this.getCurrentEfficiency((ItemStack) null); + //this.mEfficiency = this.getCurrentEfficiency((ItemStack) null); this.mEfficiencyIncrease = 10000; final int overclock = 1 << GT_Utility.getTier(this.getMaxInputVoltage()) - 1; this.mEUt = -12 * overclock * overclock; |