change lasers to the final™ teiring

Author: htmlcsjs

src/main/java/net/htmlcsjs/htmlTech/api/unification/materials/HTMaterials.java

@@ -1,10 +1,10 @@
 package net.htmlcsjs.htmlTech.api.unification.materials;
 
-import gregtech.api.GTValues;
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.info.MaterialFlag;
 import gregtech.api.unification.material.properties.PropertyKey;
 
+import static gregtech.api.GTValues.*;
 import static gregtech.api.unification.material.Materials.*;
 import static gregtech.api.unification.material.info.MaterialFlags.*;
 import static gregtech.api.unification.material.info.MaterialIconSet.SHINY;
@@ -14,6 +14,7 @@ public class HTMaterials {
     /* Clamed Range 21000 to 21499 */
     // Materials
     public static Material FlOPPa;
+    public static Material NaquadriaTetratrinite;
 
     // Flags
     public static final MaterialFlag GENERATE_LASER;
@@ -35,9 +36,24 @@ public static void register() {
                 .toolStats(128, 50, 2621440, 128)
                 .build();
 
+        NaquadriaTetratrinite = new Material.Builder(21001, "naquadria_tetratrinite")
+                .fluid(Material.FluidType.GAS).fluidTemp(32012)
+                .components(Naquadria, 1, Trinium, 4)
+                .flags(DECOMPOSITION_BY_CENTRIFUGING)
+                .color(0x560909)
+                .build();
+
+
         // Adding Properties to Materials
-        Diamond.setProperty(LASER, new LaserProperties((int) GTValues.V[5], 128, 2));
-        Ruby.setProperty(LASER, new LaserProperties((int) GTValues.V[6], 256, 2));
+        CarbonDioxide.setProperty(LASER, new LaserProperties(V[IV], 256));
+        Helium.setProperty(LASER, new LaserProperties(V[LuV], 256));
+        Neon.setProperty(LASER, new LaserProperties(V[ZPM], 256));
+        Argon.setProperty(LASER, new LaserProperties(V[UV], 256));
+        Krypton.setProperty(LASER, new LaserProperties(V[IV], 1024));
+        Xenon.setProperty(LASER, new LaserProperties(V[LuV], 1024));
+        Radon.setProperty(LASER, new LaserProperties(V[ZPM], 1024));
+        NaquadriaTetratrinite.setProperty(LASER, new LaserProperties(V[UV], 1024));
+
 
         // Adding Flags to Materials
         Protactinium.setHidden(false);
@@ -47,6 +63,7 @@ public static void register() {
         Titanium.addFlags(GENERATE_FOIL);
         Darmstadtium.addFlags(GENERATE_FOIL);
         UraniumRhodiumDinaquadide.addFlags(GENERATE_SPRING);
+
     }
 
     public static void init() {

src/main/java/net/htmlcsjs/htmlTech/api/unification/materials/HTOrePrefix.java

@@ -28,8 +28,8 @@ private static void initLasers() {
         laser = new OrePrefix("laser", -1, null, laserIcon, ENABLE_UNIFICATION, material -> material.hasProperty(LASER),  material -> {
             List<String> textList = new ArrayList<String>();
 
-            int voltage = material.getProperty(LASER).voltage;
-            int amperage = material.getProperty(LASER).amperage;
+            long voltage = material.getProperty(LASER).voltage;
+            long amperage = material.getProperty(LASER).amperage;
 
             textList.add(I18n.format("htmltech.laser.voltage", voltage, GTValues.VNF[(GTUtility.getTierByVoltage(voltage))]));
             textList.add(I18n.format("htmltech.laser.amperage", amperage));

src/main/java/net/htmlcsjs/htmlTech/api/unification/materials/LaserProperties.java

@@ -8,24 +8,28 @@
 
 public class LaserProperties implements IMaterialProperty<LaserProperties> {
 
-    public final int voltage;
-    public final int amperage;
+    public final long voltage;
+    public final long amperage;
     public final double efficiency;
 
-    public LaserProperties(int voltage, int amperage, double efficiency) {
+    public LaserProperties(long voltage, long amperage, double efficiency) {
         this.voltage = voltage;
         this.amperage = amperage;
         this.efficiency = efficiency;
     }
 
+    public LaserProperties(long voltage, long amperage) {
+        this(voltage, amperage, 1.0);
+    }
+
     /**
      * Default values constructor
      */
     public LaserProperties() { this(32, 128, 0.2); }
 
     @Override
     public void verifyProperty(MaterialProperties materialProperties) {
-        materialProperties.ensureSet(PropertyKey.GEM);
+        materialProperties.ensureSet(PropertyKey.FLUID);
     }
 
     @Override

src/main/java/net/htmlcsjs/htmlTech/common/item/behaviors/LaserInspectorToolBehaviour.java

@@ -69,7 +69,7 @@ private String getLaserVoltage() {
             return I18n.format("metaitem.tool.laser.inspector.gui.not_laser");
         } else {
             Material material = GregTechAPI.MATERIAL_REGISTRY.getObjectById(laserItem.getDamage(laserInventory.getStackInSlot(0)));
-            int voltage = material.getProperty(LASER).voltage;
+            long voltage = material.getProperty(LASER).voltage;
             return I18n.format("htmltech.laser.voltage", voltage, GTValues.VN[(GTUtility.getTierByVoltage(voltage))]);
         }
     }
@@ -80,7 +80,7 @@ private String getLaserAmperage() {
             return "";
         } else {
             Material material = GregTechAPI.MATERIAL_REGISTRY.getObjectById(laserItem.getDamage(laserInventory.getStackInSlot(0)));
-            int amperage = material.getProperty(LASER).amperage;
+            long amperage = material.getProperty(LASER).amperage;
             return I18n.format("htmltech.laser.amperage", amperage);
         }
     }

src/main/java/net/htmlcsjs/htmlTech/loaders/recipe/MaterialLoader.java

@@ -1,18 +1,25 @@
 package net.htmlcsjs.htmlTech.loaders.recipe;
 
+import static gregtech.api.GTValues.*;
 import static gregtech.api.recipes.RecipeMaps.MIXER_RECIPES;
 import static gregtech.api.unification.material.Materials.*;
 import static gregtech.api.unification.ore.OrePrefix.dust;
 import static net.htmlcsjs.htmlTech.api.unification.materials.HTMaterials.FlOPPa;
+import static net.htmlcsjs.htmlTech.api.unification.materials.HTMaterials.NaquadriaTetratrinite;
 
 public class MaterialLoader {
     public static void init() {
-        MIXER_RECIPES.recipeBuilder().EUt(122880).duration(200)
+        MIXER_RECIPES.recipeBuilder().EUt(VA[ZPM]).duration(200)
                 .input(dust, Flerovium, 1)
                 .fluidInputs(Oxygen.getFluid(1000))
                 .input(dust, Phosphorus, 1)
                 .input(dust, Protactinium, 1)
                 .output(dust, FlOPPa, 4)
                 .buildAndRegister();
+
+        MIXER_RECIPES.recipeBuilder().EUt(VA[UV]).duration(2000)
+                .fluidInputs(Naquadria.getFluid(20), Trinium.getFluid(80))
+                .fluidOutputs(NaquadriaTetratrinite.getFluid(100))
+                .buildAndRegister();
     }
 }

src/main/resources/assets/gregtech/models/item/material_sets/gas/laser.json

@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/material_sets/dull/laser",
+    "layer1": "gregtech:items/material_sets/dull/laser_overlay"
+  }
+}

src/main/resources/assets/htmltech/lang/en_us.lang

@@ -32,3 +32,4 @@ tile.htmltech_casing.naq_alloy_casing.name=Resistant Naquadah Alloy Casing
 
 item.material.oreprefix.laser=%s Laser
 material.floppa=FlOPPa
+material.naquadria_tetratrinite=Naquadria Tetratrinite