update dump command with new fluid stuff

Author: htmlcsjs

src/main/java/net/htmlcsjs/htmlTech/common/command/CommandDumpMaterials.java

@@ -2,21 +2,22 @@
 
 import com.google.gson.Gson;
 import gregtech.api.GregTechAPI;
+import gregtech.api.recipes.recipeproperties.TemperatureProperty;
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.properties.*;
 import gregtech.api.unification.stack.MaterialStack;
 import gregtech.api.util.GTUtility;
+import net.htmlcsjs.htmlTech.HtmlTech;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.server.command.CommandTreeBase;
 
 import java.io.FileWriter;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static gregtech.api.GTValues.VN;
 
@@ -35,7 +36,7 @@ public String getUsage(ICommandSender sender) {
     public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
         Map<String, Object> materialsData = new HashMap<>();
         List<Map<String, Object>> materialsArray = new ArrayList<>();
-        for (Material material: GregTechAPI.MaterialRegistry.getAllMaterials()) {
+        for (Material material : GregTechAPI.MaterialRegistry.getAllMaterials()) {
             Map<String, Object> materialData = new HashMap<>();
             // dump simple stuff
             materialData.put("unlocalized_name", material.getUnlocalizedName());
@@ -52,11 +53,17 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 
             if (properties.hasProperty(PropertyKey.WIRE)) {
                 WireProperties wireProperties = material.getProperty(PropertyKey.WIRE);
-                propertiesMap.put("wire", String.format("Voltage: %s, Amperage: %d, Loss: %d", VN[GTUtility.getTierByVoltage(wireProperties.getVoltage())], wireProperties.getAmperage(), wireProperties.getLossPerBlock()));
+                propertiesMap.put("wire", String.format("Voltage: %s, Amperage: %d, Loss: %d",
+                        VN[GTUtility.getTierByVoltage(wireProperties.getVoltage())],
+                        wireProperties.getAmperage(),
+                        wireProperties.getLossPerBlock()));
             }
             if (properties.hasProperty(PropertyKey.TOOL)) {
                 ToolProperty toolProperty = material.getProperty(PropertyKey.TOOL);
-                propertiesMap.put("tool", String.format("Speed: %f, Durability: %d, Dmg: %f", toolProperty.getToolSpeed(), toolProperty.getToolDurability(), toolProperty.getToolAttackDamage()));
+                propertiesMap.put("tool", String.format("Speed: %f, Durability: %d, Dmg: %f",
+                        toolProperty.getToolSpeed(),
+                        toolProperty.getToolDurability(),
+                        toolProperty.getToolAttackDamage()));
             }
             if (properties.hasProperty(PropertyKey.ORE)) {
                 propertiesMap.put("ore", true);
@@ -66,20 +73,38 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
             try {
                 if (properties.hasProperty(PropertyKey.BLAST)) {
                     BlastProperty blastProperty = material.getProperty(PropertyKey.BLAST);
-                    propertiesMap.put("blast", String.format("Temp: %d, Gas Tier: %s", blastProperty.getBlastTemperature(), blastProperty.getGasTier().toString()));
+                    Method reflectedGetTempTeir = TemperatureProperty.class.getDeclaredMethod("getMinTierForTemperature", Integer.class);
+                    reflectedGetTempTeir.setAccessible(true);
+                    propertiesMap.put("blast", String.format("Temp: %dK (%s), Gas Tier: %s",
+                            blastProperty.getBlastTemperature(),
+                            reflectedGetTempTeir.invoke(TemperatureProperty.getInstance(), blastProperty.getBlastTemperature()),
+                            blastProperty.getGasTier().toString()));
                 }
-            } catch (Exception ignored) {}
+            } catch (Exception e) {
+                HtmlTech.logger.error(e.getMessage(), Arrays.stream(e.getStackTrace()).map(StackTraceElement::toString).collect(Collectors.joining("\n")));
+            }
             if (properties.hasProperty(PropertyKey.FLUID_PIPE)) {
                 FluidPipeProperties fluidPipeProperties = properties.getProperty(PropertyKey.FLUID_PIPE);
-                propertiesMap.put("fluid_pipe", String.format("Throughput: %d, Max Temp: %dK, Channels: %d", fluidPipeProperties.getThroughput(), fluidPipeProperties.getMaxFluidTemperature(), fluidPipeProperties.getTanks()));
+                propertiesMap.put("fluid_pipe", String.format("Throughput: %d, Max Temp: %dK, Acid proof: %b, Cryo proof: %b, Gas proof: %b, Plasma proof: %b",
+                        fluidPipeProperties.getThroughput(),
+                        fluidPipeProperties.getMaxFluidTemperature(),
+                        fluidPipeProperties.isAcidProof(),
+                        fluidPipeProperties.isCryoProof(),
+                        fluidPipeProperties.isGasProof(),
+                        fluidPipeProperties.isPlasmaProof()));
             }
             if (properties.hasProperty(PropertyKey.ITEM_PIPE)) {
                 ItemPipeProperties itemPipeProperties = properties.getProperty(PropertyKey.ITEM_PIPE);
                 propertiesMap.put("item_pipe", String.format("Throughput: %f, Priority: %d", itemPipeProperties.getTransferRate() * 64, itemPipeProperties.getPriority()));
             }
             if (properties.hasProperty(PropertyKey.FLUID)) {
                 FluidProperty fluidProperty = properties.getProperty(PropertyKey.FLUID);
-                propertiesMap.put("fluid_temp", String.format("Fluid Temp: %dK", fluidProperty.getFluidTemperature()));
+                fluidProperty.isGas();
+                fluidProperty.getFluidType().getName();
+                propertiesMap.put("fluid", String.format("Temp: %dK, Gas: %b, Type: %s",
+                        fluidProperty.getFluidTemperature(),
+                        fluidProperty.isGas(),
+                        fluidProperty.getFluidType().getName()));
             }
             if (properties.hasProperty(PropertyKey.PLASMA)) {
                 PlasmaProperty plasmaProperty = properties.getProperty(PropertyKey.PLASMA);