Deprecate the xml stuff

Sollace · Feb 27, 2019 · a8aade5 · a8aade5
1 parent 60a083e
commit a8aade5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/src/main/java/eu/ha3/matmos/core/event/Event.java b/src/main/java/eu/ha3/matmos/core/event/Event.java
@@ -59,13 +59,14 @@ public void playSound(float volMod, float pitchMod) {
 
         float volume = volMax - volMin;
         float pitch = pitchMax - pitchMin;
+
         volume = volMin + (volume > 0 ? random.nextFloat() * volume : 0);
         pitch = pitchMin + (pitch > 0 ? random.nextFloat() * pitch : 0);
 
-        String path = paths.get(random.nextInt(paths.size()));
+        volume *= volMod;
+        pitch *= pitchMod;
 
-        volume = volume * volMod;
-        pitch = pitch * pitchMod;
+        String path = paths.get(random.nextInt(paths.size()));
 
         relay.playSound(path, volume, pitch, distance);
     }

diff --git a/src/main/java/eu/ha3/matmos/core/expansion/agents/LegacyXMLLoadingAgent.java b/src/main/java/eu/ha3/matmos/core/expansion/agents/LegacyXMLLoadingAgent.java
@@ -18,6 +18,7 @@
 import eu.ha3.matmos.serialisation.LegacyXMLExpansions_Engine1;
 import eu.ha3.matmos.serialisation.expansion.SerialRoot;
 
+@Deprecated
 public class LegacyXMLLoadingAgent implements LoadingAgent {
     private static final Gson gson = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
 

diff --git a/src/main/java/eu/ha3/matmos/data/modules/player/ModuleMotion.java b/src/main/java/eu/ha3/matmos/data/modules/player/ModuleMotion.java
@@ -17,12 +17,19 @@ public ModuleMotion(DataPackage data) {
     protected void doProcess() {
         EntityPlayer player = getPlayer();
 
-        int mxx = (int)Math.round(player.motionX * 1000);
-        int mzz = (int)Math.round(player.motionZ * 1000);
-
-        setValue("x_1k", mxx);
+        setValue("x_1k", (int)Math.round(player.motionX * 1000));
         setValue("y_1k", (int)Math.round(player.motionY * 1000));
-        setValue("z_1k", mzz);
-        setValue("sqrt_xx_zz", (int)Math.floor(Math.sqrt(mxx * mxx + mzz * mzz)));
+        setValue("z_1k", (int)Math.round(player.motionZ * 1000));
+        setValue("sqrt_xx_zz", (int)Math.floor(Math.sqrt(
+                  Math.pow(player.motionX, 2)
+                + Math.pow(player.motionZ, 2)
+            ))
+        );
+        setValue("sqrt_xx_yy_zz", (int)Math.floor(Math.sqrt(
+                    Math.pow(player.motionX, 2)
+                  + Math.pow(player.motionY, 2)
+                  + Math.pow(player.motionZ, 2)
+              ))
+        );
     }
 }
diff --git a/src/main/java/eu/ha3/matmos/serialisation/LegacySheetIndex_Engine0to1.java b/src/main/java/eu/ha3/matmos/serialisation/LegacySheetIndex_Engine0to1.java
@@ -8,6 +8,7 @@
 import eu.ha3.matmos.data.modules.ModuleProcessor;
 import eu.ha3.matmos.util.math.Numbers;
 
+@Deprecated
 public class LegacySheetIndex_Engine0to1 implements SheetIndex {
     private static final Map<String, LegacyMapping> forward;
     private static final Map<String, LegacyMapping> blocks;

diff --git a/src/main/java/eu/ha3/matmos/serialisation/LegacyXMLExpansions_Engine1.java b/src/main/java/eu/ha3/matmos/serialisation/LegacyXMLExpansions_Engine1.java
@@ -31,6 +31,7 @@
 import net.minecraft.item.Item;
 import net.sf.practicalxml.DomUtil;
 
+@Deprecated
 public class LegacyXMLExpansions_Engine1 {
     private static final String AS_ITEM = "__AS_ITEM";
     private static final String AS_BLOCK = "__AS_BLOCK";