diff options
author | Alkalus <draknyte1@hotmail.com> | 2017-08-03 12:49:32 +1000 |
---|---|---|
committer | Alkalus <draknyte1@hotmail.com> | 2017-08-03 12:49:32 +1000 |
commit | 24944a2edfd5172546c049e3eb2efddc69a18b49 (patch) | |
tree | 385392df24388b65595ba40d1ae442aa7704c269 /src | |
parent | a3c1e4183ab1d9681ec95698a7536871f56bd25b (diff) | |
download | GT5-Unofficial-24944a2edfd5172546c049e3eb2efddc69a18b49.tar.gz GT5-Unofficial-24944a2edfd5172546c049e3eb2efddc69a18b49.tar.bz2 GT5-Unofficial-24944a2edfd5172546c049e3eb2efddc69a18b49.zip |
+ Added 4 types of custom RTG pellets.
+ Added 3 new materials for the custom pellets.
% Created StringUtils.java and migrated Super/Subscript formatting functions to it.
Diffstat (limited to 'src')
-rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 3 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java | 44 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/material/ELEMENT.java | 3 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/material/Material.java | 3 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java | 23 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/util/StringUtils.java | 33 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java | 31 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java | 5 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java | 6 | ||||
-rw-r--r-- | src/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png | bin | 0 -> 1573 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png | bin | 0 -> 1573 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png | bin | 0 -> 1573 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png | bin | 0 -> 1573 bytes |
13 files changed, 87 insertions, 64 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 6b21fbbf0a..2426757a05 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -33,6 +33,7 @@ import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.*; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.material.nuclear.NUCLIDE; +import gtPlusPlus.core.util.StringUtils; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.debug.DEBUG_INIT; import gtPlusPlus.core.util.fluid.FluidUtils; @@ -473,7 +474,7 @@ public final class ModItems { //Zirconium //Cinter Pellet. - itemZirconiumChlorideCinterPellet = new CoreItem("itemZirconiumPellet", "Zirconium Pellet ["+MaterialUtils.subscript("ZrCl4")+"]", tabMisc).setTextureName(CORE.MODID + ":itemShard"); + itemZirconiumChlorideCinterPellet = new CoreItem("itemZirconiumPellet", "Zirconium Pellet ["+StringUtils.subscript("ZrCl4")+"]", tabMisc).setTextureName(CORE.MODID + ":itemShard"); GT_OreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet)); //Zirconium Chloride dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; //http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index 8dc9eb8c3c..5eae18f2b1 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -7,10 +7,10 @@ import java.util.List; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.StringUtils; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.entity.EntityUtils; import gtPlusPlus.core.util.item.ItemUtils; -import gtPlusPlus.core.util.materials.MaterialUtils; import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -34,7 +34,7 @@ public class BaseItemDustUnique extends Item{ this.setCreativeTab(tabMisc); this.colour = colour; this.materialName = materialName; - this.chemicalNotation = MaterialUtils.subscript(materialName); + this.chemicalNotation = StringUtils.subscript(materialName); this.sRadiation = ItemUtils.getRadioactivityLevel(materialName); GameRegistry.registerItem(this, unlocalizedName); @@ -114,61 +114,61 @@ public class BaseItemDustUnique extends Item{ } static boolean containsSubScript(final String s){ - if (s.contains(MaterialUtils.superscript("1"))) { + if (s.contains(StringUtils.superscript("1"))) { return true; } - if (s.contains(MaterialUtils.superscript("2"))) { + if (s.contains(StringUtils.superscript("2"))) { return true; } - if (s.contains(MaterialUtils.superscript("3"))) { + if (s.contains(StringUtils.superscript("3"))) { return true; } - if (s.contains(MaterialUtils.superscript("4"))) { + if (s.contains(StringUtils.superscript("4"))) { return true; } - if (s.contains(MaterialUtils.superscript("5"))) { + if (s.contains(StringUtils.superscript("5"))) { return true; } - if (s.contains(MaterialUtils.superscript("6"))) { + if (s.contains(StringUtils.superscript("6"))) { return true; } - if (s.contains(MaterialUtils.superscript("7"))) { + if (s.contains(StringUtils.superscript("7"))) { return true; } - if (s.contains(MaterialUtils.superscript("8"))) { + if (s.contains(StringUtils.superscript("8"))) { return true; } - if (s.contains(MaterialUtils.superscript("9"))) { + if (s.contains(StringUtils.superscript("9"))) { return true; } - if (s.contains(MaterialUtils.subscript("1"))) { + if (s.contains(StringUtils.subscript("1"))) { return true; } - if (s.contains(MaterialUtils.subscript("2"))) { + if (s.contains(StringUtils.subscript("2"))) { return true; } - if (s.contains(MaterialUtils.subscript("3"))) { + if (s.contains(StringUtils.subscript("3"))) { return true; } - if (s.contains(MaterialUtils.subscript("4"))) { + if (s.contains(StringUtils.subscript("4"))) { return true; } - if (s.contains(MaterialUtils.subscript("5"))) { + if (s.contains(StringUtils.subscript("5"))) { return true; } - if (s.contains(MaterialUtils.subscript("6"))) { + if (s.contains(StringUtils.subscript("6"))) { return true; } - if (s.contains(MaterialUtils.subscript("7"))) { + if (s.contains(StringUtils.subscript("7"))) { return true; } - if (s.contains(MaterialUtils.subscript("8"))) { + if (s.contains(StringUtils.subscript("8"))) { return true; } - if (s.contains(MaterialUtils.subscript("9"))) { + if (s.contains(StringUtils.subscript("9"))) { return true; } - final String r = MaterialUtils.subscript(s); + final String r = StringUtils.subscript(s); if (r.contains(("1"))) { return false; } @@ -200,7 +200,7 @@ public class BaseItemDustUnique extends Item{ } public final String getMaterialName() { - return MaterialUtils.subscript(this.materialName); + return StringUtils.subscript(this.materialName); } @Override diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java index 108f4f1097..60a27a8769 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java @@ -2,6 +2,7 @@ package gtPlusPlus.core.material; import gregtech.api.enums.Materials; import gtPlusPlus.core.material.state.MaterialState; +import gtPlusPlus.core.util.StringUtils; import gtPlusPlus.core.util.materials.MaterialUtils; public final class ELEMENT { @@ -108,7 +109,7 @@ public final class ELEMENT { public final Material FRANCIUM = new Material("Francium", MaterialState.SOLID, 25600, new short[]{170, 160, 170}, 27, 677, 87, 136, false, "Fr", 1);//Not a GT Inherited Material public final Material RADIUM = new Material("Radium", MaterialState.SOLID, 25600, new short[]{165, 165, 165}, 700, 1737, 88, 138, false, "Ra", 1);//Not a GT Inherited Material public final Material ACTINIUM = new Material("Actinium", MaterialState.SOLID, 25600, new short[]{150, 165, 165}, 1050, 3200, 89, 138, false, "Ac", 1);//Not a GT Inherited Material - public final Material THORIUM = new Material("Thorium", MaterialState.SOLID, 51200, Materials.Thorium.mRGBa, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, MaterialUtils.superscript("Th"), 1); + public final Material THORIUM = new Material("Thorium", MaterialState.SOLID, 51200, Materials.Thorium.mRGBa, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, StringUtils.superscript("Th"), 1); public final Material PROTACTINIUM = new Material("Protactinium", MaterialState.SOLID, 25600, new short[]{190, 150, 170}, 1568, 4027, 91, 140, false, "Pa", 1);//Not a GT Inherited Material public final Material URANIUM238 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium); public final Material URANIUM235 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium235); diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 38b49e0d9d..c7d50c55b2 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import gregtech.api.enums.*; import gtPlusPlus.core.item.base.cell.BaseItemCell; import gtPlusPlus.core.material.state.MaterialState; +import gtPlusPlus.core.util.StringUtils; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.fluid.FluidUtils; import gtPlusPlus.core.util.item.ItemUtils; @@ -569,7 +570,7 @@ public class Material { } } } - return MaterialUtils.subscript(dummyFormula); + return StringUtils.subscript(dummyFormula); //return dummyFormula; } Utils.LOG_MACHINE_INFO("dummyFormulaArray <= 0"); diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java index 404710e4bf..1b91741edb 100644 --- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java +++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java @@ -3,7 +3,7 @@ package gtPlusPlus.core.material.nuclear; import gregtech.api.enums.Materials; import gtPlusPlus.core.material.*; import gtPlusPlus.core.material.state.MaterialState; -import gtPlusPlus.core.util.materials.MaterialUtils; +import gtPlusPlus.core.util.StringUtils; public final class NUCLIDE { @@ -13,11 +13,16 @@ public final class NUCLIDE { public static NUCLIDE getInstance(){return thisClass;} //Custom Isotopes - public final Material LITHIUM7 = new Material("Lithium 7", MaterialState.LIQUID, Materials.Lithium.mRGBa, Materials.Lithium.mMeltingPoint, Materials.Lithium.mBlastFurnaceTemp, Materials.Lithium.getProtons(), Materials.Lithium.getNeutrons(), Materials.Lithium.mBlastFurnaceRequired, MaterialUtils.superscript("7Li"), 0);//Not a GT Inherited Material - public final Material URANIUM232 = new Material("Uranium 232", MaterialState.SOLID, new short[]{88, 220, 103, 0}, 1132, 4131, 92, 140, false, MaterialUtils.superscript("232U"), 4);//Not a GT Inherited Material - public final Material URANIUM233 = new Material("Uranium 233", MaterialState.SOLID, new short[]{73, 220, 83, 0}, 1132, 4131, 92, 141, false, MaterialUtils.superscript("233U"), 2);//Not a GT Inherited Material - public final Material THORIUM232 = new Material("Thorium 232", MaterialState.SOLID, new short[]{15, 60, 15, 0}, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, MaterialUtils.superscript("232Th"), 1);//Not a GT Inherited Material - public final Material PLUTONIUM238 = new Material("Plutonium-238", MaterialState.SOLID, Materials.Plutonium241.mDurability, Materials.Plutonium241.mRGBa, Materials.Plutonium241.mMeltingPoint, Materials.Plutonium241.mBlastFurnaceTemp, 94, 144, false, MaterialUtils.superscript("238Pu"), 2);//Not a GT Inherited Material + public final Material LITHIUM7 = new Material("Lithium 7", MaterialState.LIQUID, Materials.Lithium.mRGBa, Materials.Lithium.mMeltingPoint, Materials.Lithium.mBlastFurnaceTemp, Materials.Lithium.getProtons(), Materials.Lithium.getNeutrons(), Materials.Lithium.mBlastFurnaceRequired, StringUtils.superscript("7Li"), 0);//Not a GT Inherited Material + public final Material URANIUM232 = new Material("Uranium 232", MaterialState.SOLID, new short[]{88, 220, 103, 0}, 1132, 4131, 92, 140, false, StringUtils.superscript("232U"), 4);//Not a GT Inherited Material + public final Material URANIUM233 = new Material("Uranium 233", MaterialState.SOLID, new short[]{73, 220, 83, 0}, 1132, 4131, 92, 141, false, StringUtils.superscript("233U"), 2);//Not a GT Inherited Material + public final Material THORIUM232 = new Material("Thorium 232", MaterialState.SOLID, new short[]{15, 60, 15, 0}, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, StringUtils.superscript("232Th"), 1);//Not a GT Inherited Material + + //RTG Fuels + public final Material PLUTONIUM238 = new Material("Plutonium-238", MaterialState.SOLID, Materials.Plutonium241.mDurability, Materials.Plutonium241.mRGBa, Materials.Plutonium241.mMeltingPoint, Materials.Plutonium241.mBlastFurnaceTemp, 94, 144, false, StringUtils.superscript("238Pu"), 2);//Not a GT Inherited Material + public final Material STRONTIUM90 = new Material("Strongtium-90", MaterialState.SOLID, Materials.Strontium.mDurability, Materials.Strontium.mRGBa, Materials.Strontium.mMeltingPoint, Materials.Strontium.mBlastFurnaceTemp, 38, 52, false, StringUtils.superscript("90Sr"), 2);//Not a GT Inherited Material + public final Material POLONIUM210 = new Material("Polonium-210", MaterialState.SOLID, ELEMENT.getInstance().POLONIUM.vDurability, ELEMENT.getInstance().POLONIUM.getRGBA(), ELEMENT.getInstance().POLONIUM.getMeltingPointK(), ELEMENT.getInstance().POLONIUM.getBoilingPointK(), 84, 126, false, StringUtils.superscript("210Po"), 2);//Not a GT Inherited Material + public final Material AMERICIUM241 = new Material("Americium-241", MaterialState.SOLID, Materials.Americium.mDurability, Materials.Americium.mRGBa, Materials.Americium.mMeltingPoint, Materials.Americium.mBlastFurnaceTemp, 95, 146, false, StringUtils.superscript("241Am"), 2);//Not a GT Inherited Material @@ -30,7 +35,7 @@ public final class NUCLIDE { 150, //Protons 150, //Neutrons false, //Uses Blast furnace? - MaterialUtils.subscript(MaterialUtils.superscript("7")+"LiFBeF2ThF4UF4"), //Chemical Formula + StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ThF4UF4"), //Chemical Formula 5, //Radioactivity Level //Material Stacks with Percentage of required elements. new MaterialStack[]{ @@ -49,7 +54,7 @@ public final class NUCLIDE { 150, //Protons 150, //Neutrons false, //Uses Blast furnace? - MaterialUtils.subscript(MaterialUtils.superscript("7")+"LiFBeF2ZrF4UF4"), //Chemical Formula + StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ZrF4UF4"), //Chemical Formula 5, //Radioactivity Level //Material Stacks with Percentage of required elements. new MaterialStack[]{ @@ -68,7 +73,7 @@ public final class NUCLIDE { 150, //Protons 150, //Neutrons false, //Uses Blast furnace? - MaterialUtils.subscript(MaterialUtils.superscript("7")+"LiFBeF2ZrF4")+MaterialUtils.superscript("235U"), //Chemical Formula + StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ZrF4")+StringUtils.superscript("235U"), //Chemical Formula 5, //Radioactivity Level //Material Stacks with Percentage of required elements. new MaterialStack[]{ diff --git a/src/Java/gtPlusPlus/core/util/StringUtils.java b/src/Java/gtPlusPlus/core/util/StringUtils.java new file mode 100644 index 0000000000..6aedc7943f --- /dev/null +++ b/src/Java/gtPlusPlus/core/util/StringUtils.java @@ -0,0 +1,33 @@ +package gtPlusPlus.core.util; + +public class StringUtils { + + public static String superscript(String str) { + str = str.replaceAll("0", "\u2070"); + str = str.replaceAll("1", "\u00B9"); + str = str.replaceAll("2", "\u00B2"); + str = str.replaceAll("3", "\u00B3"); + str = str.replaceAll("4", "\u2074"); + str = str.replaceAll("5", "\u2075"); + str = str.replaceAll("6", "\u2076"); + str = str.replaceAll("7", "\u2077"); + str = str.replaceAll("8", "\u2078"); + str = str.replaceAll("9", "\u2079"); + return str; + } + + public static String subscript(String str) { + str = str.replaceAll("0", "\u2080"); + str = str.replaceAll("1", "\u2081"); + str = str.replaceAll("2", "\u2082"); + str = str.replaceAll("3", "\u2083"); + str = str.replaceAll("4", "\u2084"); + str = str.replaceAll("5", "\u2085"); + str = str.replaceAll("6", "\u2086"); + str = str.replaceAll("7", "\u2087"); + str = str.replaceAll("8", "\u2088"); + str = str.replaceAll("9", "\u2089"); + return str; + } + +} diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java index eff0016f8e..863ba2b3b8 100644 --- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java @@ -5,6 +5,7 @@ import java.util.List; import gregtech.api.enums.*; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.state.MaterialState; +import gtPlusPlus.core.util.StringUtils; import gtPlusPlus.core.util.Utils; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -40,7 +41,7 @@ public class MaterialUtils { final boolean blastFurnace = material.mBlastFurnaceRequired; final int durability = material.mDurability; MaterialState materialState; - final String chemicalFormula = MaterialUtils.subscript(Utils.sanitizeString(material.mChemicalFormula)); + final String chemicalFormula = StringUtils.subscript(Utils.sanitizeString(material.mChemicalFormula)); final Element element = material.mElement; int radioactivity = 0; if (material.isRadioactive()){ @@ -117,34 +118,6 @@ public class MaterialUtils { return true; } - public static String superscript(String str) { - str = str.replaceAll("0", "\u2070"); - str = str.replaceAll("1", "\u00B9"); - str = str.replaceAll("2", "\u00B2"); - str = str.replaceAll("3", "\u00B3"); - str = str.replaceAll("4", "\u2074"); - str = str.replaceAll("5", "\u2075"); - str = str.replaceAll("6", "\u2076"); - str = str.replaceAll("7", "\u2077"); - str = str.replaceAll("8", "\u2078"); - str = str.replaceAll("9", "\u2079"); - return str; - } - - public static String subscript(String str) { - str = str.replaceAll("0", "\u2080"); - str = str.replaceAll("1", "\u2081"); - str = str.replaceAll("2", "\u2082"); - str = str.replaceAll("3", "\u2083"); - str = str.replaceAll("4", "\u2084"); - str = str.replaceAll("5", "\u2085"); - str = str.replaceAll("6", "\u2086"); - str = str.replaceAll("7", "\u2087"); - str = str.replaceAll("8", "\u2088"); - str = str.replaceAll("9", "\u2089"); - return str; - } - public static int getTierOfMaterial(final int M){ if ((M >= 0) && (M <= 1000)){ return 1; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 21bef3a7f2..1b9a082d7d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -188,7 +188,10 @@ public enum GregtechItemList implements GregtechItemContainer { //Tick Accelerators from GTNH AcceleratorLV, AcceleratorMV, AcceleratorHV, AcceleratorEV, - AcceleratorIV, AcceleratorLuV, AcceleratorZPM, AcceleratorUV + AcceleratorIV, AcceleratorLuV, AcceleratorZPM, AcceleratorUV, + + //GT RTG + Pellet_RTG_PU238, Pellet_RTG_SR90, Pellet_RTG_PO210, Pellet_RTG_AM241 diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index 1468e97f85..fc9ed31f21 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -14,6 +14,7 @@ import gregtech.common.items.behaviors.Behaviour_DataOrb; import gregtech.common.items.behaviors.Behaviour_DataStick; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.RECIPES_Old_Circuits; +import gtPlusPlus.core.util.StringUtils; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -172,6 +173,11 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Mercury Battery", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, 1L), getTcAspectStack(TC_Aspects.POTENTIA, 1L)})); setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, -3L, true);*/ + //RTG Pellet + GregtechItemList.Pellet_RTG_PU238.set(this.addItem(41, StringUtils.superscript("238")+"Pu Pellet", "", new Object[]{getTcAspectStack(TC_Aspects.RADIO, 4L), getTcAspectStack(TC_Aspects.POTENTIA, 2L), getTcAspectStack(TC_Aspects.METALLUM, 2L)})); + GregtechItemList.Pellet_RTG_SR90.set(this.addItem(42, StringUtils.superscript("90")+"Sr Pellet", "", new Object[]{getTcAspectStack(TC_Aspects.RADIO, 4L), getTcAspectStack(TC_Aspects.POTENTIA, 2L), getTcAspectStack(TC_Aspects.METALLUM, 2L)})); + GregtechItemList.Pellet_RTG_PO210.set(this.addItem(43, StringUtils.superscript("210")+"Po Pellet", "", new Object[]{getTcAspectStack(TC_Aspects.RADIO, 4L), getTcAspectStack(TC_Aspects.POTENTIA, 2L), getTcAspectStack(TC_Aspects.METALLUM, 2L)})); + GregtechItemList.Pellet_RTG_AM241.set(this.addItem(44, StringUtils.superscript("241")+"Am Pellet", "", new Object[]{getTcAspectStack(TC_Aspects.RADIO, 4L), getTcAspectStack(TC_Aspects.POTENTIA, 2L), getTcAspectStack(TC_Aspects.METALLUM, 2L)})); //FOOOOOOOOOOOOOOD GregtechItemList.Food_Baked_Raisin_Bread.set(this.addItem(tLastID = 60, "Raisin Bread", "Extra Raisins, Just for ImQ009", new Object[]{new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), getTcAspectStack(TC_Aspects.CORPUS, 1L), getTcAspectStack(TC_Aspects.FAMES, 1L), getTcAspectStack(TC_Aspects.IGNIS, 1L)})); diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png Binary files differnew file mode 100644 index 0000000000..cbe6f91206 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png Binary files differnew file mode 100644 index 0000000000..cbe6f91206 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png Binary files differnew file mode 100644 index 0000000000..cbe6f91206 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png Binary files differnew file mode 100644 index 0000000000..cbe6f91206 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png |