diff options
Diffstat (limited to 'src')
25 files changed, 225 insertions, 164 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index b77abe1ef1..04470b3554 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -385,19 +385,19 @@ public final class ModItems { * Try generate dusts for missing rare earth materials if they don't exist */ - if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1))){ + if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1))){ ItemUtils.generateSpecialUseDusts("Gadolinium", "Gadolinium", Materials.Gadolinium.mElement.name(), Utils.rgbtoHexValue(226, 172, 9)); } - if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustYtterbium", 1))){ + if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustYtterbium", 1))){ ItemUtils.generateSpecialUseDusts("Ytterbium", "Ytterbium", Materials.Ytterbium.mElement.name(), Utils.rgbtoHexValue(Materials.Yttrium.mRGBa[0]-60, Materials.Yttrium.mRGBa[1]-60, Materials.Yttrium.mRGBa[2]-60)); } - if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSamarium", 1))){ + if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSamarium", 1))){ ItemUtils.generateSpecialUseDusts("Samarium", "Samarium", Materials.Samarium.mElement.name(), Utils.rgbtoHexValue(161, 168, 114)); } - if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLanthanum", 1))){ + if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLanthanum", 1))){ ItemUtils.generateSpecialUseDusts("Lanthanum", "Lanthanum", Materials.Lanthanum.mElement.name(), Utils.rgbtoHexValue(106, 127, 163)); } - if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGermanium", 1))){ + if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGermanium", 1))){ ItemUtils.generateSpecialUseDusts("Germanium", "Germanium", "Ge", ELEMENT.getInstance().GERMANIUM.getRgbAsHex()); } @@ -461,6 +461,14 @@ public final class ModItems { MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().STRONTIUM90, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM210, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().AMERICIUM241, false); + + + //Custom Materials that will have standalone refinery processes + MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false); + MaterialGenerator.generate(ELEMENT.STANDALONE.ASTRAL_TITANIUM); + MaterialGenerator.generate(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN); + MaterialGenerator.generate(ELEMENT.STANDALONE.HYPOGEN); + MaterialGenerator.generate(ELEMENT.STANDALONE.CHRONOMATIC_GLASS); //Carbides - Tungsten Carbide exists in .09 so don't generate it. - Should still come before alloys though @@ -471,6 +479,7 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.ZIRCONIUM_CARBIDE); MaterialGenerator.generate(ALLOY.TANTALUM_CARBIDE); MaterialGenerator.generate(ALLOY.NIOBIUM_CARBIDE); + MaterialGenerator.generate(ALLOY.TUNGSTEN_TITANIUM_CARBIDE); //LFTR Fuel components MaterialGenerator.generate(FLUORIDES.HYDROXIDE); //LFTR fuel component @@ -528,6 +537,8 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.MARAGING300); MaterialGenerator.generate(ALLOY.MARAGING350); + MaterialGenerator.generate(ALLOY.NITINOL_60); + //Composite Alloys MaterialGenerator.generate(ALLOY.STELLITE); MaterialGenerator.generate(ALLOY.TALONITE); @@ -565,6 +576,11 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.PIKYONIUM); MaterialGenerator.generate(ALLOY.ABYSSAL); + + MaterialGenerator.generate(ALLOY.TITANSTEEL, false); + MaterialGenerator.generate(ALLOY.ARCANITE); + MaterialGenerator.generate(ALLOY.OCTIRON); + //Must be the final Alloy to Generate MaterialGenerator.generate(ALLOY.QUANTUM); diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java index 78013e9c70..5f0254bc51 100644 --- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java +++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java @@ -6,6 +6,7 @@ import gregtech.api.util.GT_ModHandler; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.util.minecraft.ItemUtils; public class BaseItemIngot extends BaseItemComponent{ @@ -28,7 +29,7 @@ public class BaseItemIngot extends BaseItemComponent{ private void generateCompressorRecipe(){ final ItemStack tempStack = componentMaterial.getIngot(9); final ItemStack tempOutput = componentMaterial.getBlock(1); - if (tempStack != null && tempOutput != null){ + if (ItemUtils.checkForInvalidItems(new ItemStack[] {tempStack, tempOutput})){ GT_ModHandler.addCompressionRecipe(tempStack, tempOutput); } } diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index a8b7d6b297..6a659fc165 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -10,6 +10,7 @@ public final class ALLOY { //Just some GT Alloys that I need within mine. public static final Material BRONZE = MaterialUtils.generateMaterialFromGtENUM(Materials.Bronze); public static final Material STEEL = MaterialUtils.generateMaterialFromGtENUM(Materials.Steel); + public static final Material STEEL_BLACK = MaterialUtils.generateMaterialFromGtENUM(Materials.BlackSteel); public static final Material INVAR = MaterialUtils.generateMaterialFromGtENUM(Materials.Invar); public static final Material KANTHAL = MaterialUtils.generateMaterialFromGtENUM(Materials.Kanthal); public static final Material NICHROME = MaterialUtils.generateMaterialFromGtENUM(Materials.Nichrome); @@ -26,6 +27,7 @@ public final class ALLOY { 150, //Protons 80, //Neutrons true, //Uses Blast furnace? + "⬟ ⯂ ⬢ ⬣ ⯃ ⯄", //Material Stacks with Percentage of required elements. new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().AER, 5), @@ -188,6 +190,21 @@ public final class ALLOY { new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20), new MaterialStack(NICHROME, 10) }); + + public static final Material NITINOL_60 = new Material( + "Nitinol 60", //Material Name + MaterialState.SOLID, //State + null, //Material Colour + 5651, //Melting Point in C + 8975, + -1, + -1, + true, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().NICKEL, 40), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 60) + }); public static final Material ZERON_100 = new Material( @@ -437,6 +454,21 @@ public final class ALLOY { new MaterialStack(ELEMENT.getInstance().CARBON, 50), new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50) }); + + public static final Material TUNGSTEN_TITANIUM_CARBIDE = new Material( + "Tungsten Titanium Carbide", //Material Name + MaterialState.SOLID, //State + null, + -1, //Melting Point in C + -1, + -1, + -1, + true, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(TUNGSTEN_CARBIDE, 70), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 30) + }); public static final Material SILICON_CARBIDE = new Material( "Silicon Carbide", //Material Name @@ -497,6 +529,23 @@ public final class ALLOY { new MaterialStack(ELEMENT.getInstance().NIOBIUM, 50), new MaterialStack(ELEMENT.getInstance().CARBON, 50) }); + + public static final Material ARCANITE = new Material( + "Arcanite", //Material Name + MaterialState.SOLID, //State + null, + 5666, //Melting Point in C + 9875, + -1, + -1, + true, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().THORIUM232, 40), + new MaterialStack(ENERGYCRYSTAL, 40), + new MaterialStack(ELEMENT.getInstance().ORDO, 10), + new MaterialStack(ELEMENT.getInstance().PERDITIO, 10) + }); public static final Material LEAGRISIUM = new Material( "Grisium", //Material Name @@ -704,7 +753,7 @@ public final class ALLOY { public static final Material PIKYONIUM = new Material( "Pikyonium 64B", //Material Name MaterialState.SOLID, //State - null, //Material Colour + new short[]{52, 103, 186, 0}, //Material Colour 7850, //Melting Point in C 11765, //Boiling Point in C -1, @@ -744,12 +793,49 @@ public final class ALLOY { new MaterialStack(ELEMENT.getInstance().GERMANIUM, 2), }); + //Titansteel + public static final Material TITANSTEEL = new Material( + "Titansteel", //Material Name + MaterialState.SOLID, //State + null, //Material Colour + 8250, //Melting Point in C + 11765, //Boiling Point in C + -1, + -1, + true, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ALLOY.TUNGSTEN_TITANIUM_CARBIDE, 3), + new MaterialStack(ELEMENT.getInstance().IGNIS, 1), + new MaterialStack(ELEMENT.getInstance().TERRA, 1), + new MaterialStack(ELEMENT.getInstance().PERDITIO, 1), + }); + + + public static final Material OCTIRON = new Material( + "Octiron", //Material Name + MaterialState.SOLID, //State + null, + 9120, //Melting Point in C + 14200, + -1, + -1, + true, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ARCANITE, 30), + new MaterialStack(TITANSTEEL, 30), + new MaterialStack(ENERGYCRYSTAL, 5), + new MaterialStack(STEEL_BLACK, 10), + new MaterialStack(ELEMENT.getInstance().THAUMIUM, 25) + }); + //Quantum public static final Material QUANTUM = new Material( "Quantum", //Material Name MaterialState.SOLID, //State null, //Material Colour - 9500, //Melting Point in C + 10500, //Melting Point in C 25000, //Boiling Point in C 150, //Protons 200, //Neutrons diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java index 2c41789d9e..d69ad9b065 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java @@ -122,6 +122,8 @@ public final class ELEMENT { public final Material IGNIS = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedFire, TextureSets.GEM_A.get()); public final Material TERRA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedEarth, TextureSets.GEM_A.get()); public final Material AQUA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedWater, TextureSets.GEM_A.get()); + public final Material PERDITIO = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedEntropy, TextureSets.GEM_A.get()); + public final Material ORDO = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedOrder, TextureSets.GEM_A.get()); //Fictional public final Material YELLORIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yellorium, new short[] {255, 242, 10}, TextureSets.NUCLEAR.get()); @@ -146,8 +148,7 @@ public final class ELEMENT { public final Material AMERICIUM241 = new Material("Americium-241", MaterialState.SOLID, TextureSets.NUCLEAR.get(), Materials.Americium.mDurability, Materials.Americium.mRGBa, Materials.Americium.mMeltingPoint, Materials.Americium.mBlastFurnaceTemp, 95, 146, false, StringUtils.superscript("241Am"), 2, false);//Not a GT Inherited Material public final Material MAGIC = MaterialUtils.generateMaterialFromGtENUM(Materials.Magic, new short[] {10, 185, 140}); - public final Material THAUMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thaumium); - + public final Material THAUMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thaumium); static { Logger.MATERIALS("Initialising Base Elements."); @@ -202,6 +203,16 @@ public final class ELEMENT { public static ELEMENT getInstance(){ return INSTANCE; } + + public static class STANDALONE { + + public static final Material CELESTIAL_TUNGSTEN = new Material("Celestial Tungsten", MaterialState.SOLID, TextureSets.REFINED.get(), ELEMENT.INSTANCE.TUNGSTEN.getRGB(), INSTANCE.TUNGSTEN.getMeltingPointC()+6500, INSTANCE.TUNGSTEN.getBoilingPointC()+7500, 160, 101, true, "✦◆✦", 0);//Not a GT Inherited Material + public static final Material ASTRAL_TITANIUM = new Material("Astral Titanium", MaterialState.SOLID, TextureSets.REFINED.get(), ELEMENT.INSTANCE.TITANIUM.getRGB(), INSTANCE.TITANIUM.getMeltingPointC()+7500, INSTANCE.TITANIUM.getBoilingPointC()+7500, 145, 133, true, "✧◇✧", 0);//Not a GT Inherited Material + public static final Material CHRONOMATIC_GLASS = new Material("Chromatic Glass", MaterialState.SOLID, new short[]{255, 255, 255}, 9200, 17550, 40, 51, false, "🕛🕒🕕🕘🕛 ", 0);//Not a GT Inherited Material + public static final Material ADVANCED_NITINOL = new Material("Advanced Nitinol", MaterialState.SOLID, TextureSets.ENRICHED.get(), ALLOY.NITINOL_60.getRGB(), 8400, 14377, 40, 51, true, "⚷⚙⚷ Ni4Ti6", 0);//Not a GT Inherited Material + public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material + + } } diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 5819374f4d..1ee02a2654 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -5,23 +5,14 @@ import static gregtech.api.enums.GT_Values.M; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.ConcurrentSkipListSet; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.*; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TextureSet; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.item.base.cell.BaseItemCell; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; @@ -31,6 +22,10 @@ import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_Aspects; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -96,10 +91,14 @@ public class Material { public Material(String materialName, MaterialState defaultState, final TextureSet set, short[] rgba, int j, int k, int l, int m, int radiationLevel, MaterialStack[] materialStacks){ this(materialName, defaultState, set, 0, rgba, j, k, l, m, false, "", radiationLevel, false, materialStacks); } - + public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final MaterialStack... inputs){ this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", 0, inputs); } + + public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemSymbol, final MaterialStack... inputs){ + this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemSymbol, 0, inputs); + } public Material(final String materialName, final MaterialState defaultState, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, boolean generateCells, final MaterialStack... inputs){ this(materialName, defaultState, null, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", 0, generateCells, true, inputs); @@ -401,7 +400,7 @@ public class Material { } } - if (vMaterialInput.size() > 0) { + /*if (vMaterialInput.size() > 0) { AutoMap<Integer> aDataSet = new AutoMap<Integer>(); int bonus = 0; @@ -428,7 +427,8 @@ public class Material { } else { this.vTier = MaterialUtils.getTierOfMaterial((int) MathUtils.celsiusToKelvin(meltingPoint)); - } + }*/ + this.vTier = MaterialUtils.getTierOfMaterial(meltingPoint); //Sets the materials 'tier'. Will probably replace this logic. diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java index d8ac82d724..78a0d250a9 100644 --- a/src/Java/gtPlusPlus/core/material/ORES.java +++ b/src/Java/gtPlusPlus/core/material/ORES.java @@ -15,8 +15,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 1), @@ -33,8 +31,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), @@ -56,8 +52,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), @@ -76,8 +70,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), @@ -96,8 +88,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().LEAD, 1), @@ -114,8 +104,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().NICKEL, 1), @@ -135,8 +123,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), //Y not YT/YB @@ -153,8 +139,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), //Y not YT/YB @@ -175,8 +159,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), //Y not YT/YB @@ -196,8 +178,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1), @@ -215,8 +195,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CERIUM, 4), @@ -239,8 +217,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CERIUM, 2), @@ -262,8 +238,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), @@ -283,8 +257,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), @@ -301,8 +273,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), @@ -320,8 +290,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CERIUM, 1), @@ -339,8 +307,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), @@ -363,8 +329,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().POTASSIUM, 3), @@ -388,8 +352,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// (Ca,Th,Ce)Zr(Ti,Nb)2O7 new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), @@ -410,8 +372,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// (La)2(CO3)3·8(H2O) new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2), @@ -430,8 +390,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// (Ce)2(CO3)3·8(H2O) new MaterialStack(ELEMENT.getInstance().CERIUM, 2), @@ -450,8 +408,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// (Nd)2(CO3)3·8(H2O) new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2), @@ -470,8 +426,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// ((Ca,Ce)(Al,Ti,Mg)12O19) new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), @@ -491,8 +445,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// (Ce,La,Ca)9(Mg,Fe+3)(SiO4)6(SiO3OH)(OH)3 new MaterialStack(ELEMENT.getInstance().CERIUM, 9), @@ -514,8 +466,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// (YCa)Cu5(As2O4)3(OH)6·3H2O new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), @@ -535,8 +485,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// (CdCa)Cu7(AsO2)4(O2H)5·3H2O new MaterialStack(ELEMENT.getInstance().CADMIUM, 1), @@ -556,8 +504,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// (LaCa)Cu5(AsO6)2(OH)4·3H2O new MaterialStack(ELEMENT.getInstance().LANTHANUM, 1), @@ -577,8 +523,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// (NdCa)Cu6(As3O3)2(O2H)6·3H2O new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 1), @@ -598,8 +542,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// (Ca,Sr,Ce,Na)5(PO4)3F new MaterialStack(ELEMENT.getInstance().CALCIUM, 5), @@ -620,8 +562,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// SmAl3(PO4)2(OH)6 new MaterialStack(ELEMENT.getInstance().SAMARIUM, 1), @@ -640,8 +580,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().SODIUM, 3), @@ -659,8 +597,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), @@ -678,8 +614,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().CHLORINE, 1), @@ -698,8 +632,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", -1, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().BISMUTH, 13), @@ -718,8 +650,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().MERCURY, 54/4), @@ -741,8 +671,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().SULFUR, 5), @@ -764,8 +692,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().GOLD, 3), @@ -784,8 +710,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().GOLD, 8), @@ -805,8 +729,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11), @@ -825,8 +747,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2), @@ -845,8 +765,6 @@ public final class ORES { -1, -1, -1, - false, - "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1), diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 1a83b74691..4ce4bb3da6 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1396,15 +1396,15 @@ public class RECIPES_Machines { new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(9), 4 * (CORE.GTNH ? 2 : 1)), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 32 * (CORE.GTNH ? 2 : 1)), - ItemUtils.getItemStackOfAmountFromOreDict("wireGt16Superconductor", 8 * (CORE.GTNH ? 2 : 1)), - ItemUtils.getItemStackOfAmountFromOreDict("plateDenseNeutronium", 2 * (CORE.GTNH ? 2 : 1)), - ItemUtils.getSimpleStack(CI.fieldGenerator_ZPM, 6 * (CORE.GTNH ? 2 : 1)), - ItemList.Energy_LapotronicOrb2.get(1 * (CORE.GTNH ? 2 : 1)), - ItemList.FusionComputer_UV.get(1), + ItemUtils.getItemStackOfAmountFromOreDict("wireGt16Superconductor", 8 * (CORE.GTNH ? 4 : 2)), + ItemUtils.getItemStackOfAmountFromOreDict("plateDenseNeutronium", 2 * (CORE.GTNH ? 5 : 1)), + ItemUtils.getSimpleStack((CORE.GTNH ? CI.fieldGenerator_MAX : CI.fieldGenerator_ZPM), 5), + ItemList.Energy_LapotronicOrb2.get(1 * (CORE.GTNH ? 64 : 8)), + CORE.GTNH ? GregtechItemList.Compressed_Fusion_Reactor.get(1) : ItemList.FusionComputer_UV.get(1), GregtechItemList.Casing_Fusion_Internal.get(1) }, new FluidStack[] { - ALLOY.PIKYONIUM.getFluid(32 * 144), + ALLOY.PIKYONIUM.getFluid(32 * 144 * (CORE.GTNH ? 2 : 1)), ALLOY.HG1223.getFluid(64 * 144) }, GregtechItemList.FusionComputer_UV2.get(1), @@ -1420,9 +1420,9 @@ public class RECIPES_Machines { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 16 * (CORE.GTNH ? 2 : 1)), ItemUtils.getItemStackOfAmountFromOreDict("blockTungstenCarbide", 4 * (CORE.GTNH ? 2 : 1)), ItemUtils.getItemStackOfAmountFromOreDict("plateNeutronium", 2 * (CORE.GTNH ? 2 : 1)), - ItemUtils.getSimpleStack(CI.electricMotor_ZPM, 3 * (CORE.GTNH ? 2 : 1)), - ItemUtils.getSimpleStack(CI.electricPiston_LuV, 4 * (CORE.GTNH ? 2 : 1)), - ItemUtils.getSimpleStack(CI.machineHull_ZPM, 1 * (CORE.GTNH ? 2 : 1)), + ItemUtils.getSimpleStack((CORE.GTNH ? CI.electricMotor_MAX : CI.electricMotor_ZPM), 3 * (CORE.GTNH ? 2 : 1)), + ItemUtils.getSimpleStack((CORE.GTNH ? CI.electricPiston_UV : CI.electricPiston_LuV), 4 * (CORE.GTNH ? 2 : 1)), + ItemUtils.getSimpleStack((CORE.GTNH ? CI.machineHull_MAX : CI.machineHull_ZPM), 1 * (CORE.GTNH ? 2 : 1)), ItemList.Casing_Fusion2.get(1) }, new FluidStack[] { @@ -1440,12 +1440,12 @@ public class RECIPES_Machines { new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(8), 4 * (CORE.GTNH ? 2 : 1)), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 8 * (CORE.GTNH ? 2 : 1)), - ItemUtils.getItemStackOfAmountFromOreDict("plateNeutronium", 2 * (CORE.GTNH ? 2 : 1)), - ItemUtils.getSimpleStack(CI.emitter_ZPM, 2 * (CORE.GTNH ? 2 : 1)), - ItemUtils.getSimpleStack(CI.sensor_ZPM, 2 * (CORE.GTNH ? 2 : 1)), - ItemUtils.getSimpleStack(CI.fieldGenerator_LuV, 2 * (CORE.GTNH ? 2 : 1)), - ItemUtils.getSimpleStack(CI.getDataOrb(), 8 * (CORE.GTNH ? 2 : 1)), - ItemList.Energy_LapotronicOrb2.get(2 * (CORE.GTNH ? 2 : 1)), + ItemUtils.getItemStackOfAmountFromOreDict("plateNeutronium", 2 * (CORE.GTNH ? 3 : 1)), + ItemUtils.getSimpleStack((CORE.GTNH ? CI.emitter_MAX : CI.emitter_ZPM), 2 * (CORE.GTNH ? 2 : 1)), + ItemUtils.getSimpleStack((CORE.GTNH ? CI.sensor_MAX : CI.sensor_ZPM), 2 * (CORE.GTNH ? 2 : 1)), + ItemUtils.getSimpleStack((CORE.GTNH ? CI.fieldGenerator_MAX : CI.fieldGenerator_LuV), 2 * (CORE.GTNH ? 2 : 1)), + ItemUtils.getSimpleStack((CORE.GTNH ? ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(8), 8) : CI.getDataOrb()), 8 * (CORE.GTNH ? 2 : 1)), + ItemList.Energy_LapotronicOrb2.get(2 * (CORE.GTNH ? 16 : 1)), ItemList.Casing_Fusion_Coil.get(1) }, new FluidStack[] { diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index 32607e1247..f3dccf1390 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -215,7 +215,11 @@ public class MaterialUtils { } public static int getTierOfMaterial(final int aMeltingPoint){ - if ((aMeltingPoint >= 0) && (aMeltingPoint <= 1000)){ + + return aMeltingPoint < 1000 ? 0 : (Math.round(aMeltingPoint/1000)); + + + /*if ((aMeltingPoint >= 0) && (aMeltingPoint <= 1000)){ return 1; } else if((aMeltingPoint >= 1001) && (aMeltingPoint <= 2000)){ @@ -247,43 +251,49 @@ public class MaterialUtils { } else { return 0; - } + }*/ } - public static int getVoltageForTier(final int aTier) { + public static int getVoltageForTier(int aTier) { + aTier += 1; if (aTier == 0) { return 16; - } - if (aTier == 1) { + } else if (aTier == 1) { return 30; - } - if (aTier == 2) { + } else if (aTier == 2) { return 120; - } - if (aTier == 3) { + } else if (aTier == 3) { return 480; + } else if (aTier == 4) { + return 1920; + } else if (aTier == 5) { + return 7680; + } else if (aTier == 6) { + return 30720; + } else if (aTier == 7) { + return 122880; + } else if (aTier == 8) { + return 491520; + } else if (aTier == 9) { + return 1966080; + } else if (aTier == 10) { + return 7864320; + } else if (aTier == 11) { + return 31457280; + } else if (aTier == 12) { + return 125829120; + } else if (aTier == 13) { + return 503316480; + } else if (aTier == 14) { + return 2013265920; + } else { + return Integer.MAX_VALUE; } - if (aTier == 4) { - return 1600; - } - if (aTier == 5) { - return 6400; - } - if (aTier == 6) { - return 25000; - } - if (aTier == 7) { - return 100000; - } - if (aTier == 8) { - return 400000; - } - if (aTier == 9) { - return 1600000; - } - - - return 120; + + /*else { + int newTier = aTier - 1; + return (int) ((4*(Math.pow(4, newTier)))*7.5); + }*/ } private static Materials getMaterialByName(String materialName) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 31317d5377..def213ec7c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -87,6 +87,14 @@ public enum GregtechItemList implements GregtechItemContainer { //Custom Batteries (Unused) Battery_Gem_1, Battery_Gem_2, Battery_Gem_3, + //Compressed Fusion MK3 + Compressed_Fusion_Reactor, + + //Carbon Materials + NanoTube_Base_Substrate, + NanoTube_Finished, + Carbyne_Tube_Finished, + Carbyne_Sheet_Finished, //---------------------------------------------------------------------------- diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index 07cf24a228..e2e322f9ee 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -283,6 +283,15 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { GregTech_API.registerCover(GregtechItemList.Cover_Overflow_IV.get(1L, new Object[0]), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow(262144)); + //Fusion Reactor MK4 Singularity + GregtechItemList.Compressed_Fusion_Reactor.set(this.addItem(100, "Hypervisor Matrix (Fusion)", "A memory unit containing an RI (Restricted Intelligence)", new Object[0])); + GT_Values.RA.addCompressorRecipe(ItemList.FusionComputer_UV.get(9), GregtechItemList.Compressed_Fusion_Reactor.get(1), (int) GT_Values.V[7], (int) GT_Values.V[8]); + + //NanoTubes + GregtechItemList.NanoTube_Base_Substrate.set(this.addItem(101, "Silicon Base Substrate", "Used in the production of Carbon Nanotubes", new Object[0])); + GregtechItemList.NanoTube_Finished.set(this.addItem(102, "Carbon Nanotubes", "Multi-walled Zigzag nanotubes, possibly Carbon's final form", new Object[0])); + GregtechItemList.Carbyne_Tube_Finished.set(this.addItem(103, "Linear Acetylenic Carbon (LAC/Carbyne)", "LAC chains grown inside Multi-walled Carbon Nanotubes, highly stable", new Object[0])); + GregtechItemList.Carbyne_Sheet_Finished.set(this.addItem(104, "Carbyne Composite Panel", "Nanotubes which contain LAC, arranged side by side and compressed further", new Object[0])); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index b3115bbab5..5a985c6151 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -19,6 +19,7 @@ import gtPlusPlus.core.material.nuclear.NUCLIDE; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; import net.minecraftforge.fluids.FluidStack; public class RecipeGen_BlastSmelter extends RecipeGen_Base { @@ -78,12 +79,8 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { else { duration = (int) Math.max(M.getMass() / 50L, 1L) * 150; }*/ - - int aSlot = M.vTier - 2; - if (aSlot < 2) { - aSlot = 2; - } - long aVoltage = GT_Values.V[aSlot >= 2 ? aSlot : 2]; + + long aVoltage = MaterialUtils.getVoltageForTier(M.vTier); //Set a duration - NEW @@ -94,10 +91,14 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { } int mMaterialListSize=0; + + int mTotalPartsCounter = M.smallestStackSizeWhenProcessing; + if (M.getComposites() != null){ for (final gtPlusPlus.core.material.MaterialStack ternkfsdf : M.getComposites()){ if (ternkfsdf != null) { mMaterialListSize++; + //mTotalPartsCounter += ternkfsdf.getSmallestStackSizes()[0]; } } } @@ -107,7 +108,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { if (duration <= 0){ final int second = 20; - duration = 14*second*mMaterialListSize; + duration = 14*second*mMaterialListSize*8; } Logger.WARNING("[BAS] Size: "+mMaterialListSize); @@ -130,7 +131,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { //Generate Recipes for all singular materials that can be made molten. if (hasMoreInputThanACircuit){ if (M.requiresBlastFurnace()) { - if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration, (int) aVoltage)){ + if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, (duration/mTotalPartsCounter), (int) aVoltage)){ Logger.WARNING("[BAS] Success."); Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe."); if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration, 120)){ @@ -152,7 +153,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { } } else { - if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration/2, (int) aVoltage)){ + if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration/mTotalPartsCounter/2, (int) aVoltage)){ Logger.WARNING("[BAS] Success."); if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144), M.getIngot(1), duration/2, 60)){ Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe."); @@ -207,7 +208,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { if (M.getComposites().get(irc) != null){ final int r = (int) M.vSmallestRatio[irc]; inputStackCount = inputStackCount+r; - if ((M.getComposites().get(irc).getStackMaterial().getState() != MaterialState.SOLID) && ((M.getComposites().get(irc).getDustStack(r) == null) || (M.getComposites().get(irc).getDustStack(r) == ItemUtils.getSimpleStack(ModItems.AAA_Broken)))){ + if ((M.getComposites().get(irc).getStackMaterial().getState() != MaterialState.SOLID) || ((M.getComposites().get(irc).getDustStack(r) == null) || (M.getComposites().get(irc).getDustStack(r) == ItemUtils.getSimpleStack(ModItems.AAA_Broken)))){ final int xr = r; if ((xr > 0) && (xr <= 100)){ final int mathmatics = (r*1000); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index d4051ff8bf..ebf5aecd99 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -20,6 +20,7 @@ import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import net.minecraftforge.fluids.FluidStack; @@ -416,11 +417,11 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { if (aMatInfo.vTier <= 4){ timeTaken = 25*aMatInfo.vTier*10; } - int aSlot = aMatInfo.vTier - 1; + int aSlot = aMatInfo.vTier; if (aSlot < 2) { aSlot = 2; } - long aVoltage = GT_Values.V[aSlot >= 2 ? aSlot : 2]; + long aVoltage = MaterialUtils.getVoltageForTier(aSlot); return GT_Values.RA.addBlastRecipe( input1, diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png Binary files differnew file mode 100644 index 0000000000..d74a810fbd --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/102.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/102.png Binary files differnew file mode 100644 index 0000000000..e721d63382 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/102.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/103.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/103.png Binary files differnew file mode 100644 index 0000000000..0d66b3d141 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/103.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/104.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/104.png Binary files differnew file mode 100644 index 0000000000..6ec4da704e --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/104.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/751.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/751.png Binary files differnew file mode 100644 index 0000000000..ee106b029f --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/751.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/752.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/752.png Binary files differnew file mode 100644 index 0000000000..3aed0ef200 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/752.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/753.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/753.png Binary files differnew file mode 100644 index 0000000000..03d271872e --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/753.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/754.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/754.png Binary files differnew file mode 100644 index 0000000000..dd87199ae2 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/754.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/755.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/755.png Binary files differnew file mode 100644 index 0000000000..5b9053e1f4 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/755.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/756.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/756.png Binary files differnew file mode 100644 index 0000000000..23c87b8a2d --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/756.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png Binary files differnew file mode 100644 index 0000000000..511366e648 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/758.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/758.png Binary files differnew file mode 100644 index 0000000000..d8d2012c51 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/758.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/759.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/759.png Binary files differnew file mode 100644 index 0000000000..1e538bce45 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/759.png |
