More bugfixing

sirjonasxx · Jul 11, 2023 · e135dce · e135dce
1 parent 60930dc
commit e135dce
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 1 deletion.
diff --git a/src/main/java/extension/tools/presetconfig/wired/PresetWiredAddon.java b/src/main/java/extension/tools/presetconfig/wired/PresetWiredAddon.java
@@ -4,6 +4,7 @@
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 import org.json.JSONObject;
+import utils.Utils;
 
 import java.util.List;
 import java.util.Map;
@@ -15,6 +16,8 @@ public class PresetWiredAddon extends PresetWiredBase {
 
     public PresetWiredAddon(HPacket packet) {
         super(packet);
+        pickedFurniSources = Utils.readIntList(packet);
+        pickedUserSources = Utils.readIntList(packet);
     }
 
     public PresetWiredAddon(int wiredId, List<Integer> options, String stringConfig, List<Integer> items, List<Integer> pickedFurniSources, List<Integer> pickedUserSources) {

diff --git a/src/main/java/extension/tools/presetconfig/wired/PresetWiredBase.java b/src/main/java/extension/tools/presetconfig/wired/PresetWiredBase.java
@@ -18,7 +18,7 @@ public abstract class PresetWiredBase implements PresetJsonConfigurable {
     protected String stringConfig;
     protected List<Integer> items;
 
-    protected List<Integer> pickedFurniSources;
+    protected List<Integer> pickedFurniSources; // set in subclass
     protected List<Integer> pickedUserSources;
 
     public PresetWiredBase(HPacket packet) {

diff --git a/src/main/java/extension/tools/presetconfig/wired/PresetWiredCondition.java b/src/main/java/extension/tools/presetconfig/wired/PresetWiredCondition.java
@@ -4,6 +4,7 @@
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 import org.json.JSONObject;
+import utils.Utils;
 
 import java.util.List;
 import java.util.Map;
@@ -15,6 +16,9 @@ public class PresetWiredCondition extends PresetWiredBase {
 
     public PresetWiredCondition(HPacket packet) {
         super(packet);
+        quantifier = packet.readInteger();
+        pickedFurniSources = Utils.readIntList(packet);
+        pickedUserSources = Utils.readIntList(packet);
     }
 
     public PresetWiredCondition(int wiredId, List<Integer> options, String stringConfig, List<Integer> items, int quantifier, List<Integer> pickedFurniSources, List<Integer> pickedUserSources) {

diff --git a/src/main/java/extension/tools/presetconfig/wired/PresetWiredEffect.java b/src/main/java/extension/tools/presetconfig/wired/PresetWiredEffect.java
@@ -4,6 +4,7 @@
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 import org.json.JSONObject;
+import utils.Utils;
 
 import java.util.List;
 import java.util.Map;
@@ -16,6 +17,8 @@ public class PresetWiredEffect extends PresetWiredBase {
     public PresetWiredEffect(HPacket packet) {
         super(packet);
         delay = packet.readInteger();
+        pickedFurniSources = Utils.readIntList(packet);
+        pickedUserSources = Utils.readIntList(packet);
     }
 
     public PresetWiredEffect(int wiredId, List<Integer> options, String stringConfig, List<Integer> items, int delay, List<Integer> pickedFurniSources, List<Integer> pickedUserSources) {

diff --git a/src/main/java/extension/tools/presetconfig/wired/PresetWiredSelector.java b/src/main/java/extension/tools/presetconfig/wired/PresetWiredSelector.java
@@ -4,6 +4,7 @@
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 import org.json.JSONObject;
+import utils.Utils;
 
 import java.util.List;
 import java.util.Map;
@@ -16,6 +17,10 @@ public class PresetWiredSelector extends PresetWiredBase {
 
     public PresetWiredSelector(HPacket packet) {
         super(packet);
+        filter = packet.readBoolean();
+        invert = packet.readBoolean();
+        pickedFurniSources = Utils.readIntList(packet);
+        pickedUserSources = Utils.readIntList(packet);
     }
 
     public PresetWiredSelector(int wiredId, List<Integer> options, String stringConfig, List<Integer> items, boolean filter, boolean invert, List<Integer> pickedFurniSources, List<Integer> pickedUserSources) {

diff --git a/src/main/java/extension/tools/presetconfig/wired/PresetWiredTrigger.java b/src/main/java/extension/tools/presetconfig/wired/PresetWiredTrigger.java
@@ -4,6 +4,7 @@
 import gearth.protocol.HMessage;
 import gearth.protocol.HPacket;
 import org.json.JSONObject;
+import utils.Utils;
 
 import java.util.List;
 import java.util.Map;
@@ -15,6 +16,8 @@ public class PresetWiredTrigger extends PresetWiredBase {
 
     public PresetWiredTrigger(HPacket packet) {
         super(packet);
+        pickedFurniSources = Utils.readIntList(packet);
+        pickedUserSources = Utils.readIntList(packet);
     }
 
     public PresetWiredTrigger(int wiredId, List<Integer> options, String stringConfig, List<Integer> items, List<Integer> pickedFurniSources, List<Integer> pickedUserSources) {