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

8bf5b61dea

Browse source
This commit is contained in:
OneEyeMaker 2016-07-18 10:05:44 +03:00 committed by Dream-Master
parent f365377332
commit 6121acb843
9 changed files with 68 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/gregtech/api/enums/ItemList.java
View file

@ -540,7 +540,7 @@ public enum ItemList implements IItemContainer {
Transformer_LV_ULV, Transformer_MV_LV, Transformer_HV_MV, Transformer_EV_HV, Transformer_IV_EV, Transformer_LuV_IV, Transformer_ZPM_LuV, Transformer_UV_ZPM, Transformer_MAX_UV,
Casing_ULV, Casing_LV, Casing_MV, Casing_HV, Casing_EV, Casing_IV, Casing_LuV, Casing_ZPM, Casing_UV, Casing_MAX, Casing_BronzePlatedBricks, Casing_HeatProof, Casing_Coil_Cupronickel, Casing_Coil_Kanthal, Casing_Coil_Nichrome, Casing_Coil_Superconductor,
Casing_ULV, Casing_LV, Casing_MV, Casing_HV, Casing_EV, Casing_IV, Casing_LuV, Casing_ZPM, Casing_UV, Casing_MAX, Casing_BronzePlatedBricks, Casing_HeatProof,
Casing_SolidSteel, Casing_FrostProof, Casing_Gearbox_Bronze, Casing_Gearbox_Steel, Casing_Gearbox_Titanium, Casing_Gearbox_TungstenSteel, Casing_Processor, Casing_DataDrive, Casing_ContainmentField, Casing_Assembler, Casing_Pump, Casing_Motor, Casing_Pipe_Bronze, Casing_Pipe_Steel, Casing_Pipe_Titanium, Casing_Pipe_TungstenSteel,
Casing_Stripes_A, Casing_Stripes_B, Casing_RadioactiveHazard, Casing_BioHazard, Casing_ExplosionHazard, Casing_FireHazard, Casing_AcidHazard, Casing_MagicHazard, Casing_FrostHazard, Casing_NoiseHazard, Casing_Grate, Casing_Vent, Casing_RadiationProof, Casing_Firebox_Bronze, Casing_Firebox_Steel, Casing_Firebox_TungstenSteel,
Casing_RobustTungstenSteel, Casing_CleanStainlessSteel, Casing_StableTitanium, Casing_Firebox_Titanium,
@ -636,7 +636,7 @@ public enum ItemList implements IItemContainer {
Ingot_Heavy1, Ingot_Heavy2, Ingot_Heavy3,
Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV,
Teleporter, Cover_NeedsMaintainance, Casing_Turbine, Casing_Turbine1, Casing_Turbine2, Casing_Turbine3, Casing_EngineIntake,
Casing_Coil_TungstenSteel, Casing_Coil_NaquadahAlloy,
Casing_Coil_Cupronickel, Casing_Coil_Kanthal, Casing_Coil_Nichrome, Casing_Coil_TungstenSteel, Casing_Coil_NaquadahAlloy, Casing_Coil_Superconductor,
MobRep_LV, MobRep_MV, MobRep_HV, MobRep_EV, MobRep_IV, MobRep_LuV, MobRep_ZPM, MobRep_UV, Cover_PlayerDetector, Machine_Multi_HeatExchanger,
Block_BronzePlate, Block_IridiumTungstensteel, Block_Plascrete, Block_TungstenSteelReinforced,
Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector, OilDrill, AdvancedMiner2, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite,

2
src/main/java/gregtech/api/enums/Textures.java
View file

File diff suppressed because one or more lines are too long

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

@ -28,10 +28,7 @@ public class GT_Block_Casings1
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "MAX Machine Casing");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Bronze Plated Bricks");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Heat Proof Machine Casing");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cupronickel Coil Block (Overheated)");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block (Overheated)");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block (Overheated)");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block");
ItemList.Casing_ULV.set(new ItemStack(this, 1, 0));
ItemList.Casing_LV.set(new ItemStack(this, 1, 1));
ItemList.Casing_MV.set(new ItemStack(this, 1, 2));
@ -44,10 +41,6 @@ public class GT_Block_Casings1
ItemList.Casing_MAX.set(new ItemStack(this, 1, 9));
ItemList.Casing_BronzePlatedBricks.set(new ItemStack(this, 1, 10));
ItemList.Casing_HeatProof.set(new ItemStack(this, 1, 11));
ItemList.Casing_Coil_Cupronickel_Overheated.set(new ItemStack(this, 1, 12));
ItemList.Casing_Coil_Kanthal_Overheated.set(new ItemStack(this, 1, 13));
ItemList.Casing_Coil_Nichrome_Overheated.set(new ItemStack(this, 1, 14));
ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 15));
}
public IIcon getIcon(int aSide, int aMeta) {
@ -57,14 +50,6 @@ public class GT_Block_Casings1
return Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon();
case 11:
return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon();
case 12:
return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL_OVERHEATED.getIcon();
case 13:
return Textures.BlockIcons.MACHINE_COIL_KANTHAL_OVERHEATED.getIcon();
case 14:
return Textures.BlockIcons.MACHINE_COIL_NICHROME_OVERHEATED.getIcon();
case 15:
return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon();
}
if (aSide == 0) {
return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon();
@ -80,5 +65,4 @@ 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];
}
}

28
src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
View file

@ -16,20 +16,36 @@ public class GT_Block_Casings5
for (byte i = 0; i < 16; i = (byte) (i + 1)) {
Textures.BlockIcons.CASING_BLOCKS[(i + 64)] = new GT_CopiedBlockTexture(this, 6, i);
}
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Tungstensteel Coil Block");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Naquadah Alloy Coil Block");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Cupronickel Coil Block");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Kanthal Coil Block");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Nichrome Coil Block");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Tungstensteel Coil Block");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Naquadah Alloy Coil Block");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Superconducting Coil Block");
ItemList.Casing_Coil_TungstenSteel.set(new ItemStack(this, 1, 4));
ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 5));
ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 0));
ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 1));
ItemList.Casing_Coil_Nichrome.set(new ItemStack(this, 1, 2));
ItemList.Casing_Coil_TungstenSteel.set(new ItemStack(this, 1, 3));
ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 4));
ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 5));
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int aSide, int aMeta) {
switch (aMeta) {
case 4:
case 0:
return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
case 1:
return Textures.BlockIcons.MACHINE_COIL_KANTHAL.getIcon();
case 2:
return Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon();
case 3:
return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon();
case 5:
case 4:
return Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon();
case 5:
return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon();
}
return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
}

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

@ -1,27 +1,10 @@
package gregtech.common.blocks;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
public class GT_Item_Casings1
extends GT_Item_Casings_Abstract {
public GT_Item_Casings1(Block par1) {
super(par1);
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
super.addInformation(aStack, aPlayer, aList, aF3_H);
int tMeta = getDamage(aStack);
if (tMeta >= 12 && tMeta <= 14) {
aList.add(EnumChatFormatting.ITALIC + this.mCoilOverheated1Tooltip);
aList.add(EnumChatFormatting.ITALIC + this.mCoilOverheated2Tooltip);
}
}
}

13
src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
View file

@ -18,10 +18,19 @@ public class GT_Item_Casings5
public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
super.addInformation(aStack, aPlayer, aList, aF3_H);
switch (getDamage(aStack)) {
case 4:
case 0:
aList.add(this.mCoil01Tooltip);
break;
case 1:
aList.add(this.mCoil02Tooltip);
break;
case 2:
aList.add(this.mCoil03Tooltip);
break;
case 3:
aList.add(this.mCoil04Tooltip);
break;
case 5:
case 4:
aList.add(this.mCoil05Tooltip);
break;
}

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

@ -144,41 +144,35 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 3, zDir), 11);
byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 2, zDir);
boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 2, zDir) == GregTech_API.sBlockCasings5;
switch (tUsedMeta) {
case 0:
this.mHeatingCapacity = 1800;
break;
case 1:
this.mHeatingCapacity = 2700;
break;
case 2:
this.mHeatingCapacity = 3600;
break;
case 3:
this.mHeatingCapacity = 4500;
break;
case 4:
this.mHeatingCapacity = tUseAdvancedCoils ? 4500 : 0;
break;
case 5:
this.mHeatingCapacity = tUseAdvancedCoils ? 9001 : 0;
break;
case 12:
this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 1800;
break;
case 13:
this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 2700;
break;
case 14:
this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 3600;
this.mHeatingCapacity = 9001;
break;
default:
return false;
}
if (this.mHeatingCapacity == 0) {
return false;
}
for (int i = -1; i < 2; i++) {
for (int j = -1; j < 2; j++) {
if ((i != 0) || (j != 0)) {
if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils ||
aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) {
if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings5) {
return false;
}
if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 2, zDir + j) != tUsedMeta) {
return false;
}
if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils ||
aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) {
if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5) {
return false;
}
if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) {

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

@ -39,12 +39,12 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC
@Override
public Block getFusionCoil() {
return GregTech_API.sBlockCasings1;
return GregTech_API.sBlockCasings5;
}
@Override
public int getFusionCoilMeta() {
return 15;
return 5;
}
public String[] getDescription() {

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

@ -106,34 +106,29 @@ public class GT_MetaTileEntity_MultiFurnace
addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 2, zDir), 11);
byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 1, zDir);
boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 1, zDir) == GregTech_API.sBlockCasings5;
switch (tUsedMeta) {
case 0:
this.mLevel = 1;
break;
case 1:
this.mLevel = 2;
break;
case 2:
this.mLevel = 4;
break;
case 3:
this.mLevel = 8;
break;
case 4:
this.mLevel = tUseAdvancedCoils ? 8 : 0;
break;
case 5:
this.mLevel = tUseAdvancedCoils ? 16 : 0;
break;
case 12:
this.mLevel = tUseAdvancedCoils ? 0 : 1;
break;
case 13:
this.mLevel = tUseAdvancedCoils ? 0 : 2;
break;
case 14:
this.mLevel = tUseAdvancedCoils ? 0 : 4;
this.mLevel = 16;
break;
default:
return false;
}
if (this.mLevel == 0) {
return false;
}
for (int i = -1; i < 2; i++) {
for (int j = -1; j < 2; j++) {
if ((i != 0) || (j != 0)) {
if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils ||
aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) {
if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5) {
return false;
}
if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) {