New PSD and machine claiming advancements

robotgryphon · robotgryphon · commit b31aeb6c2e01 · 2021-08-14T01:33:00.000-04:00
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
@@ -13,10 +13,18 @@ bb446af024870e7a07d31a3c78cab75797392cd5 assets/compactmachines/models/tunnels/n
 2781d8f8d22db668495872f1bb39e2dd1290ab66 assets/compactmachines/models/tunnels/south.json
 955410e7497ca2252d75eac53d02fb96992d94c7 assets/compactmachines/models/tunnels/up.json
 f8748baf2b48a44db2cf8d3872bd09b54a822560 assets/compactmachines/models/tunnels/west.json
+7611e10d6cb874469fee3209687504a964c1b7a5 data/compactmachines/advancements/claimed_machine_giant.json
+c221bb570100c820a1fe904064492fcdaf245120 data/compactmachines/advancements/claimed_machine_large.json
+82bae3a5d1558f86d39b69a31ef015ca25c64dc3 data/compactmachines/advancements/claimed_machine_max.json
+fe844f6dfc795652f9b3c659b72a1edbf1a84438 data/compactmachines/advancements/claimed_machine_normal.json
+f4bbe5fccc3b629f578958c90b84cce5776618d0 data/compactmachines/advancements/claimed_machine_small.json
+5e06a5ab20a4d26b4301e24457546b618b7cee7c data/compactmachines/advancements/claimed_machine_tiny.json
+29a4ead6392a01e2572b8047d84752ea461540e8 data/compactmachines/advancements/foundations.json
+e08cdedde718a20284432a33903792518801d66c data/compactmachines/advancements/got_shrinking_device.json
 26f679025def0ce9b0a9ec9d0e5f6ee83ea50bc3 data/compactmachines/advancements/how_did_you_get_here.json
 e012e4b65799a56d195a6324c82e2cdf7a5a91be data/compactmachines/advancements/recipes/compactmachines/personal_shrinking_device.json
 fd7ccf69e4445ba0a2d7b2cd405ebe2ae85be240 data/compactmachines/advancements/recipes/compactmachines/wall.json
-8533fe67af279b20dda70b20dbcb03a20b6c4f23 data/compactmachines/advancements/root.json
+2e9d5509d633970b1dd01bd99b535fd107e6e91a data/compactmachines/advancements/root.json
 fb5c7560898ae604661d0655c2a39e923eb1d4b4 data/compactmachines/loot_tables/blocks/machine_giant.json
 056d363f46ab1cc37c16f08428a3d2a9e0dd66d2 data/compactmachines/loot_tables/blocks/machine_large.json
 38a7648eb331daf18f5076126f31f31b6021ac51 data/compactmachines/loot_tables/blocks/machine_maximum.json
diff --git a/src/generated/resources/data/compactmachines/advancements/claimed_machine_giant.json b/src/generated/resources/data/compactmachines/advancements/claimed_machine_giant.json
@@ -0,0 +1,29 @@
+{
+  "parent": "compactmachines:got_shrinking_device",
+  "display": {
+    "icon": {
+      "item": "compactmachines:machine_giant"
+    },
+    "title": {
+      "translate": "advancement.compactmachines.claimed_machine_giant"
+    },
+    "description": {
+      "translate": "advancement.compactmachines.claimed_machine_giant.desc"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "criteria": {
+    "claimed_machine": {
+      "trigger": "compactmachines:claimed_machine_giant",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "claimed_machine"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/compactmachines/advancements/claimed_machine_large.json b/src/generated/resources/data/compactmachines/advancements/claimed_machine_large.json
@@ -0,0 +1,29 @@
+{
+  "parent": "compactmachines:got_shrinking_device",
+  "display": {
+    "icon": {
+      "item": "compactmachines:machine_large"
+    },
+    "title": {
+      "translate": "advancement.compactmachines.claimed_machine_large"
+    },
+    "description": {
+      "translate": "advancement.compactmachines.claimed_machine_large.desc"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "criteria": {
+    "claimed_machine": {
+      "trigger": "compactmachines:claimed_machine_large",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "claimed_machine"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/compactmachines/advancements/claimed_machine_max.json b/src/generated/resources/data/compactmachines/advancements/claimed_machine_max.json
@@ -0,0 +1,29 @@
+{
+  "parent": "compactmachines:got_shrinking_device",
+  "display": {
+    "icon": {
+      "item": "compactmachines:machine_maximum"
+    },
+    "title": {
+      "translate": "advancement.compactmachines.claimed_machine_max"
+    },
+    "description": {
+      "translate": "advancement.compactmachines.claimed_machine_max.desc"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "criteria": {
+    "claimed_machine": {
+      "trigger": "compactmachines:claimed_machine_max",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "claimed_machine"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/compactmachines/advancements/claimed_machine_normal.json b/src/generated/resources/data/compactmachines/advancements/claimed_machine_normal.json
@@ -0,0 +1,29 @@
+{
+  "parent": "compactmachines:got_shrinking_device",
+  "display": {
+    "icon": {
+      "item": "compactmachines:machine_normal"
+    },
+    "title": {
+      "translate": "advancement.compactmachines.claimed_machine_normal"
+    },
+    "description": {
+      "translate": "advancement.compactmachines.claimed_machine_normal.desc"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "criteria": {
+    "claimed_machine": {
+      "trigger": "compactmachines:claimed_machine_normal",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "claimed_machine"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/compactmachines/advancements/claimed_machine_small.json b/src/generated/resources/data/compactmachines/advancements/claimed_machine_small.json
@@ -0,0 +1,29 @@
+{
+  "parent": "compactmachines:got_shrinking_device",
+  "display": {
+    "icon": {
+      "item": "compactmachines:machine_small"
+    },
+    "title": {
+      "translate": "advancement.compactmachines.claimed_machine_small"
+    },
+    "description": {
+      "translate": "advancement.compactmachines.claimed_machine_small.desc"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "criteria": {
+    "claimed_machine": {
+      "trigger": "compactmachines:claimed_machine_small",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "claimed_machine"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/compactmachines/advancements/claimed_machine_tiny.json b/src/generated/resources/data/compactmachines/advancements/claimed_machine_tiny.json
@@ -0,0 +1,29 @@
+{
+  "parent": "compactmachines:got_shrinking_device",
+  "display": {
+    "icon": {
+      "item": "compactmachines:machine_tiny"
+    },
+    "title": {
+      "translate": "advancement.compactmachines.claimed_machine_tiny"
+    },
+    "description": {
+      "translate": "advancement.compactmachines.claimed_machine_tiny.desc"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "criteria": {
+    "claimed_machine": {
+      "trigger": "compactmachines:claimed_machine_tiny",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "claimed_machine"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/compactmachines/advancements/foundations.json b/src/generated/resources/data/compactmachines/advancements/foundations.json
@@ -0,0 +1,35 @@
+{
+  "parent": "compactmachines:root",
+  "display": {
+    "icon": {
+      "item": "compactmachines:wall"
+    },
+    "title": {
+      "translate": "advancement.compactmachines.foundations"
+    },
+    "description": {
+      "translate": "advancement.compactmachines.foundations.desc"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "criteria": {
+    "obtained_wall": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "compactmachines:wall"
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "obtained_wall"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/compactmachines/advancements/got_shrinking_device.json b/src/generated/resources/data/compactmachines/advancements/got_shrinking_device.json
@@ -0,0 +1,35 @@
+{
+  "parent": "compactmachines:root",
+  "display": {
+    "icon": {
+      "item": "compactmachines:personal_shrinking_device"
+    },
+    "title": {
+      "translate": "advancement.compactmachines.got_shrinking_device"
+    },
+    "description": {
+      "translate": "advancement.compactmachines.got_shrinking_device.desc"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "criteria": {
+    "obtained_psd": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "compactmachines:personal_shrinking_device"
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "obtained_psd"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/compactmachines/advancements/root.json b/src/generated/resources/data/compactmachines/advancements/root.json
@@ -12,7 +12,7 @@
     "frame": "task",
     "show_toast": false,
     "announce_to_chat": false,
-    "hidden": true,
+    "hidden": false,
     "background": "compactmachines:textures/block/wall.png"
   },
   "criteria": {
diff --git a/src/main/java/dev/compactmods/machines/advancement/AdvancementTriggers.java b/src/main/java/dev/compactmods/machines/advancement/AdvancementTriggers.java
@@ -1,11 +1,34 @@
 package dev.compactmods.machines.advancement;
 
+import dev.compactmods.machines.advancement.trigger.ClaimedMachineTrigger;
 import dev.compactmods.machines.advancement.trigger.HowDidYouGetHereTrigger;
+import dev.compactmods.machines.api.core.Advancements;
+import dev.compactmods.machines.reference.EnumMachineSize;
 import net.minecraft.advancements.CriteriaTriggers;
 
 public class AdvancementTriggers {
 
     public static final HowDidYouGetHereTrigger HOW_DID_YOU_GET_HERE = CriteriaTriggers.register(new HowDidYouGetHereTrigger());
 
+    public static final ClaimedMachineTrigger CLAIMED_TINY = CriteriaTriggers.register(new ClaimedMachineTrigger(Advancements.CLAIMED_TINY_MACHINE));
+    public static final ClaimedMachineTrigger CLAIMED_SMALL = CriteriaTriggers.register(new ClaimedMachineTrigger(Advancements.CLAIMED_SMALL_MACHINE));
+    public static final ClaimedMachineTrigger CLAIMED_NORMAL = CriteriaTriggers.register(new ClaimedMachineTrigger(Advancements.CLAIMED_NORMAL_MACHINE));
+    public static final ClaimedMachineTrigger CLAIMED_LARGE = CriteriaTriggers.register(new ClaimedMachineTrigger(Advancements.CLAIMED_LARGE_MACHINE));
+    public static final ClaimedMachineTrigger CLAIMED_GIANT = CriteriaTriggers.register(new ClaimedMachineTrigger(Advancements.CLAIMED_GIANT_MACHINE));
+    public static final ClaimedMachineTrigger CLAIMED_MAX = CriteriaTriggers.register(new ClaimedMachineTrigger(Advancements.CLAIMED_MAX_MACHINE));
+
     public static void init() {}
+
+    public static ClaimedMachineTrigger getTriggerForMachineClaim(EnumMachineSize machineSize) {
+        switch (machineSize) {
+            case TINY: return CLAIMED_TINY;
+            case SMALL: return CLAIMED_SMALL;
+            case NORMAL: return CLAIMED_NORMAL;
+            case LARGE: return CLAIMED_LARGE;
+            case GIANT: return CLAIMED_GIANT;
+            case MAXIMUM: return CLAIMED_MAX;
+        }
+
+        return CLAIMED_TINY;
+    }
 }
diff --git a/src/main/java/dev/compactmods/machines/advancement/trigger/ClaimedMachineTrigger.java b/src/main/java/dev/compactmods/machines/advancement/trigger/ClaimedMachineTrigger.java
@@ -0,0 +1,68 @@
+package dev.compactmods.machines.advancement.trigger;
+
+import com.google.gson.JsonObject;
+import dev.compactmods.machines.advancement.GenericAdvancementTriggerListener;
+import dev.compactmods.machines.advancement.GenericAdvancementTriggerListenerList;
+import dev.compactmods.machines.api.core.Advancements;
+import net.minecraft.advancements.ICriterionTrigger;
+import net.minecraft.advancements.PlayerAdvancements;
+import net.minecraft.advancements.criterion.CriterionInstance;
+import net.minecraft.advancements.criterion.EntityPredicate;
+import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.loot.ConditionArrayParser;
+import net.minecraft.util.ResourceLocation;
+
+public class ClaimedMachineTrigger implements ICriterionTrigger<ClaimedMachineTrigger.Instance> {
+
+    private final GenericAdvancementTriggerListenerList<Instance> listeners = new GenericAdvancementTriggerListenerList<>();
+    private final ResourceLocation advancementId;
+
+    public ClaimedMachineTrigger(ResourceLocation advancementId) {
+        this.advancementId = advancementId;
+    }
+
+    @Override
+    public ResourceLocation getId() {
+        return advancementId;
+    }
+
+    @Override
+    public void addPlayerListener(PlayerAdvancements advancements, Listener<Instance> list) {
+        listeners.addPlayerListener(advancements, list);
+    }
+
+    @Override
+    public void removePlayerListener(PlayerAdvancements advancements, Listener<Instance> list) {
+        listeners.removePlayerListener(advancements, list);
+    }
+
+    @Override
+    public void removePlayerListeners(PlayerAdvancements advancements) {
+        listeners.removePlayerListeners(advancements);
+    }
+
+    @Override
+    public Instance createInstance(JsonObject json, ConditionArrayParser conditions) {
+        return new Instance(this.advancementId, EntityPredicate.AndPredicate.fromJson(json, "player", conditions));
+    }
+
+    public void trigger(ServerPlayerEntity player) {
+        final GenericAdvancementTriggerListener<Instance> listeners = this.listeners.getListeners(player);
+        if(listeners != null)
+            listeners.trigger();
+    }
+
+    public static class Instance extends CriterionInstance {
+
+        private final ResourceLocation advId;
+
+        public Instance(ResourceLocation advId, EntityPredicate.AndPredicate player) {
+            super(advId, player);
+            this.advId = advId;
+        }
+
+        public static Instance create(ResourceLocation advancement) {
+            return new Instance(advancement, EntityPredicate.AndPredicate.ANY);
+        }
+    }
+}
diff --git a/src/main/java/dev/compactmods/machines/api/core/Advancements.java b/src/main/java/dev/compactmods/machines/api/core/Advancements.java
diff --git a/src/main/java/dev/compactmods/machines/datagen/AdvancementGenerator.java b/src/main/java/dev/compactmods/machines/datagen/AdvancementGenerator.java
diff --git a/src/main/java/dev/compactmods/machines/util/PlayerUtil.java b/src/main/java/dev/compactmods/machines/util/PlayerUtil.java
diff --git a/src/main/resources/assets/compactmachines/lang/en_us.json b/src/main/resources/assets/compactmachines/lang/en_us.json
