Update ObfTools (1.2.0->1.3.0)

This update was quite painfull, however future updates will be even worse.
I hope we can reduce the amount of volatility of the names by a respectable degree
that errors are reduced - however I worry a bit that the opposite will happen.

Author: Geolykt

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'java-library'
     id 'maven-publish'
-    id 'obftools' version '1.2.0'
+    id 'obftools' version '1.3.0'
 }
 
 group 'de.geolykt'

src/main/java/de/geolykt/starloader/apimixins/ApplicationMixins.java

@@ -13,9 +13,9 @@
 import de.geolykt.starloader.api.gui.modconf.ModConf;
 import de.geolykt.starloader.api.gui.modconf.ModConf.ModConfSpec;
 
-import snoddasmannen.galimulator.cd;
+import snoddasmannen.galimulator.class_k;
 
-@Mixin(cd.class)
+@Mixin(class_k.class)
 public class ApplicationMixins {
 
     /**

src/main/java/de/geolykt/starloader/apimixins/AudioManagerMixins.java

@@ -13,7 +13,7 @@
 import de.geolykt.starloader.impl.SLSoundHandler;
 
 import snoddasmannen.galimulator.AudioManager;
-import snoddasmannen.galimulator.class_u;
+import snoddasmannen.galimulator.class_e;
 
 /**
  * Mixins into the AudioManager class.
@@ -25,7 +25,7 @@ public class AudioManagerMixins {
      * currentTrack.
      */
     @Shadow
-    public static class_u a;
+    public static class_e a;
 
     /**
      * currentTrackId.
@@ -51,7 +51,7 @@ public static void f() {
             if (b >= c.size()) {
                 b = 0;
             }
-            a = (class_u) c.get(b);
+            a = (class_e) c.get(b);
             if (SLSoundHandler.supressEvents) {
                 SLSoundHandler.supressEvents = false;
             } else {

src/main/java/de/geolykt/starloader/apimixins/EmpireMixins.java

@@ -61,7 +61,7 @@
 import snoddasmannen.galimulator.Government;
 import snoddasmannen.galimulator.Religion;
 import snoddasmannen.galimulator.Space;
-import snoddasmannen.galimulator.gf;
+import snoddasmannen.galimulator.class_am;
 import snoddasmannen.galimulator.actors.Flagship;
 import snoddasmannen.galimulator.actors.StateActor;
 
@@ -375,7 +375,7 @@ public boolean decreaseTechnologyLevel(boolean notify, boolean force) {
         if (config.allowTranscendence() && techLevel == config.getTranscendceLevel()) {
             if (setState(RegistryKeys.GALIMULATOR_TRANSCENDING, false)) {
                 if (notify && Galimulator.getPlayerEmpire() == this) {
-                    new BasicDialogBuilder("Transcending!", NullUtils.requireNotNull(gf.a().a("transcending"))).buildAndShow();
+                    new BasicDialogBuilder("Transcending!", NullUtils.requireNotNull(class_am.a().a("transcending"))).buildAndShow();
                 }
             }
         }
@@ -585,7 +585,7 @@ public boolean increaseTechnologyLevel(boolean notify, boolean force) {
         if (config.allowTranscendence() && techLevel == config.getTranscendceLevel()) {
             if (setState(RegistryKeys.GALIMULATOR_TRANSCENDING, false)) {
                 if (notify && Galimulator.getPlayerEmpire() == this) {
-                    new BasicDialogBuilder("Transcending!", NullUtils.requireNotNull(gf.a().a("transcending"))).buildAndShow();
+                    new BasicDialogBuilder("Transcending!", NullUtils.requireNotNull(class_am.a().a("transcending"))).buildAndShow();
                 }
             }
         }

src/main/java/de/geolykt/starloader/apimixins/EmpireSpecialMixins.java

@@ -20,7 +20,7 @@
 import snoddasmannen.galimulator.EmpireSpecial;
 import snoddasmannen.galimulator.GalColor;
 import snoddasmannen.galimulator.GalFX;
-import snoddasmannen.galimulator.ui.fm;
+import snoddasmannen.galimulator.ui.class_an;
 
 /**
  * Mixins into the empire special class, which makes it more registry-like.
@@ -37,14 +37,13 @@ public static EmpireSpecial f() {
     @Overwrite
     private static void k() {
         // I do not even know if this is called, but better be safe than sorry
-        HashMap<EmpireSpecial, fm> maps = new HashMap<>();
+        HashMap<EmpireSpecial, class_an> maps = new HashMap<>();
         EmpireSpecial[] var0 = Registry.EMPIRE_SPECIALS.getValues();
         int var1 = var0.length;
 
         for (int var2 = 0; var2 < var1; ++var2) {
             EmpireSpecial var3 = var0[var2];
-            maps.put(var3,
-                    new fm("specialsbox.png", 30, GalFX.Q(), var3.h(), GalFX.FONT_TYPE.MONOTYPE_SMALL, GalColor.WHITE, var3.j(), 0));
+            maps.put(var3, new class_an("specialsbox.png", 30, GalFX.Q(), var3.getAbbreviation(), GalFX.FONT_TYPE.MONOTYPE_SMALL, GalColor.WHITE, var3.j(), 0));
         }
         EmpireSpecial.q = maps;
     }

src/main/java/de/geolykt/starloader/apimixins/EmploymentAgencyMixins.java

@@ -31,8 +31,8 @@
 import snoddasmannen.galimulator.Job.JobType;
 import snoddasmannen.galimulator.Person;
 import snoddasmannen.galimulator.Space;
-import snoddasmannen.galimulator.be;
-import snoddasmannen.galimulator.bf;
+import snoddasmannen.galimulator.ppclass_av;
+import snoddasmannen.galimulator.ppclass_aw;
 import snoddasmannen.galimulator.ui.FlowLayout.FlowDirection;
 
 @Mixin(EmploymentAgency.class)
@@ -55,7 +55,7 @@ public class EmploymentAgencyMixins {
     @Overwrite
     private Person a(final Job job, final int n) {
         List<Person> potentialCandidates;
-        if (job.f() == JobType.EMPEROR && (job.g() == Galimulator.getNeutralEmpire() || job.l() != null)) {
+        if (job.getType() == JobType.EMPEROR && (job.getEmployer() == Galimulator.getNeutralEmpire() || job.get_b() != null)) {
             potentialCandidates = job.n();
             if (potentialCandidates.isEmpty()) {
                 potentialCandidates = this.b(n);
@@ -67,8 +67,8 @@ private Person a(final Job job, final int n) {
             return null;
         }
         Person.f = 0;
-        if (job.f() == JobType.EMPEROR) {
-            if (Galimulator.getPlayerEmpire() == job.g().getJobEmpire()) {
+        if (job.getType() == JobType.EMPEROR) {
+            if (Galimulator.getPlayerEmpire() == job.getEmployer().getJobEmpire()) {
                 // Player empire
                 potentialCandidates.removeIf(person -> person.a(job) <= 0 || Claim.b(person, job) == null);
                 if (!potentialCandidates.isEmpty()) {
@@ -122,7 +122,7 @@ private Person a(final Job job, final int n) {
                     }
                     candidates.add((DynastyMember) o);
                 }
-                EmperorDeathEvent evt = new EmperorDeathEvent(candidates, NullUtils.requireNotNull((ActiveEmpire) job.g()));
+                EmperorDeathEvent evt = new EmperorDeathEvent(candidates, NullUtils.requireNotNull((ActiveEmpire) job.getEmployer()));
                 EventManager.handleEvent(evt);
                 List<@NotNull DynastyMember> finalSuggestions = evt.getSuccessors();
                 if (finalSuggestions.size() == 1) {
@@ -134,11 +134,11 @@ private Person a(final Job job, final int n) {
                 }
             }
         }
-        final ArrayList<Callable<bf>> callbacks = new ArrayList<>();
+        final ArrayList<Callable<ppclass_aw>> callbacks = new ArrayList<>();
         final int n2 = potentialCandidates.size() / 100 + 1;
         for (int i = 0; i < n2; ++i) {
             @SuppressWarnings("unchecked")
-            Callable<bf> callable = new be((EmploymentAgency) (Object) this, i * 100, potentialCandidates, job);
+            Callable<ppclass_aw> callable = new ppclass_av((EmploymentAgency) (Object) this, i * 100, potentialCandidates, job);
             callbacks.add(callable);
         }
         Person successor = null;
@@ -147,8 +147,8 @@ private Person a(final Job job, final int n) {
             if (this.b == null) {
                 this.b = Executors.newFixedThreadPool(4);
             }
-            for (Future<bf> finishedTask : b.invokeAll(callbacks)) {
-                final bf finishedTaskReturn = finishedTask.get();
+            for (Future<ppclass_aw> finishedTask : b.invokeAll(callbacks)) {
+                final ppclass_aw finishedTaskReturn = finishedTask.get();
                 if (successor == null || finishedTaskReturn.b > successorMerit) {
                     successor = finishedTaskReturn.a;
                     successorMerit = finishedTaskReturn.b;

src/main/java/de/geolykt/starloader/apimixins/FactionMixins.java

@@ -71,7 +71,7 @@ public int getStarCount() {
     }
 
     public int getHost() {
-        return host.d();
+        return host.get_id();
     }
 
     public ActiveEmpire getHostEmpire() {

src/main/java/de/geolykt/starloader/apimixins/MapDataMixins.java

@@ -18,7 +18,7 @@
 import de.geolykt.starloader.api.resource.DataFolderProvider;
 
 import snoddasmannen.galimulator.MapData;
-import snoddasmannen.galimulator.gd;
+import snoddasmannen.galimulator.interface_k;
 
 @Mixin(MapData.class)
 public class MapDataMixins implements Map {
@@ -29,7 +29,7 @@ public class MapDataMixins implements Map {
     private String backgroundImage;
 
     @Shadow
-    private gd generator;
+    private interface_k generator;
 
     @Override
     public @Nullable BufferedImage getAWTBackground() {

src/main/java/de/geolykt/starloader/apimixins/PersonMixins.java

@@ -74,10 +74,10 @@ public int getDeathYear() {
     @Override
     public @Nullable ActiveEmpire getEmpire() {
         if (alive) {
-            if (job.g() == null) {
-                return null; // ???
+            if (job.getEmployer() == null) {
+                return null; // this does not make much sense ... why would a job have no employer? But I am sure I coded that check for a reason.
             }
-            return (@Nullable ActiveEmpire) job.g().getJobEmpire();
+            return (@Nullable ActiveEmpire) job.getEmployer().getJobEmpire();
         } else {
             return null;
         }

src/main/java/de/geolykt/starloader/apimixins/SettingsscreenMixins.java

@@ -10,9 +10,9 @@
 import de.geolykt.starloader.impl.gui.ModConfButtonWidget;
 
 import snoddasmannen.galimulator.GalColor;
-import snoddasmannen.galimulator.hi;
+import snoddasmannen.galimulator.class_at;
 
-@Mixin(hi.class)
+@Mixin(class_at.class)
 public class SettingsscreenMixins {
 
     @Inject(method = "getItems", at = @At("TAIL"))