T9 Planets + new Textures (#35)

* Add T9 planets

... and move Deep Dark to T10

* Update buildscript

* Apply spotless

* Make all six side use different icons

* Apply spotless

5 files changed, 118 insertions, 28 deletions

diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/BlockDimensionDisplay.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/BlockDimensionDisplay.java
index 9e5ab1885c..7d3b1eb5bc 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/BlockDimensionDisplay.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/BlockDimensionDisplay.java
@@ -1,12 +1,12 @@
 package pers.gwyog.gtneioreplugin.plugin.block;
 
-import static pers.gwyog.gtneioreplugin.plugin.renderer.ItemDimensionDisplayRenderer.getPrefix;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
+
+import pers.gwyog.gtneioreplugin.plugin.renderer.ItemDimensionDisplayRenderer;
 
 public class BlockDimensionDisplay extends Block {
 
@@ -14,38 +14,34 @@ public class BlockDimensionDisplay extends Block {
 
     @SuppressWarnings("unused")
     public long getDimensionRocketTier() {
-        return dimensionRocketTier;
+        return this.dimensionRocketTier;
     }
 
     private final long dimensionRocketTier;
-    private IIcon iconTop;
-    private IIcon iconRight;
-    private IIcon iconLeft;
+    private final IIcon[] icons = new IIcon[6];
 
     public BlockDimensionDisplay(String dimension) {
         super(Material.rock);
         this.dimension = dimension;
-        this.dimensionRocketTier = getPrefix(dimension);
+        this.dimensionRocketTier = ItemDimensionDisplayRenderer.getPrefix(dimension);
     }
 
     @Override
     public IIcon getIcon(int side, int meta) {
-        EnumFacing direction = EnumFacing.getFront(side);
-        return switch (direction) {
-            case NORTH, SOUTH -> iconRight;
-            case WEST, EAST -> iconLeft;
-            default -> iconTop;
-        };
+        return this.icons[MathHelper.clamp_int(side, 0, 5)];
     }
 
     @Override
     public void registerBlockIcons(IIconRegister iconRegister) {
-        this.iconTop = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_top");
-        this.iconRight = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_right");
-        this.iconLeft = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_left");
+        this.icons[0] = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_bottom");
+        this.icons[1] = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_top");
+        this.icons[2] = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_back");
+        this.icons[3] = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_front");
+        this.icons[4] = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_left");
+        this.icons[5] = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_right");
     }
 
     public String getDimension() {
-        return dimension;
+        return this.dimension;
     }
 }
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java
index 0c7617645c..0c670a6d3d 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java
@@ -70,7 +70,8 @@ public class ItemDimensionDisplayRenderer implements IItemRenderer {
             case "Pr", "Tr" -> 6L;
             case "Ha", "KB", "MM", "Pl" -> 7L;
             case "BC", "BE", "BF", "CB", "TE", "VB" -> 8L;
-            case "DD" -> 9L;
+            case "An", "Ho", "Np", "Mh", "MB", "Se" -> 9L;
+            case "DD" -> 10L;
             default -> -1L;
         };
     }
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java b/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java
index d19a1fdff9..1a56044219 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java
@@ -64,6 +64,7 @@ public class CSVMaker implements Runnable {
                 oremix.setOreName(oreLayer.oreGenName.split("\\.")[2]);
                 oremix.setHeight(oreLayer.worldGenHeightRange);
                 oremix.setDensity(oreLayer.amountPerChunk);
+                oremix.an = Dims.contains("An");
                 oremix.as = Dims.contains("As");
                 oremix.bc = Dims.contains("BC");
                 oremix.be = Dims.contains("BE");
@@ -78,17 +79,22 @@ public class CSVMaker implements Runnable {
                 oremix.eu = Dims.contains("Eu");
                 oremix.ga = Dims.contains("Ga");
                 oremix.ha = Dims.contains("Ha");
+                oremix.ho = Dims.contains("Ho");
                 oremix.io = Dims.contains("Io");
                 oremix.kb = Dims.contains("KB");
                 oremix.make = Dims.contains("MM");
                 oremix.ma = Dims.contains("Ma");
+                oremix.mb = Dims.contains("MB");
                 oremix.me = Dims.contains("Me");
+                oremix.mh = Dims.contains("Mh");
                 oremix.mi = Dims.contains("Mi");
                 oremix.mo = Dims.contains("Mo");
+                oremix.np = Dims.contains("Np");
                 oremix.ob = Dims.contains("Ob");
                 oremix.ph = Dims.contains("Ph");
                 oremix.pl = Dims.contains("Pl");
                 oremix.pr = Dims.contains("Pr");
+                oremix.se = Dims.contains("Se");
                 oremix.tcetie = Dims.contains("TE");
                 oremix.tf = Dims.contains("TF");
                 oremix.ti = Dims.contains("Ti");
@@ -106,14 +112,14 @@ public class CSVMaker implements Runnable {
             BufferedWriter one = Files.newBufferedWriter(Paths.get(GTNEIOrePlugin.CSVnameSmall));
             ColumnPositionMappingStrategy<Oremix> strat = new ColumnPositionMappingStrategy<>();
             strat.setType(Oremix.class);
-            String[] columns = "ORENAME,mix,DENSITY,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie"
+            String[] columns = "ORENAME,mix,DENSITY,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie,an,ho,np,mh,mb,se"
                     .split("\\,");
             strat.setColumnMapping(columns);
             StatefulBeanToCsv<Oremix> beanToCsv = new StatefulBeanToCsvBuilder<Oremix>(one)
                     .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER).withMappingStrategy(strat).build();
             List<Oremix> towrite = Combsort(OreVeins);
             one.write(
-                    "Ore Name,Primary,Secondary,Inbetween,Around,ID,Tier,Height,Density,Size,Weight,Overworld,Nether,End,End Asteroids,Twilight Forest,Moon,Mars,Phobos,Deimos,Asteroids,Ceres,Europa,Ganymede,Callisto,Io,Venus,Mercury,Enceladus,Titan,Miranda,Oberon,Proteus,Triton,Pluto,Kuiper Belt,Haumea,Makemake,Deep Dark,Centauri Bb,Vega B,Barnard C,Barnard E,Barnard F,T Ceti E");
+                    "Ore Name,Primary,Secondary,Inbetween,Around,ID,Tier,Height,Density,Size,Weight,Overworld,Nether,End,End Asteroids,Twilight Forest,Moon,Mars,Phobos,Deimos,Asteroids,Ceres,Europa,Ganymede,Callisto,Io,Venus,Mercury,Enceladus,Titan,Miranda,Oberon,Proteus,Triton,Pluto,Kuiper Belt,Haumea,Makemake,Deep Dark,Centauri Bb,Vega B,Barnard C,Barnard E,Barnard F,T Ceti E,Anubis,Horus,Neper,Maahes,Mehen Belt,Seth");
             one.newLine();
             beanToCsv.write(towrite);
             one.flush();
@@ -156,6 +162,7 @@ public class CSVMaker implements Runnable {
                                 + Integer.toString(oreLayer.Meta[2])
                                 + "|"
                                 + Integer.toString(oreLayer.Meta[3]));
+                oremix.an = Dims.contains("An");
                 oremix.as = Dims.contains("As");
                 oremix.bc = Dims.contains("BC");
                 oremix.be = Dims.contains("BE");
@@ -170,17 +177,22 @@ public class CSVMaker implements Runnable {
                 oremix.eu = Dims.contains("Eu");
                 oremix.ga = Dims.contains("Ga");
                 oremix.ha = Dims.contains("Ha");
+                oremix.ho = Dims.contains("Ho");
                 oremix.io = Dims.contains("Io");
                 oremix.kb = Dims.contains("KB");
                 oremix.make = Dims.contains("MM");
                 oremix.ma = Dims.contains("Ma");
+                oremix.mb = Dims.contains("MB");
                 oremix.me = Dims.contains("Me");
+                oremix.mh = Dims.contains("Mh");
                 oremix.mi = Dims.contains("Mi");
                 oremix.mo = Dims.contains("Mo");
+                oremix.np = Dims.contains("Np");
                 oremix.ob = Dims.contains("Ob");
                 oremix.ph = Dims.contains("Ph");
                 oremix.pl = Dims.contains("Pl");
                 oremix.pr = Dims.contains("Pr");
+                oremix.se = Dims.contains("Se");
                 oremix.tcetie = Dims.contains("TE");
                 oremix.tf = Dims.contains("TF");
                 oremix.ti = Dims.contains("Ti");
@@ -198,14 +210,14 @@ public class CSVMaker implements Runnable {
             BufferedWriter one = Files.newBufferedWriter(Paths.get(GTNEIOrePlugin.CSVname));
             ColumnPositionMappingStrategy<Oremix> strat = new ColumnPositionMappingStrategy<>();
             strat.setType(Oremix.class);
-            String[] columns = "ORENAME,PRIMARY,SECONDARY,INBETWEEN,AROUND,mix,TIER,HEIGHT,DENSITY,SIZE,WEIGHT,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie"
+            String[] columns = "ORENAME,PRIMARY,SECONDARY,INBETWEEN,AROUND,mix,TIER,HEIGHT,DENSITY,SIZE,WEIGHT,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie,an,ho,np,mh,mb,se"
                     .split("\\,");
             strat.setColumnMapping(columns);
             StatefulBeanToCsv<Oremix> beanToCsv = new StatefulBeanToCsvBuilder<Oremix>(one)
                     .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER).withMappingStrategy(strat).build();
             List<Oremix> towrite = Combsort(OreVeins);
             one.write(
-                    "Ore Name,Primary,Secondary,Inbetween,Around,ID,Tier,Height,Density,Size,Weight,Overworld,Nether,End,End Asteroids,Twilight Forest,Moon,Mars,Phobos,Deimos,Asteroids,Ceres,Europa,Ganymede,Callisto,Io,Venus,Mercury,Enceladus,Titan,Miranda,Oberon,Proteus,Triton,Pluto,Kuiper Belt,Haumea,Makemake,Deep Dark,Centauri Bb,Vega B,Barnard C,Barnard E,Barnard F,T Ceti E");
+                    "Ore Name,Primary,Secondary,Inbetween,Around,ID,Tier,Height,Density,Size,Weight,Overworld,Nether,End,End Asteroids,Twilight Forest,Moon,Mars,Phobos,Deimos,Asteroids,Ceres,Europa,Ganymede,Callisto,Io,Venus,Mercury,Enceladus,Titan,Miranda,Oberon,Proteus,Triton,Pluto,Kuiper Belt,Haumea,Makemake,Deep Dark,Centauri Bb,Vega B,Barnard C,Barnard E,Barnard F,T Ceti E,Anubis,Horus,Neper,Maahes,Mehen Belt,Seth");
             one.newLine();
             beanToCsv.write(towrite);
             one.flush();
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java
index 02ad143dd4..78224dc5ae 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java
@@ -30,12 +30,18 @@ public class DimensionHelper {
             "GalaxySpace_Haumea", "GalaxySpace_Kuiperbelt", "GalaxySpace_MakeMake", "GalaxySpace_Pluto",
             // T8
             "GalaxySpace_BarnardC", "GalaxySpace_BarnardE", "GalaxySpace_BarnardF", "GalaxySpace_CentauriA",
-            "GalaxySpace_TcetiE", "Underdark", "GalaxySpace_VegaB", };
+            "GalaxySpace_TcetiE", "GalaxySpace_VegaB",
+            // T9
+            "GalacticraftAmunRa_Anubis", "GalacticraftAmunRa_Horus", "GalacticraftAmunRa_Maahes",
+            "GalacticraftAmunRa_Mehen Belt", "GalacticraftAmunRa_Neper", "GalacticraftAmunRa_Seth",
+            // T10
+            "Underdark", };
 
     public static final String[] DimNameTrimmed = Arrays.stream(DimName)
             .map(
                     n -> n.replaceAll("GalacticraftCore_", "").replaceAll("GalacticraftMars_", "")
-                            .replaceAll("GalaxySpace_", "").replaceAll("Vanilla_", "Vanilla "))
+                            .replaceAll("GalaxySpace_", "").replaceAll("GalacticraftAmunRa_", "")
+                            .replaceAll("Vanilla_", "Vanilla "))
             .toArray(String[]::new);
 
     public static final String[] DimNameDisplayed = { // first 2 letters if one word else 1 letter of every word, except
@@ -83,10 +89,18 @@ public class DimensionHelper {
             "BC", // GalaxySpace_BarnardC
             "BE", // GalaxySpace_BarnardE
             "BF", // GalaxySpace_BarnardF
-            "CB", // GalaxySpace_CentauriA is actually αCentauri Bb
+            "CB", // GalaxySpace_CentauriA is actually α Centauri Bb
             "TE", // GalaxySpace_TcetiE
-            "DD", // Underdark
             "VB", // GalaxySpace_VegaB
+            // T9
+            "An", // GalacticraftAmunRa_Anubis
+            "Ho", // GalacticraftAmunRa_Horus
+            "Mh", // GalacticraftAmunRa_Maahes
+            "MB", // GalacticraftAmunRa_Mehen Belt
+            "Np", // GalacticraftAmunRa_Neper
+            "Se", // GalacticraftAmunRa_Seth
+            // T10
+            "DD", // Underdark
     };
 
     private static final HashMap<String, List<String>> tooltipBuffer = new HashMap<>();
@@ -108,7 +122,8 @@ public class DimensionHelper {
                         case "Proteus", "Triton" -> "T6: " + s;
                         case "Haumea", "Kuiperbelt", "MakeMake", "Pluto" -> "T7: " + s;
                         case "BarnardC", "BarnardE", "BarnardF", "CentauriA", "TcetiE", "VegaB" -> "T8: " + s;
-                        case "Underdark" -> "T9: " + s;
+                        case "Anubis", "Horus", "Maahes", "Mehen Belt", "Neper", "Seth" -> "T9: " + s;
+                        case "Underdark" -> "T10: " + s;
                         default -> s;
                     };
 
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java b/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java
index d17e020db7..401cadc09f 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java
@@ -99,6 +99,24 @@ public class Oremix {
     @CsvCustomBindByName(column = "T Ceti E", converter = XtoBool.class)
     public boolean tcetie;
 
+    @CsvCustomBindByName(column = "Anubis", required = false, converter = XtoBool.class)
+    public boolean an;
+
+    @CsvCustomBindByName(column = "Horus", required = false, converter = XtoBool.class)
+    public boolean ho;
+
+    @CsvCustomBindByName(column = "Neper", required = false, converter = XtoBool.class)
+    public boolean np;
+
+    @CsvCustomBindByName(column = "Maahes", required = false, converter = XtoBool.class)
+    public boolean mh;
+
+    @CsvCustomBindByName(column = "Mehen Belt", required = false, converter = XtoBool.class)
+    public boolean mb;
+
+    @CsvCustomBindByName(column = "Seth", required = false, converter = XtoBool.class)
+    public boolean se;
+
     @CsvCustomBindByName(column = "Ore Name", required = true, converter = Veinrenamer.class)
     private String oreName;
 
@@ -393,6 +411,54 @@ public class Oremix {
         this.tcetie = tcetie;
     }
 
+    public boolean isAn() {
+        return an;
+    }
+
+    public void setAn(boolean an) {
+        this.an = an;
+    }
+
+    public boolean isHo() {
+        return ho;
+    }
+
+    public void setHo(boolean ho) {
+        this.ho = ho;
+    }
+
+    public boolean isNp() {
+        return np;
+    }
+
+    public void setNp(boolean np) {
+        this.np = np;
+    }
+
+    public boolean isMh() {
+        return mh;
+    }
+
+    public void setMh(boolean mh) {
+        this.mh = mh;
+    }
+
+    public boolean isMb() {
+        return mb;
+    }
+
+    public void setMb(boolean mb) {
+        this.mb = mb;
+    }
+
+    public boolean isSe() {
+        return se;
+    }
+
+    public void setSe(boolean se) {
+        this.se = se;
+    }
+
     public String getOreName() {
         return this.oreName;
     }