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

3af174488a [3af1744]

Browse source
This commit is contained in:
Dream-Master 2016-06-22 21:12:55 +02:00
parent 1e848d2a4f
commit 7cf4b14004
6 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
View file

@ -77,7 +77,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
@Override
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections, byte aColorIndex, boolean aConnected, boolean aRedstone) {
if (!mInsulated)
return new ITexture[]{new GT_RenderedTexture(mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], mMaterial.mRGBa)};
return new ITexture[]{new GT_RenderedTexture(mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], Dyes.getModulation(aColorIndex, mMaterial.mRGBa) )};
if (aConnected) {
float tThickNess = getThickNess();
if (tThickNess < 0.37F)

1
src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
View file

@ -80,4 +80,5 @@ public class GT_Block_Casings1
public int colorMultiplier(IBlockAccess aWorld, int aX, int aY, int aZ) {
return aWorld.getBlockMetadata(aX, aY, aZ) > 9 ? super.colorMultiplier(aWorld, aX, aY, aZ) : gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[0] << 16 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[1] << 8 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[2];
}
}

4
src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
View file

@ -23,6 +23,10 @@ public class GT_Item_Casings1
break;
case 14:
aList.add(this.mCoil03Tooltip);
break;
case 15:
aList.add(this.mCoil04Tooltip);
}
}
}

1
src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
View file

@ -16,6 +16,7 @@ public abstract class GT_Item_Casings_Abstract
protected final String mCoil01Tooltip = GT_LanguageManager.addStringLocalization("gt.coil01tooltip", "Base Heating Capacity = 1800 Kelvin");
protected final String mCoil02Tooltip = GT_LanguageManager.addStringLocalization("gt.coil02tooltip", "Base Heating Capacity = 2700 Kelvin");
protected final String mCoil03Tooltip = GT_LanguageManager.addStringLocalization("gt.coil03tooltip", "Base Heating Capacity = 3600 Kelvin");
protected final String mCoil04Tooltip = GT_LanguageManager.addStringLocalization("gt.coil04tooltip", "Base Heating Capacity = 9000 Kelvin");
protected final String mBlastProofTooltip = GT_LanguageManager.addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof");
public GT_Item_Casings_Abstract(Block par1) {
super(par1);

4
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
View file

@ -154,6 +154,10 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
case 14:
this.mHeatingCapacity = 3600;
break;
case 15:
this.mHeatingCapacity = 9000;
break;
default:
return false;
}

18
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
View file

@ -36,9 +36,9 @@ public class GT_MetaTileEntity_MultiFurnace
public String[] getDescription() {
return new String[]{
"Controller Block for the Multi Smelter",
"Smelts up to 6-18 Items at once",
"Smelts up to 8-256 Items at once",
"Size(WxHxD): 3x3x3 (Hollow), Controller (Front middle at bottom)",
"8x Heating Coils (Middle layer, hollow)",
"8x Coils (Middle layer, hollow)",
"1x Input Bus (One of bottom)",
"1x Output Bus (One of bottom)",
"1x Maintenance Hatch (One of bottom)",
@ -76,7 +76,7 @@ public class GT_MetaTileEntity_MultiFurnace
byte tTier = (byte) Math.max(1, GT_Utility.getTier(getMaxInputVoltage()));
int j = 0;
this.mOutputItems = new ItemStack[6 * this.mLevel];
this.mOutputItems = new ItemStack[8 * this.mLevel];
for (int i = 0; (i < 100) && (j < this.mOutputItems.length); i++) {
if (null != (this.mOutputItems[j] = GT_ModHandler.getSmeltingOutput((ItemStack) tInputList.get(i % tInputList.size()), true, null))) {
j++;
@ -86,7 +86,7 @@ public class GT_MetaTileEntity_MultiFurnace
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
this.mEUt = (-4 * (1 << tTier - 1) * (1 << tTier - 1) * this.mLevel);
this.mEUt = (-5 * (1 << tTier - 1) * (1 << tTier - 1) * this.mLevel);
this.mMaxProgresstime = Math.max(1, 512 / (1 << tTier - 1));
}
updateSlots();
@ -109,15 +109,23 @@ public class GT_MetaTileEntity_MultiFurnace
switch (tUsedMeta) {
case 12:
this.mLevel = 1;
this.mLevel = 1;//8 at once
break;
case 13:
this.mLevel = 2;
this.mLevel = 2;//16 at once
break;
case 14:
this.mLevel = 3;
this.mLevel = 4;
this.mLevel = 4;//32 at once
break;
case 15://Superconductor Coil Block Support
this.mLevel = 8;
this.mLevel = 32;//4 stacks at once
break;
default:
return false;
}
for (int i = -1; i < 2; i++) {
for (int j = -1; j < 2; j++) {