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

ea5305f7df

Browse source
This commit is contained in:
OneEyeMaker 2016-07-18 14:56:21 +03:00 committed by Dream-Master
parent 6121acb843
commit aca07ff36e
6 changed files with 38 additions and 10 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_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_Overheated, Casing_Coil_Kanthal_Overheated, Casing_Coil_Nichrome_Overheated, Casing_Coil_Superconductor,
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_Cupronickel, Casing_Coil_Kanthal, Casing_Coil_Nichrome, Casing_Coil_TungstenSteel, Casing_Coil_NaquadahAlloy, Casing_Coil_Superconductor,
Casing_Coil_Cupronickel, Casing_Coil_Kanthal, Casing_Coil_Nichrome, Casing_Coil_TungstenSteel, Casing_Coil_NaquadahAlloy,
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

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

@ -28,7 +28,10 @@ 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));
@ -41,6 +44,10 @@ 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) {
@ -50,6 +57,14 @@ 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();

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

@ -21,14 +21,12 @@ public class GT_Block_Casings5
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_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)
@ -44,8 +42,6 @@ public class GT_Block_Casings5
return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon();
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,10 +1,27 @@
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);
}
}
}

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.sBlockCasings5;
return GregTech_API.sBlockCasings1;
}
@Override
public int getFusionCoilMeta() {
return 5;
return 15;
}
public String[] getDescription() {