diff options
13 files changed, 94 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index ee9e8302a6..0deb239d4b 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -321,6 +321,7 @@ public class GregTech_API { sBlockCasings5, sBlockCasings6, sBlockCasings8, + sBlockCasings9, sSolenoidCoilCasings; public static Block sBlockLongDistancePipes; /** diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 88f8c04570..0ca7ac06b4 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -823,6 +823,7 @@ public enum ItemList implements IItemContainer { Casing_Pipe_Titanium, Casing_Pipe_TungstenSteel, Casing_Pipe_Polytetrafluoroethylene, + Casing_Pipe_Polybenzimidazole, Casing_Stripes_A, Casing_Stripes_B, @@ -836,6 +837,7 @@ public enum ItemList implements IItemContainer { Casing_NoiseHazard, Casing_Grate, Casing_Vent, + Casing_Vent_T2, Casing_RadiationProof, Casing_AdvancedRadiationProof, Casing_Firebox_Bronze, @@ -1739,6 +1741,7 @@ public enum ItemList implements IItemContainer { QuantumEye, QuantumStar, Gravistar, + NuclearStar, Block_SSFUEL, Block_MSSFUEL, SFMixture, diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 1308728ccd..89d7ee6a1f 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -279,6 +279,7 @@ public class Textures { MACHINE_CASING_PIPE_TITANIUM, MACHINE_CASING_PIPE_TUNGSTENSTEEL, MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE, + MACHINE_CASING_PIPE_POLYBENZIMIDAZOLE, MACHINE_CASING_GEARBOX_BRONZE, MACHINE_CASING_GEARBOX_STEEL, @@ -302,6 +303,7 @@ public class Textures { MACHINE_CASING_NOISEHAZARD, MACHINE_CASING_GRATE, MACHINE_CASING_VENT, + MACHINE_CASING_VENT_T2, MACHINE_CASING_RADIATIONPROOF, MACHINE_CASING_ADVANCEDRADIATIONPROOF, diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java new file mode 100644 index 0000000000..423cc1da9a --- /dev/null +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java @@ -0,0 +1,39 @@ +package gregtech.common.blocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Textures; +import gregtech.api.util.GT_LanguageManager; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public class GT_Block_Casings9 extends GT_Block_Casings_Abstract { + public GT_Block_Casings9() { + super(GT_Item_Casings9.class, "gt.blockcasings9", GT_Material_Casings.INSTANCE, 2); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "PBI Pipe Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Advanced Filter Casing"); + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + ".1.tooltip", "Less than five 0.1μm particles per m^3"); + + ItemList.Casing_Pipe_Polybenzimidazole.set(new ItemStack(this, 1, 0)); + ItemList.Casing_Vent_T2.set(new ItemStack(this, 1, 1)); + } + + @Override + public int getTextureIndex(int aMeta) { + return (1 << 7) | (aMeta + 64); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int aSide, int aMeta) { + switch (aMeta) { + case 0: + return Textures.BlockIcons.MACHINE_CASING_PIPE_POLYBENZIMIDAZOLE.getIcon(); + case 1: + return Textures.BlockIcons.MACHINE_CASING_VENT_T2.getIcon(); + } + return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + } +} diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings9.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings9.java new file mode 100644 index 0000000000..c5aee22cff --- /dev/null +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings9.java @@ -0,0 +1,9 @@ +package gregtech.common.blocks; + +import net.minecraft.block.Block; + +public class GT_Item_Casings9 extends GT_Item_Casings_Abstract { + public GT_Item_Casings9(Block block) { + super(block); + } +} diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index d4e60d61c6..01015515e8 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -800,6 +800,12 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_SKY.get(1L)); OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_HEATER.get(1L)); OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_SIEVE.get(1L)); + + ItemList.NuclearStar.set(addItem( + tLastID = 230, + "Nuclear Star", + "BY THE POWERS OF NAUGHTINESS, I COMMAND THIS PARTICULAR STAR, TO BE REALLY, REALLY HOT", + SubTag.NO_UNIFICATION)); } @Override diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 4e53fc9b47..fedaea7b9b 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -7525,6 +7525,26 @@ public class GT_MachineRecipeLoader implements Runnable { 10000, 480, 7680); + GT_Values.RA.addAutoclaveRecipe( + GT_OreDictUnificator.get(ItemList.Gravistar.get(16L)), + Materials.Infinity.getMolten(288), + ItemList.NuclearStar.get(1L), + 10000, + 480, + 7864320); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1L), + ItemList.Electric_Motor_UV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Iridium, 1L), + ItemList.Component_Filter.get(8L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iridium, 8L), + }, + null, + ItemList.Casing_Vent_T2.get(1L), + 30 * 20, + 30720); // Silicon Line // SiO2 + 2Mg = 2MgO + Si diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 5d7ba05e89..1c210e10e7 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -464,6 +464,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GregTech_API.sBlockCasings5 = new GT_Block_Casings5(); GregTech_API.sBlockCasings6 = new GT_Block_Casings6(); GregTech_API.sBlockCasings8 = new GT_Block_Casings8(); + GregTech_API.sBlockCasings9 = new GT_Block_Casings9(); GregTech_API.sBlockGranites = new GT_Block_Granites(); GregTech_API.sBlockLongDistancePipes = new GT_Block_LongDistancePipe(); GregTech_API.sBlockConcretes = new GT_Block_Concretes(); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 9f73e3cb28..7fb669bf4b 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -243,6 +243,18 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 'I', OrePrefixes.pipeMedium.get(Materials.Polytetrafluoroethylene) }); + + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Polybenzimidazole.get(1L), bits, new Object[] { + "PIP", + "IFI", + "PIP", + 'P', + OrePrefixes.plate.get(Materials.Polybenzimidazole), + 'F', + OrePrefixes.frameGt.get(Materials.Polybenzimidazole), + 'I', + OrePrefixes.pipeMedium.get(Materials.Polybenzimidazole) + }); GT_ModHandler.addCraftingRecipe(ItemList.Casing_ULV.get(1L), bits, new Object[] { aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.WroughtIron) }); diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PIPE_POLYBENZIMIDAZOLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PIPE_POLYBENZIMIDAZOLE.png Binary files differnew file mode 100644 index 0000000000..91382efb03 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PIPE_POLYBENZIMIDAZOLE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_VENT_T2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_VENT_T2.png Binary files differnew file mode 100644 index 0000000000..90e40af4d2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_VENT_T2.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/230.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/230.png Binary files differnew file mode 100644 index 0000000000..e0053efa42 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/230.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/230.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/230.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/230.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file |
