diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 18:39:10 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 18:39:10 -0800 |
| commit | b846f1dc3a502d157ecf871e2a4a1ff49915f871 (patch) | |
| tree | 4a86feaaddd8d00d32f7cc093736d02be92bf358 /src/main/java/goodgenerator/items | |
| parent | 3194d4cbab82e336ecb82b5a2dc80153ed9b1b81 (diff) | |
| download | GT5-Unofficial-b846f1dc3a502d157ecf871e2a4a1ff49915f871.tar.gz GT5-Unofficial-b846f1dc3a502d157ecf871e2a4a1ff49915f871.tar.bz2 GT5-Unofficial-b846f1dc3a502d157ecf871e2a4a1ff49915f871.zip | |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/goodgenerator/items')
10 files changed, 557 insertions, 713 deletions
diff --git a/src/main/java/goodgenerator/items/DepletedFuelRod.java b/src/main/java/goodgenerator/items/DepletedFuelRod.java index 1ae3d0be97..62d863adc9 100644 --- a/src/main/java/goodgenerator/items/DepletedFuelRod.java +++ b/src/main/java/goodgenerator/items/DepletedFuelRod.java @@ -1,10 +1,11 @@ package goodgenerator.items; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; + import ic2.api.item.IBoxable; import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorComponent; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; public class DepletedFuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { @@ -21,8 +22,8 @@ public class DepletedFuelRod extends RadioactiveItem implements IReactorComponen 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 52bf8f111a..5f22826e15 100644 --- a/src/main/java/goodgenerator/items/FuelRod.java +++ b/src/main/java/goodgenerator/items/FuelRod.java @@ -2,16 +2,9 @@ package goodgenerator.items; import static goodgenerator.util.DescTextLocalization.addText; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_Utility; -import ic2.api.item.IBoxable; -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; @@ -19,7 +12,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.util.GT_Utility; +import ic2.api.item.IBoxable; +import ic2.api.reactor.IReactor; +import ic2.api.reactor.IReactorComponent; +import ic2.core.util.StackUtil; +import ic2.core.util.Util; + public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { + private final int numberOfCells; private final int maxDmg; private final float Power; @@ -27,14 +30,7 @@ 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, + 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); @@ -46,16 +42,8 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa 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; @@ -95,13 +83,12 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa 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); } @@ -121,12 +108,10 @@ 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) { @@ -135,22 +120,14 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa private void checkHeatAcceptor(IReactor reactor, int x, int y, ArrayList<FuelRod.ItemStackCoord> heatAcceptors) { ItemStack thing = reactor.getItemAt(x, y); - if (thing != null - && thing.getItem() instanceof IReactorComponent + 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()))); } @@ -183,6 +160,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa } private static class ItemStackCoord { + public ItemStack stack; public int x; public int y; @@ -222,10 +200,11 @@ 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")); diff --git a/src/main/java/goodgenerator/items/MyItemBlocks.java b/src/main/java/goodgenerator/items/MyItemBlocks.java index f778444058..12a1ab488e 100644 --- a/src/main/java/goodgenerator/items/MyItemBlocks.java +++ b/src/main/java/goodgenerator/items/MyItemBlocks.java @@ -4,16 +4,9 @@ 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 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; @@ -21,11 +14,21 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +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 gregtech.api.util.GT_LanguageManager; + 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) { super(block); @@ -63,7 +66,7 @@ public class MyItemBlocks extends ItemBlock { } @Override - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({ "unchecked" }) @SideOnly(Side.CLIENT) public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { if (p_77624_1_ == null) return; @@ -74,8 +77,9 @@ 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); @@ -84,13 +88,15 @@ 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 68ae8e3357..71a67d4fd6 100644 --- a/src/main/java/goodgenerator/items/MyItems.java +++ b/src/main/java/goodgenerator/items/MyItems.java @@ -1,11 +1,9 @@ package goodgenerator.items; -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; @@ -13,6 +11,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import goodgenerator.main.GoodGenerator; + public class MyItems extends Item { @SideOnly(Side.CLIENT) @@ -111,7 +113,7 @@ public class MyItems extends Item { } @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked"}) + @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); diff --git a/src/main/java/goodgenerator/items/MyMaterial.java b/src/main/java/goodgenerator/items/MyMaterial.java index 164b736486..bbdf2ee289 100644 --- a/src/main/java/goodgenerator/items/MyMaterial.java +++ b/src/main/java/goodgenerator/items/MyMaterial.java @@ -6,17 +6,18 @@ import static gregtech.api.enums.Materials.*; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.util.Pair; + import goodgenerator.util.CharExchanger; import gregtech.api.enums.TextureSet; -@SuppressWarnings({"unchecked"}) +@SuppressWarnings({ "unchecked" }) public class MyMaterial implements Runnable { protected static final int OffsetID = 10001; // 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(), @@ -28,7 +29,7 @@ public class MyMaterial implements Runnable { 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), @@ -38,7 +39,7 @@ public class MyMaterial implements Runnable { 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), @@ -48,7 +49,7 @@ public class MyMaterial implements Runnable { 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), @@ -59,7 +60,7 @@ public class MyMaterial implements Runnable { // 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(), @@ -71,7 +72,7 @@ public class MyMaterial implements Runnable { 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), @@ -81,7 +82,7 @@ public class MyMaterial implements Runnable { 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), @@ -91,7 +92,7 @@ public class MyMaterial implements Runnable { 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("Th?Pr?B?In?"), new Werkstoff.Stats().setToxic(true), @@ -102,7 +103,7 @@ public class MyMaterial implements Runnable { // 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(), @@ -114,7 +115,7 @@ public class MyMaterial implements Runnable { 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), @@ -124,7 +125,7 @@ public class MyMaterial implements Runnable { 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), @@ -134,7 +135,7 @@ public class MyMaterial implements Runnable { 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), @@ -145,7 +146,7 @@ public class MyMaterial implements Runnable { // 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(), @@ -156,7 +157,7 @@ public class MyMaterial implements Runnable { 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(), @@ -166,7 +167,7 @@ public class MyMaterial implements Runnable { 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(), @@ -176,7 +177,7 @@ public class MyMaterial implements Runnable { 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(), @@ -186,7 +187,7 @@ public class MyMaterial implements Runnable { 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(), @@ -196,7 +197,7 @@ public class MyMaterial implements Runnable { 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(), @@ -206,7 +207,7 @@ public class MyMaterial implements Runnable { 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(), @@ -216,7 +217,7 @@ public class MyMaterial implements Runnable { 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(), @@ -226,7 +227,7 @@ public class MyMaterial implements Runnable { 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, @@ -238,7 +239,7 @@ public class MyMaterial implements Runnable { // 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), @@ -248,19 +249,13 @@ public class MyMaterial implements Runnable { 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), @@ -269,29 +264,19 @@ public class MyMaterial implements Runnable { // 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) + 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); 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), @@ -301,7 +286,7 @@ public class MyMaterial implements Runnable { 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), @@ -311,7 +296,7 @@ public class MyMaterial implements Runnable { 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), @@ -321,7 +306,7 @@ public class MyMaterial implements Runnable { 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), @@ -331,7 +316,7 @@ public class MyMaterial implements Runnable { 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), @@ -344,7 +329,7 @@ public class MyMaterial implements Runnable { 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(), @@ -354,7 +339,7 @@ public class MyMaterial implements Runnable { 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(), @@ -364,7 +349,7 @@ public class MyMaterial implements Runnable { 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(), @@ -374,7 +359,7 @@ public class MyMaterial implements Runnable { 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(), @@ -384,7 +369,7 @@ public class MyMaterial implements Runnable { 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(), @@ -394,7 +379,7 @@ public class MyMaterial implements Runnable { 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), @@ -404,7 +389,7 @@ public class MyMaterial implements Runnable { 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), new Werkstoff.Stats().setRadioactive(true), @@ -414,7 +399,7 @@ public class MyMaterial implements Runnable { 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), @@ -424,7 +409,7 @@ public class MyMaterial implements Runnable { 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), @@ -434,7 +419,7 @@ public class MyMaterial implements Runnable { 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, @@ -443,7 +428,7 @@ public class MyMaterial implements Runnable { 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, @@ -452,7 +437,7 @@ public class MyMaterial implements Runnable { 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, @@ -461,50 +446,28 @@ public class MyMaterial implements Runnable { 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); - /*These materials will be enable when they are removed in GregTech*/ + /* These materials will be enable when they are removed in GregTech */ /* - public static final Werkstoff praseodymium = new Werkstoff( - new short[]{0xff,0xff,0xff}, - "praseodymium", - "Pr", - new Werkstoff.Stats(), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), - OffsetID + 42, - TextureSet.SET_METALLIC - ); - - public static final Werkstoff rubidium = new Werkstoff( - new short[]{0xff,0x2a,0x00}, - "rubidium", - "Rb", - new Werkstoff.Stats(), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), - OffsetID + 43, - TextureSet.SET_SHINY - ); - - public static final Werkstoff thulium = new Werkstoff( - new short[]{0xff,0xff,0xff}, - "Thulium", - "Tm", - new Werkstoff.Stats(), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), - OffsetID + 44, - |
