From c0eb617fa5c146b7a222c5461faf14394508cf4b Mon Sep 17 00:00:00 2001 From: miozune Date: Fri, 15 Jul 2022 14:34:19 +0900 Subject: Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge (#53) * Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge * updateBuildScript & spotlessApply --- .../java/goodgenerator/items/DepletedFuelRod.java | 7 +- src/main/java/goodgenerator/items/FuelRod.java | 87 ++- .../java/goodgenerator/items/MyItemBlocks.java | 37 +- src/main/java/goodgenerator/items/MyItems.java | 194 +++-- src/main/java/goodgenerator/items/MyMaterial.java | 780 ++++++++++----------- .../java/goodgenerator/items/RadioactiveItem.java | 3 +- .../items/nuclear/IsotopeMaterial.java | 17 +- .../items/nuclear/IsotopeMaterialLoader.java | 6 +- .../items/nuclear/NuclearMetaItemGenerator.java | 44 +- .../items/nuclear/NuclearTextures.java | 10 +- 10 files changed, 613 insertions(+), 572 deletions(-) (limited to 'src/main/java/goodgenerator/items') diff --git a/src/main/java/goodgenerator/items/DepletedFuelRod.java b/src/main/java/goodgenerator/items/DepletedFuelRod.java index 389187d966..1ae3d0be97 100644 --- a/src/main/java/goodgenerator/items/DepletedFuelRod.java +++ b/src/main/java/goodgenerator/items/DepletedFuelRod.java @@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack; public class DepletedFuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { - public DepletedFuelRod(String name, String[] tooltip, CreativeTabs Tab, int Rad) { super(name, tooltip, Tab, Rad); } @@ -19,11 +18,11 @@ public class DepletedFuelRod extends RadioactiveItem implements IReactorComponen } @Override - public void processChamber(IReactor iReactor, ItemStack itemStack, int i, int i1, boolean b) { - } + public void processChamber(IReactor iReactor, ItemStack itemStack, int i, int i1, boolean b) {} @Override - public boolean acceptUraniumPulse(IReactor iReactor, ItemStack itemStack, ItemStack itemStack1, int i, int i1, int i2, int i3, boolean b) { + public boolean acceptUraniumPulse( + IReactor iReactor, ItemStack itemStack, ItemStack itemStack1, int i, int i1, int i2, int i3, boolean b) { return false; } diff --git a/src/main/java/goodgenerator/items/FuelRod.java b/src/main/java/goodgenerator/items/FuelRod.java index 52ad395d12..e9227c3c91 100644 --- a/src/main/java/goodgenerator/items/FuelRod.java +++ b/src/main/java/goodgenerator/items/FuelRod.java @@ -1,5 +1,7 @@ package goodgenerator.items; +import static goodgenerator.util.DescTextLocalization.addText; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IBoxable; @@ -7,6 +9,8 @@ import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorComponent; import ic2.core.util.StackUtil; import ic2.core.util.Util; +import java.util.ArrayList; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -14,11 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; -import java.util.ArrayList; -import java.util.List; - -import static goodgenerator.util.DescTextLocalization.addText; - public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { private final int numberOfCells; private final int maxDmg; @@ -27,23 +26,40 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa private float HeatBonus = 0; private final ItemStack result; - public FuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, ItemStack aResult, CreativeTabs Tab) { + public FuelRod( + String aName, + int aCells, + int aEUt, + int aHeat, + int aRads, + int aDuration, + ItemStack aResult, + CreativeTabs Tab) { super(aName, Tab, aRads); this.setMaxStackSize(64); this.numberOfCells = aCells; this.maxDmg = aDuration; - this.Power = (float)aEUt / 25.0F; + this.Power = (float) aEUt / 25.0F; this.result = aResult; this.Heat = aHeat; setMaxDamage(100); } - public FuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, float aHeatBonus, ItemStack aResult, CreativeTabs Tab) { + public FuelRod( + String aName, + int aCells, + int aEUt, + int aHeat, + int aRads, + int aDuration, + float aHeatBonus, + ItemStack aResult, + CreativeTabs Tab) { super(aName, Tab, aRads); this.setMaxStackSize(64); this.numberOfCells = aCells; this.maxDmg = aDuration; - this.Power = (float)aEUt / 25.0F; + this.Power = (float) aEUt / 25.0F; this.result = aResult; this.Heat = aHeat; this.HeatBonus = aHeatBonus; @@ -52,11 +68,11 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa public void processChamber(IReactor reactor, ItemStack stack, int x, int y, boolean heatRun) { if (reactor.produceEnergy()) { - for(int iteration = 0; iteration < this.numberOfCells; ++iteration) { + for (int iteration = 0; iteration < this.numberOfCells; ++iteration) { int pulses = 1 + this.numberOfCells / 2; int heat; if (!heatRun) { - for(heat = 0; heat < pulses; ++heat) { + for (heat = 0; heat < pulses; ++heat) { this.acceptUraniumPulse(reactor, stack, stack, x, y, x, y, heatRun); } checkPulseable(reactor, x - 1, y, stack, x, y, heatRun); @@ -64,7 +80,10 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa checkPulseable(reactor, x, y - 1, stack, x, y, heatRun); checkPulseable(reactor, x, y + 1, stack, x, y, heatRun); } else { - pulses += checkPulseable(reactor, x - 1, y, stack, x, y, heatRun) + checkPulseable(reactor, x + 1, y, stack, x, y, heatRun) + checkPulseable(reactor, x, y - 1, stack, x, y, heatRun) + checkPulseable(reactor, x, y + 1, stack, x, y, heatRun); + pulses += checkPulseable(reactor, x - 1, y, stack, x, y, heatRun) + + checkPulseable(reactor, x + 1, y, stack, x, y, heatRun) + + checkPulseable(reactor, x, y - 1, stack, x, y, heatRun) + + checkPulseable(reactor, x, y + 1, stack, x, y, heatRun); heat = sumUp(pulses) * this.Heat; ArrayList heatAcceptors = new ArrayList<>(); this.checkHeatAcceptor(reactor, x - 1, y, heatAcceptors); @@ -72,10 +91,16 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa this.checkHeatAcceptor(reactor, x, y - 1, heatAcceptors); this.checkHeatAcceptor(reactor, x, y + 1, heatAcceptors); - while(heatAcceptors.size() > 0 && heat > 0) { + while (heatAcceptors.size() > 0 && heat > 0) { int dheat = heat / heatAcceptors.size(); heat -= dheat; - dheat = ((IReactorComponent) heatAcceptors.get(0).stack.getItem()).alterHeat(reactor, heatAcceptors.get(0).stack, heatAcceptors.get(0).x, heatAcceptors.get(0).y, dheat); + dheat = ((IReactorComponent) heatAcceptors.get(0).stack.getItem()) + .alterHeat( + reactor, + heatAcceptors.get(0).stack, + heatAcceptors.get(0).x, + heatAcceptors.get(0).y, + dheat); heat += dheat; heatAcceptors.remove(0); } @@ -95,7 +120,12 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa private static int checkPulseable(IReactor reactor, int x, int y, ItemStack me, int mex, int mey, boolean heatrun) { ItemStack other = reactor.getItemAt(x, y); - return other != null && other.getItem() instanceof IReactorComponent && ((IReactorComponent)other.getItem()).acceptUraniumPulse(reactor, other, me, x, y, mex, mey, heatrun) ? 1 : 0; + return other != null + && other.getItem() instanceof IReactorComponent + && ((IReactorComponent) other.getItem()) + .acceptUraniumPulse(reactor, other, me, x, y, mex, mey, heatrun) + ? 1 + : 0; } private static int sumUp(int x) { @@ -104,15 +134,24 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa private void checkHeatAcceptor(IReactor reactor, int x, int y, ArrayList heatAcceptors) { ItemStack thing = reactor.getItemAt(x, y); - if (thing != null && thing.getItem() instanceof IReactorComponent && ((IReactorComponent)thing.getItem()).canStoreHeat(reactor, thing, x, y)) { + if (thing != null + && thing.getItem() instanceof IReactorComponent + && ((IReactorComponent) thing.getItem()).canStoreHeat(reactor, thing, x, y)) { heatAcceptors.add(new ItemStackCoord(thing, x, y)); } - } - public boolean acceptUraniumPulse(IReactor reactor, ItemStack yourStack, ItemStack pulsingStack, int youX, int youY, int pulseX, int pulseY, boolean heatrun) { + public boolean acceptUraniumPulse( + IReactor reactor, + ItemStack yourStack, + ItemStack pulsingStack, + int youX, + int youY, + int pulseX, + int pulseY, + boolean heatrun) { if (!heatrun) { - reactor.addOutput(Power * (1 + HeatBonus * ((float) reactor.getHeat() /(float) reactor.getMaxHeat()))); + reactor.addOutput(Power * (1 + HeatBonus * ((float) reactor.getHeat() / (float) reactor.getMaxHeat()))); } return true; } @@ -134,7 +173,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa } public float influenceExplosion(IReactor reactor, ItemStack yourStack) { - return (float)(2 * this.numberOfCells); + return (float) (2 * this.numberOfCells); } @Override @@ -182,14 +221,16 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa @Override public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean p_77624_4_) { super.addInformation(item, player, tooltip, p_77624_4_); - tooltip.add(String.format(addText("fuelrod.tooltip", 1)[0], getMaxCustomDamage(item) - getCustomDamage(item), getMaxCustomDamage(item))); + tooltip.add(String.format( + addText("fuelrod.tooltip", 1)[0], + getMaxCustomDamage(item) - getCustomDamage(item), + getMaxCustomDamage(item))); double tMut = this.Heat / 4.0; if (this.Heat == 4) { tooltip.add(StatCollector.translateToLocal("fuelrodheat.tooltip.0")); } else { tooltip.add(String.format(StatCollector.translateToLocal("fuelrodheat.tooltip.1"), tMut)); } - if (this.HeatBonus != 0) - tooltip.add(StatCollector.translateToLocal("fuelrodheat.tooltip.2")); + if (this.HeatBonus != 0) tooltip.add(StatCollector.translateToLocal("fuelrodheat.tooltip.2")); } } diff --git a/src/main/java/goodgenerator/items/MyItemBlocks.java b/src/main/java/goodgenerator/items/MyItemBlocks.java index abb55e7f1d..f778444058 100644 --- a/src/main/java/goodgenerator/items/MyItemBlocks.java +++ b/src/main/java/goodgenerator/items/MyItemBlocks.java @@ -1,33 +1,33 @@ package goodgenerator.items; +import static goodgenerator.loader.Loaders.essentiaCell; +import static goodgenerator.loader.Loaders.yottaFluidTankCell; +import static goodgenerator.util.CharExchanger.tierName; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import goodgenerator.blocks.regularBlock.TEBlock; import goodgenerator.blocks.tileEntity.EssentiaOutputHatch; +import goodgenerator.main.GoodGenerator; import goodgenerator.util.CharExchanger; import goodgenerator.util.DescTextLocalization; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_LanguageManager; +import java.util.Arrays; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; -import goodgenerator.main.GoodGenerator; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; -import java.util.Arrays; -import java.util.List; - -import static goodgenerator.loader.Loaders.essentiaCell; -import static goodgenerator.loader.Loaders.yottaFluidTankCell; -import static goodgenerator.util.CharExchanger.tierName; - public class MyItemBlocks extends ItemBlock { - private final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); - private final String mNoTileEntityToolTip = GT_LanguageManager.addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); - + private final String mNoMobsToolTip = + GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); + private final String mNoTileEntityToolTip = + GT_LanguageManager.addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); - public MyItemBlocks(Block block){ + public MyItemBlocks(Block block) { super(block); this.setMaxDamage(0); this.setHasSubtypes(true); @@ -74,7 +74,8 @@ public class MyItemBlocks extends ItemBlock { p_77624_3_.addAll(Arrays.asList(DescTextLocalization.addText("EssentiaHatch.tooltip", 2))); if (tile.getIndex() == 2) { p_77624_3_.add(StatCollector.translateToLocal("EssentiaOutputHatch.tooltip.0")); - p_77624_3_.add(StatCollector.translateToLocal("EssentiaOutputHatch.tooltip.1") + " " + EssentiaOutputHatch.CAPACITY); + p_77624_3_.add(StatCollector.translateToLocal("EssentiaOutputHatch.tooltip.1") + " " + + EssentiaOutputHatch.CAPACITY); } } else p_77624_3_.add(mNoTileEntityToolTip); @@ -83,11 +84,13 @@ public class MyItemBlocks extends ItemBlock { cap.append(" 1000000"); for (int i = 0; i < p_77624_1_.getItemDamage(); i++) cap.append("00"); cap.append(" L"); - p_77624_3_.add(StatCollector.translateToLocal("YOTTankCell.tooltip.0") + CharExchanger.formatNumber(cap.toString())); + p_77624_3_.add(StatCollector.translateToLocal("YOTTankCell.tooltip.0") + + CharExchanger.formatNumber(cap.toString())); } if (Block.getBlockFromItem(p_77624_1_.getItem()).equals(essentiaCell)) { - p_77624_3_.add(StatCollector.translateToLocal("hatchTier.tooltip.0") + " " + tierName[p_77624_1_.getItemDamage() + 4]); + p_77624_3_.add(StatCollector.translateToLocal("hatchTier.tooltip.0") + " " + + tierName[p_77624_1_.getItemDamage() + 4]); } } } diff --git a/src/main/java/goodgenerator/items/MyItems.java b/src/main/java/goodgenerator/items/MyItems.java index 3d4b648747..68ae8e3357 100644 --- a/src/main/java/goodgenerator/items/MyItems.java +++ b/src/main/java/goodgenerator/items/MyItems.java @@ -1,8 +1,11 @@ package goodgenerator.items; -import goodgenerator.main.GoodGenerator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import goodgenerator.main.GoodGenerator; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -10,118 +13,113 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - public class MyItems extends Item { - @SideOnly(Side.CLIENT) - protected IIcon[] texture; - private String tex; - private String[] textureNames; - private final String Name; - private List tooltips = new ArrayList<>(); - private List tooltipses = new ArrayList<>(); + @SideOnly(Side.CLIENT) + protected IIcon[] texture; - public MyItems(String name, CreativeTabs Tab){ - this.setUnlocalizedName(name); - this.setCreativeTab(Tab); - this.tex = name; - this.Name = name; - } + private String tex; + private String[] textureNames; + private final String Name; + private List tooltips = new ArrayList<>(); + private List tooltipses = new ArrayList<>(); - public MyItems(String name, CreativeTabs Tab, String[] textures){ - this.setUnlocalizedName(name); - this.setCreativeTab(Tab); - this.setHasSubtypes(true); - this.textureNames = textures; - this.Name = name; - } + public MyItems(String name, CreativeTabs Tab) { + this.setUnlocalizedName(name); + this.setCreativeTab(Tab); + this.tex = name; + this.Name = name; + } - public MyItems(String name, String[] tooltip, CreativeTabs Tab, String[] textures){ - this.setUnlocalizedName(name); - this.setCreativeTab(Tab); - this.setHasSubtypes(true); - this.textureNames = textures; - this.Name = name; - this.tooltipses = Arrays.asList(tooltip); - } + public MyItems(String name, CreativeTabs Tab, String[] textures) { + this.setUnlocalizedName(name); + this.setCreativeTab(Tab); + this.setHasSubtypes(true); + this.textureNames = textures; + this.Name = name; + } - public MyItems(String name, String tooltip, CreativeTabs Tab) { - this.setUnlocalizedName(name); - this.setCreativeTab(Tab); - this.tex = name; - this.tooltips.add(tooltip); - this.Name = name; - } + public MyItems(String name, String[] tooltip, CreativeTabs Tab, String[] textures) { + this.setUnlocalizedName(name); + this.setCreativeTab(Tab); + this.setHasSubtypes(true); + this.textureNames = textures; + this.Name = name; + this.tooltipses = Arrays.asList(tooltip); + } - public MyItems(String name, String[] tooltip, CreativeTabs Tab) { - this.setUnlocalizedName(name); - this.setCreativeTab(Tab); - this.tex = name; - this.tooltips = Arrays.asList(tooltip); - this.Name = name; - } + public MyItems(String name, String tooltip, CreativeTabs Tab) { + this.setUnlocalizedName(name); + this.setCreativeTab(Tab); + this.tex = name; + this.tooltips.add(tooltip); + this.Name = name; + } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int meta) { - if (this.texture == null || this.texture.length < 1) return this.itemIcon; - else return meta < this.texture.length ? this.texture[meta] : this.texture[0]; - } + public MyItems(String name, String[] tooltip, CreativeTabs Tab) { + this.setUnlocalizedName(name); + this.setCreativeTab(Tab); + this.tex = name; + this.tooltips = Arrays.asList(tooltip); + this.Name = name; + } - @Override - public int getMetadata(int aMeta) { - return aMeta; - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int meta) { + if (this.texture == null || this.texture.length < 1) return this.itemIcon; + else return meta < this.texture.length ? this.texture[meta] : this.texture[0]; + } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) { - if (this.textureNames == null || this.textureNames.length < 1) { - this.itemIcon = iconRegister.registerIcon(GoodGenerator.MOD_ID + ":" + this.tex); - } - else { - this.texture = new IIcon[this.textureNames.length]; - for (int i = 0; i < this.textureNames.length; ++i) { - this.texture[i] = iconRegister.registerIcon(this.textureNames[i]); - } - } + @Override + public int getMetadata(int aMeta) { + return aMeta; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + if (this.textureNames == null || this.textureNames.length < 1) { + this.itemIcon = iconRegister.registerIcon(GoodGenerator.MOD_ID + ":" + this.tex); + } else { + this.texture = new IIcon[this.textureNames.length]; + for (int i = 0; i < this.textureNames.length; ++i) { + this.texture[i] = iconRegister.registerIcon(this.textureNames[i]); + } } + } - @Override - public String getUnlocalizedName(ItemStack p_77667_1_) { - if (this.textureNames == null || this.textureNames.length < 1){ - return "item." + this.Name; - } - else { - return "item." + this.Name + "." + p_77667_1_.getItemDamage(); - } + @Override + public String getUnlocalizedName(ItemStack p_77667_1_) { + if (this.textureNames == null || this.textureNames.length < 1) { + return "item." + this.Name; + } else { + return "item." + this.Name + "." + p_77667_1_.getItemDamage(); } + } - @Override - @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") - public void getSubItems(Item item, CreativeTabs tab, List list) { - if (this.texture == null || this.texture.length < 1) list.add(new ItemStack(item, 1, 0)); - else { - for (int i = 0; i < this.texture.length; ++i) { - list.add(new ItemStack(item, 1, i)); - } - } + @Override + @SideOnly(Side.CLIENT) + @SuppressWarnings("unchecked") + public void getSubItems(Item item, CreativeTabs tab, List list) { + if (this.texture == null || this.texture.length < 1) list.add(new ItemStack(item, 1, 0)); + else { + for (int i = 0; i < this.texture.length; ++i) { + list.add(new ItemStack(item, 1, i)); + } } + } - @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked"}) - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { - if (tooltips.size() > 0) { - p_77624_3_.addAll(tooltips); - } - if (tooltipses.size() > 0) { - int meta = p_77624_1_.getItemDamage(); - if (tooltipses.size() - 1 < meta) meta = tooltipses.size() - 1; - p_77624_3_.add(tooltipses.get(meta)); - } + @SideOnly(Side.CLIENT) + @SuppressWarnings({"unchecked"}) + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { + if (tooltips.size() > 0) { + p_77624_3_.addAll(tooltips); + } + if (tooltipses.size() > 0) { + int meta = p_77624_1_.getItemDamage(); + if (tooltipses.size() - 1 < meta) meta = tooltipses.size() - 1; + p_77624_3_.add(tooltipses.get(meta)); } + } } diff --git a/src/main/java/goodgenerator/items/MyMaterial.java b/src/main/java/goodgenerator/items/MyMaterial.java index 87b4dce439..566fa837ea 100644 --- a/src/main/java/goodgenerator/items/MyMaterial.java +++ b/src/main/java/goodgenerator/items/MyMaterial.java @@ -1,23 +1,22 @@ package goodgenerator.items; -import goodgenerator.util.CharExchanger; +import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; +import static gregtech.api.enums.Materials.*; + import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import gregtech.api.enums.Materials; -import gregtech.api.enums.TextureSet; import com.github.bartimaeusnek.bartworks.util.Pair; - -import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; -import static gregtech.api.enums.Materials.*; +import goodgenerator.util.CharExchanger; +import gregtech.api.enums.TextureSet; @SuppressWarnings({"unchecked"}) public class MyMaterial implements Runnable { protected static final int OffsetID = 10001; - //Uranium Based Fuel Line + // Uranium Based Fuel Line public static final Werkstoff graphiteUraniumMixture = new Werkstoff( - new short[]{0x3a,0x77,0x3d}, + new short[] {0x3a, 0x77, 0x3d}, "Graphite-Uranium Mixture", subscriptNumbers("C3U"), new Werkstoff.Stats(), @@ -25,323 +24,314 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().addMixerRecipes().onlyDust(), OffsetID, TextureSet.SET_DULL, - new Pair<> (Graphite,3), - new Pair<> (Uranium,1) - ); + new Pair<>(Graphite, 3), + new Pair<>(Uranium, 1)); public static final Werkstoff uraniumBasedLiquidFuel = new Werkstoff( - new short[]{0x00,0xff,0x00}, + new short[] {0x00, 0xff, 0x00}, "Uranium Based Liquid Fuel", subscriptNumbers("U36K8Qt4Rn"), new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 1, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff uraniumBasedLiquidFuelExcited = new Werkstoff( - new short[]{0x00,0xff,0x00}, + new short[] {0x00, 0xff, 0x00}, "Uranium Based Liquid Fuel (Excited State)", subscriptNumbers("*(U36K8Qt4Rn)*"), new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 2, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff uraniumBasedLiquidFuelDepleted = new Werkstoff( - new short[]{0x6e,0x8b,0x3d}, + new short[] {0x6e, 0x8b, 0x3d}, "Uranium Based Liquid Fuel (Depleted)", subscriptNumbers("Pb?Bi?Ba?Xe?"), new Werkstoff.Stats().setToxic(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 3, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); - //Thorium Based Fuel + // Thorium Based Fuel public static final Werkstoff uraniumCarbideThoriumMixture = new Werkstoff( - new short[]{0x16,0x32,0x07}, + new short[] {0x16, 0x32, 0x07}, "Uranium Carbide-Thorium Mixture", Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addMixerRecipes().onlyDust(), OffsetID + 4, TextureSet.SET_DULL, - new Pair<> (Thorium,8), - new Pair<> (WerkstoffLoader.Thorium232,4), - new Pair<> (Uranium235,1), - new Pair<> (Carbon,3) - ); + new Pair<>(Thorium, 8), + new Pair<>(WerkstoffLoader.Thorium232, 4), + new Pair<>(Uranium235, 1), + new Pair<>(Carbon, 3)); public static final Werkstoff thoriumBasedLiquidFuel = new Werkstoff( - new short[]{0x50,0x32,0x66}, + new short[] {0x50, 0x32, 0x66}, "Thorium Based Liquid Fuel", subscriptNumbers("Th432Li4D2Hg"), new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 5, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff thoriumBasedLiquidFuelExcited = new Werkstoff( - new short[]{0x50,0x32,0x66}, + new short[] {0x50, 0x32, 0x66}, "Thorium Based Liquid Fuel (Excited State)", subscriptNumbers("*(Th432Li4D2Hg)*"), new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 6, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff thoriumBasedLiquidFuelDepleted = new Werkstoff( - new short[]{0x7d,0x6c,0x8a}, + new short[] {0x7d, 0x6c, 0x8a}, "Thorium Based Liquid Fuel (Depleted)", subscriptNumbers("Lu?Pr?B?In?"), new Werkstoff.Stats().setToxic(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 7, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); - //Plutonium Based Fuel + // Plutonium Based Fuel public static final Werkstoff plutoniumOxideUraniumMixture = new Werkstoff( - new short[]{0xd1,0x1f,0x4a}, + new short[] {0xd1, 0x1f, 0x4a}, "Plutonium Oxide-Uranium Mixture", Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addMixerRecipes().onlyDust(), OffsetID + 8, TextureSet.SET_SHINY, - new Pair<> (Plutonium,10), - new Pair<> (Oxygen,12), - new Pair<> (Uranium,2), - new Pair<> (Carbon,8) - ); + new Pair<>(Plutonium, 10), + new Pair<>(Oxygen, 12), + new Pair<>(Uranium, 2), + new Pair<>(Carbon, 8)); public static final Werkstoff plutoniumBasedLiquidFuel = new Werkstoff( - new short[]{0xef,0x15,0x15}, + new short[] {0xef, 0x15, 0x15}, "Plutonium Based Liquid Fuel", subscriptNumbers("Pu45Nt8Cs16Nq2"), new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 9, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff plutoniumBasedLiquidFuelExcited = new Werkstoff( - new short[]{0xef,0x15,0x15}, + new short[] {0xef, 0x15, 0x15}, "Plutonium Based Liquid Fuel (Excited State)", subscriptNumbers("*(Pu45Nt8Cs16Nq2)*"), new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 10, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff plutoniumBasedLiquidFuelDepleted = new Werkstoff( - new short[]{0x67,0x19,0x19}, + new short[] {0x67, 0x19, 0x19}, "Plutonium Based Liquid Fuel (Depleted)", subscriptNumbers("Tn?Ce?Au?Kr?"), new Werkstoff.Stats().setToxic(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 11, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); - //Thorium-233 + // Thorium-233 public static final Werkstoff oxalate = new Werkstoff( - new short[]{0x79,0xd8,0x55}, + new short[] {0x79, 0xd8, 0x55}, "Oxalate", Werkstoff.Types.BIOLOGICAL, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 12, TextureSet.SET_FLUID, - new Pair<> (Hydrogen,2), - new Pair<> (Carbon,2), - new Pair<> (Oxygen,4) - ); + new Pair<>(Hydrogen, 2), + new Pair<>(Carbon, 2), + new Pair<>(Oxygen, 4)); public static final Werkstoff vanadiumPentoxide = new Werkstoff( - new short[]{0xde,0x8d,0x12}, + new short[] {0xde, 0x8d, 0x12}, "Vanadium Pentoxide", Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 13, TextureSet.SET_SHINY, - new Pair<> (Vanadium,2), - new Pair<> (Oxygen,5) - ); + new Pair<>(Vanadium, 2), + new Pair<>(Oxygen, 5)); public static final Werkstoff thoriumNitrate = new Werkstoff( - new short[]{0xba,0xe8,0x26}, + new short[] {0xba, 0xe8, 0x26}, "Thorium Nitrate", subscriptNumbers("Th(NO3)4"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 14, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff thoriumOxalate = new Werkstoff( - new short[]{0x50,0x63,0x13}, + new short[] {0x50, 0x63, 0x13}, "Thorium Oxalate", subscriptNumbers("Th(C2O4)2"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 15, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff thoriumHydroxide = new Werkstoff( - new short[]{0x92,0xae,0x89}, + new short[] {0x92, 0xae, 0x89}, "Thorium Hydroxide", subscriptNumbers("Th(OH)4"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 16, - TextureSet.SET_SHINY - ); + TextureSet.SET_SHINY); public static final Werkstoff sodiumOxalate = new Werkstoff( - new short[]{0xe4,0xf8,0x9b}, + new short[] {0xe4, 0xf8, 0x9b}, "Sodium Oxalate", subscriptNumbers("Na2C2O4"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 17, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff thoriumTetrachloride = new Werkstoff( - new short[]{0x13,0x7c,0x16}, + new short[] {0x13, 0x7c, 0x16}, "Thorium Tetrachloride", subscriptNumbers("ThCl4"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 18, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff thoriumTetrafluoride = new Werkstoff( - new short[]{0x15,0x6a,0x6a}, + new short[] {0x15, 0x6a, 0x6a}, "Thorium Tetrafluoride", subscriptNumbers("ThF4"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 19, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff thorium232Tetrafluoride = new Werkstoff( - new short[]{0x15,0x6a,0x6a}, + new short[] {0x15, 0x6a, 0x6a}, "Thorium-232 Tetrafluoride", new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 20, TextureSet.SET_FLUID, - new Pair<> (WerkstoffLoader.Thorium232,1), - new Pair<> (Fluorine,4) - ); + new Pair<>(WerkstoffLoader.Thorium232, 1), + new Pair<>(Fluorine, 4)); - //Atomic Separation Catalyst + // Atomic Separation Catalyst public static final Werkstoff orundum = new Werkstoff( - new short[]{0xcd,0x26,0x26}, + new short[] {0xcd, 0x26, 0x26}, "Orundum", "Or", new Werkstoff.Stats().setProtons(120).setMass(300), Werkstoff.Types.ELEMENT, new Werkstoff.GenerationFeatures().addGems(), OffsetID + 22, - TextureSet.SET_DIAMOND - ); + TextureSet.SET_DIAMOND); public static final Werkstoff atomicSeparationCatalyst = new Werkstoff( - new short[]{0xe8,0x5e,0x0c}, + new short[] {0xe8, 0x5e, 0x0c}, "Atomic Separation Catalyst", "the melting core...", new Werkstoff.Stats().setMeltingPoint(5000).setBlastFurnace(true), Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems().addSimpleMetalWorkingItems().addCraftingMetalWorkingItems().addMultipleIngotMetalWorkingItems(), + new Werkstoff.GenerationFeatures() + .disable() + .onlyDust() + .addMolten() + .addMetalItems() + .addSimpleMetalWorkingItems() + .addCraftingMetalWorkingItems() + .addMultipleIngotMetalWorkingItems(), OffsetID + 21, TextureSet.SET_SHINY, new Pair<>(MyMaterial.orundum, 2), new Pair<>(Plutonium, 1), - new Pair<>(Naquadah, 2) - ); + new Pair<>(Naquadah, 2)); - //Naquadah Fuel Rework + // Naquadah Fuel Rework public static final Werkstoff extremelyUnstableNaquadah = new Werkstoff( - new short[]{0x06,0x26,0x05}, + new short[] {0x06, 0x26, 0x05}, "Extremely Unstable Naquadah", - "Nq"+ CharExchanger.shifter(9734), - new Werkstoff.Stats().setMeltingPoint(7000).setBlastFurnace(true).setProtons(200).setMass(450).setRadioactive(true), + "Nq" + CharExchanger.shifter(9734), + new Werkstoff.Stats() + .setMeltingPoint(7000) + .setBlastFurnace(true) + .setProtons(200) + .setMass(450) + .setRadioactive(true), Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems().addSimpleMetalWorkingItems().addCraftingMetalWorkingItems().addMultipleIngotMetalWorkingItems(), + new Werkstoff.GenerationFeatures() + .disable() + .onlyDust() + .addMolten() + .addMetalItems() + .addSimpleMetalWorkingItems() + .addCraftingMetalWorkingItems() + .addMultipleIngotMetalWorkingItems(), OffsetID + 23, - TextureSet.SET_SHINY - ); + TextureSet.SET_SHINY); public static final Werkstoff lightNaquadahFuel = new Werkstoff( - new short[]{92,203,92}, + new short[] {92, 203, 92}, "Light Naquadah Fuel", "far from enough", new Werkstoff.Stats().setToxic(true).setRadioactive(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 24, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff heavyNaquadahFuel = new Werkstoff( - new short[]{54,255,54}, + new short[] {54, 255, 54}, "Heavy Naquadah Fuel", "still need processing", new Werkstoff.Stats().setToxic(true).setRadioactive(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 25, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahGas = new Werkstoff( - new short[]{93,219,0}, + new short[] {93, 219, 0}, "Naquadah Gas", "Who need it?", new Werkstoff.Stats().setToxic(true).setRadioactive(true).setGas(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 26, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahAsphalt = new Werkstoff( - new short[]{5,37,5}, + new short[] {5, 37, 5}, "Naquadah Asphalt", "It will damage the reactor.", new Werkstoff.Stats().setToxic(true).setRadioactive(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 27, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff ether = new Werkstoff( - new short[]{0xeb,0xbc,0x2f}, + new short[] {0xeb, 0xbc, 0x2f}, "Ether", subscriptNumbers("CH3CH2OCH2CH3"), new Werkstoff.Stats().setElektrolysis(true), @@ -349,149 +339,135 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 28, TextureSet.SET_FLUID, - new Pair<> (Carbon,4), - new Pair<> (Hydrogen, 10), - new Pair<> (Oxygen, 1) - ); + new Pair<>(Carbon, 4), + new Pair<>(Hydrogen, 10), + new Pair<>(Oxygen, 1)); public static final Werkstoff antimonyTrichloride = new Werkstoff( - new short[]{0x0f,0xdc,0x34}, + new short[] {0x0f, 0xdc, 0x34}, "Antimony Trichloride Solution", subscriptNumbers("SbCl3"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 29, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff antimonyPentachlorideSolution = new Werkstoff( - new short[]{0x15,0x93,0x2c}, + new short[] {0x15, 0x93, 0x2c}, "Antimony Pentachloride Solution", subscriptNumbers("SbCl5"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 30, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff antimonyPentachloride = new Werkstoff( - new short[]{0x15,0x93,0x2c}, + new short[] {0x15, 0x93, 0x2c}, "Antimony Pentachloride", subscriptNumbers("SbCl5"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 31, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff antimonyPentafluoride = new Werkstoff( - new short[]{0x16,0xd5,0xe2}, + new short[] {0x16, 0xd5, 0xe2}, "Antimony Pentafluoride", subscriptNumbers("SbF5"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 32, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff fluoroantimonicAcid = new Werkstoff( - new short[]{0x16,0xd5,0xe2}, + new short[] {0x16, 0xd5, 0xe2}, "Fluoroantimonic Acid", subscriptNumbers("HSbF6"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 33, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff radioactiveSludge = new Werkstoff( - new short[]{0xb3,0x49,0x1e}, + new short[] {0xb3, 0x49, 0x1e}, "Radioactive Sludge", ">>> DANGER <<<", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 34, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff acidNaquadahEmulsion = new Werkstoff( - new short[]{0x25,0x22,0x22}, + new short[] {0x25, 0x22, 0x22}, "Acid Naquadah Emulsion", - "??Nq??H"+CharExchanger.shifter(8314), + "??Nq??H" + CharExchanger.shifter(8314), new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 35, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahEmulsion = new Werkstoff( - new short[]{0x4a,0x46,0x45}, + new short[] {0x4a, 0x46, 0x45}, "Naquadah Emulsion", "??Nq??", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 36, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahSolution = new Werkstoff( - new short[]{0x84,0x81,0x80}, + new short[] {0x84, 0x81, 0x80}, "Naquadah Solution", "~Nq~", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 37, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkI = new Werkstoff( - new short[]{0x62,0x5c,0x5b}, + new short[] {0x62, 0x5c, 0x5b}, "Naquadah Based Liquid Fuel MkI", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 38, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkIDepleted = new Werkstoff( - new short[]{0xcb,0xc3,0xc1}, + new short[] {0xcb, 0xc3, 0xc1}, "Naquadah Based Liquid Fuel MkI (Depleted)", new Werkstoff.Stats().setToxic(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 39, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkII = new Werkstoff( - new short[]{0x52,0x4e,0x4d}, + new short[] {0x52, 0x4e, 0x4d}, "Naquadah Based Liquid Fuel MkII", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 40, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkIIDepleted = new Werkstoff( - new short[]{0xb5,0xb0,0xae}, + new short[] {0xb5, 0xb0, 0xae}, "Naquadah Based Liquid Fuel MkII (Depleted)", new Werkstoff.Stats().setToxic(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 41, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); /*These materials will be enable when they are removed in GregTech*/ /* public static final Werkstoff praseodymium = new Werkstoff( @@ -528,69 +504,63 @@ public class MyMaterial implements Runnable { ); */ public static final Werkstoff naquadahBasedFuelMkIII = new Werkstoff( - new short[]{0x29,0x22,0x21}, + new short[] {0x29, 0x22, 0x21}, "Naquadah Based Liquid Fuel MkIII", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 45, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkIIIDepleted = new Werkstoff( - new short[]{0x66,0x40,0x38}, + new short[] {0x66, 0x40, 0x38}, "Naquadah Based Liquid Fuel MkIII (Depleted)", new Werkstoff.Stats().setToxic(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 46, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkIV = new Werkstoff( - new short[]{0x0e,0x0c,0x0c}, + new short[] {0x0e, 0x0c, 0x0c}, "Naquadah Based Liquid Fuel MkIV", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 47, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkIVDepleted = new Werkstoff( - new short[]{0x8e,0x34,0x22}, + new short[] {0x8e, 0x34, 0x22}, "Naquadah Based Liquid Fuel MkIV (Depleted)", new Werkstoff.Stats().setToxic(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 48, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkV = new Werkstoff( - new short[]{0x00,0x00,0x00}, + new short[] {0x00, 0x00, 0x00}, "Naquadah Based Liquid Fuel MkV", "THE END", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 49, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkVDepleted = new Werkstoff( - new short[]{0xff,0xff,0xff}, + new short[] {0xff, 0xff, 0xff}, "Naquadah Based Liquid Fuel MkV (Depleted)", "THE END (literally)", new Werkstoff.Stats().setToxic(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 50, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff zincChloride = new Werkstoff( - new short[]{0x73,0xa5,0xfc}, + new short[] {0x73, 0xa5, 0xfc}, "Zinc Chloride", subscriptNumbers("ZnCl2"), new Werkstoff.Stats(), @@ -599,11 +569,10 @@ public class MyMaterial implements Runnable { OffsetID + 51, TextureSet.SET_SHINY, new Pair<>(Zinc, 1), - new Pair<>(Chlorine, 2) - ); + new Pair<>(Chlorine, 2)); public static final Werkstoff zincThoriumAlloy = new Werkstoff( - new short[]{0x12,0x34,0x56}, + new short[] {0x12, 0x34, 0x56}, "Zn-Th Alloy", subscriptNumbers("ZnTh"), new Werkstoff.Stats(), @@ -612,23 +581,21 @@ public class MyMaterial implements Runnable { OffsetID + 52, TextureSet.SET_SHINY, new Pair<>(Zinc, 1), - new Pair<>(Thorium, 1) - ); + new Pair<>(Thorium, 1)); - //Naquadah Rework Materials + // Naquadah Rework Materials public static final Werkstoff naquadahEarth = new Werkstoff( - new short[]{0x4c,0x4c,0x4c}, + new short[] {0x4c, 0x4c, 0x4c}, "Naquadah Oxide Mixture", subscriptNumbers("??NqTiGaAd??"), new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures(), OffsetID + 53, - TextureSet.SET_METALLIC - ); + TextureSet.SET_METALLIC); public static final Werkstoff titaniumTrifluoride = new Werkstoff( - new short[]{0xc0,0x92,0xa8}, + new short[] {0xc0, 0x92, 0xa8}, "Titanium Trifluoride", subscriptNumbers("TiF3"), new Werkstoff.Stats().setElektrolysis(true), @@ -636,23 +603,21 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 54, TextureSet.SET_METALLIC, - new Pair<> (Titanium, 1), - new Pair<> (Fluorine, 3) - ); + new Pair<>(Titanium, 1), + new Pair<>(Fluorine, 3)); public static final Werkstoff lowQualityNaquadahEmulsion = new Werkstoff( - new short[]{0x4c,0x4c,0x4c}, + new short[] {0x4c, 0x4c, 0x4c}, "Low Quality Naquadah Emulsion", subscriptNumbers("??NqGaAd??"), new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 55, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff galliumHydroxide = new Werkstoff( - new short[]{0xa6,0xa6,0xa6}, + new short[] {0xa6, 0xa6, 0xa6}, "Gallium Hydroxide", subscriptNumbers("Ga(OH)3"), new Werkstoff.Stats().setElektrolysis(true), @@ -660,24 +625,22 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 56, TextureSet.SET_DULL, - new Pair<> (Gallium, 1), - new Pair<> (Oxygen, 3), - new Pair<> (Hydrogen, 3) - ); + new Pair<>(Gallium, 1), + new Pair<>(Oxygen, 3), + new Pair<>(Hydrogen, 3)); public static final Werkstoff lowQualityNaquadahSolution = new Werkstoff( - new short[]{0x71,0x62,0x62}, + new short[] {0x71, 0x62, 0x62}, "Low Quality Naquadah Solution", subscriptNumbers("~??NqAd??~"), new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 57, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff towEthyl1Hexanol = new Werkstoff( - new short[]{0x80,0xb5,0x57}, + new short[] {0x80, 0xb5, 0x57}, "2-Ethyl-1-Hexanol", subscriptNumbers("C8H18O"), new Werkstoff.Stats().setElektrolysis(true), @@ -685,13 +648,12 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 58, TextureSet.SET_FLUID, - new Pair<> (Carbon, 8), - new Pair<> (Oxygen, 1), - new Pair<> (Hydrogen, 18) - ); + new Pair<>(Carbon, 8), + new Pair<>(Oxygen, 1), + new Pair<>(Hydrogen, 18)); public static final Werkstoff P507 = new Werkstoff( - new short[]{0x29,0xc2,0x2a}, + new short[] {0x29, 0xc2, 0x2a}, "P-507", subscriptNumbers("(C8H17)2PO3H"), new Werkstoff.Stats().setElektrolysis(true), @@ -699,36 +661,33 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 59, TextureSet.SET_FLUID, - new Pair<> (Carbon, 16), - new Pair<> (Phosphorus, 1), - new Pair<> (Oxygen, 3), - new Pair<> (Hydrogen, 35) - ); + new Pair<>(Carbon, 16), + new Pair<>(Phosphorus, 1), + new Pair<>(Oxygen, 3), + new Pair<>(Hydrogen, 35)); public static final Werkstoff naquadahAdamantiumSolution = new Werkstoff( - new short[]{0x3d,0x38,0x38}, + new short[] {0x3d, 0x38, 0x38}, "Naquadah-Adamantium Solution", subscriptNumbers("~NqAd~"), new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 60, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahRichSolution = new Werkstoff( - new short[]{0x33,0x33,0x33}, + new short[] {0x33, 0x33, 0x33}, "Naquadah-Rich Solution", subscriptNumbers("~?Nq?~"), new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 61, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff naquadahine = new Werkstoff( - new short[]{0x33,0x33,0x33}, + new short[] {0x33, 0x33, 0x33}, "Naquadahine", subscriptNumbers("NqO2"), new Werkstoff.Stats().setElektrolysis(false), @@ -736,32 +695,29 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 62, TextureSet.SET_METALLIC, - new Pair<> (Naquadah, 1), - new Pair<> (Oxygen, 2) - ); + new Pair<>(Naquadah, 1), + new Pair<>(Oxygen, 2)); public static final Werkstoff fluorineRichWasteLiquid = new Werkstoff( - new short[]{0x13,0x68,0x62}, + new short[] {0x13, 0x68, 0x62}, "Fluorine-Rich Waste Liquid", new Werkstoff.Stats().setToxic(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 63, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff wasteLiquid = new Werkstoff( - new short[]{0x14,0x1c,0x68}, + new short[] {0x14, 0x1c, 0x68}, "Waste Liquid", new Werkstoff.Stats().setToxic(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 64, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff adamantine = new Werkstoff( - new short[]{0xb7,0xb7,0xb7}, + new short[] {0xb7, 0xb7, 0xb7}, "Adamantine", subscriptNumbers("Ad2O3"), new Werkstoff.Stats().setElektrolysis(true), @@ -769,23 +725,21 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 65, TextureSet.SET_DULL, - new Pair<> (Adamantium, 2), - new Pair<> (Oxygen, 3) - ); + new Pair<>(Adamantium, 2), + new Pair<>(Oxygen, 3)); public static final Werkstoff enrichedNaquadahEarth = new Werkstoff( - new short[]{0x82,0x68,0x68}, + new short[] {0x82, 0x68, 0x68}, "Enriched-Naquadah Oxide Mixture", subscriptNumbers("??KeNq") + CharExchanger.shifter(8314) + "??", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures(), OffsetID + 66, - TextureSet.SET_METALLIC - ); + TextureSet.SET_METALLIC); public static final Werkstoff triniumSulphate = new Werkstoff( - new short[]{0xda,0xda,0xda}, + new short[] {0xda, 0xda, 0xda}, "Trinium Sulphate", subscriptNumbers("KeSO4"), new Werkstoff.Stats().setElektrolysis(true), @@ -793,35 +747,32 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 67, TextureSet.SET_METALLIC, - new Pair<> (Trinium, 1), - new Pair<> (Sulfur, 1), - new Pair<> (Oxygen, 4) - ); + new Pair<>(Trinium, 1), + new Pair<>(Sulfur, 1), + new Pair<>(Oxygen, 4)); public static final Werkstoff enrichedNaquadahRichSolution = new Werkstoff( - new short[]{0x52,0x39,0x39}, + new short[] {0x52, 0x39, 0x39}, "Enriched-Naquadah-Rich Solution", subscriptNumbers("~?Nq") + CharExchanger.shifter(8314) + "?~", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 68, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff concentratedEnrichedNaquadahSludge = new Werkstoff( - new short[]{0x52,0x39,0x39}, + new short[] {0x52, 0x39, 0x39}, "Concentrated Enriched-Naquadah Sludge", subscriptNumbers("?Nq") + CharExchanger.shifter(8314) + "?", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 69, - TextureSet.SET_METALLIC - ); + TextureSet.SET_METALLIC); public static final Werkstoff enrichedNaquadahSulphate = new Werkstoff( - new short[]{0x52,0x39,0x39}, + new short[] {0x52, 0x39, 0x39}, "Enriched-Naquadah Sulphate", "Nq" + CharExchanger.shifter(8314) + subscriptNumbers("(SO4)2"), new Werkstoff.Stats().setRadioactive(true).setElektrolysis(true), @@ -831,22 +782,20 @@ public class MyMaterial implements Runnable { TextureSet.SET_DULL, new Pair<>(NaquadahEnriched, 1),