Advancements framework, better tele handling, player history start

Author: robotgryphon

build.gradle

@@ -52,6 +52,9 @@ minecraft {
             // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
+
             args '--username', 'Dev##'
 
             mods {
@@ -70,6 +73,9 @@ minecraft {
             // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
+
             mods {
                 compactmachines {
                     source sourceSets.main
@@ -86,7 +92,13 @@ minecraft {
             // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
-            args '--mod', 'compactmachines', '--existing', file('src/main/resources'), '--all', '--output', file('src/generated/resources/')
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
+
+            args '--mod', mod_id
+            args '--existing', file('src/main/resources')
+            args '--all'
+            args '--output', file('src/generated/resources/')
 
             mods {
                 compactmachines {

src/generated/resources/.cache/cache

@@ -13,8 +13,10 @@ 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
+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
 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

src/generated/resources/data/compactmachines/advancements/how_did_you_get_here.json

@@ -0,0 +1,29 @@
+{
+  "parent": "compactmachines:root",
+  "display": {
+    "icon": {
+      "item": "compactmachines:personal_shrinking_device"
+    },
+    "title": {
+      "translate": "advancement.compactmachines.how_did_you_get_here"
+    },
+    "description": {
+      "translate": "advancement.compactmachines.how_did_you_get_here.desc"
+    },
+    "frame": "challenge",
+    "show_toast": false,
+    "announce_to_chat": true,
+    "hidden": true
+  },
+  "criteria": {
+    "got_stuck": {
+      "trigger": "compactmachines:how_did_you_get_here",
+      "conditions": {}
+    }
+  },
+  "requirements": [
+    [
+      "got_stuck"
+    ]
+  ]
+}

src/generated/resources/data/compactmachines/advancements/root.json

@@ -0,0 +1,28 @@
+{
+  "display": {
+    "icon": {
+      "item": "compactmachines:machine_normal"
+    },
+    "title": {
+      "translate": "advancement.compactmachines.root"
+    },
+    "description": {
+      "translate": "advancement.compactmachines.root.desc"
+    },
+    "frame": "task",
+    "show_toast": false,
+    "announce_to_chat": false,
+    "hidden": true,
+    "background": "compactmachines:textures/block/wall.png"
+  },
+  "criteria": {
+    "root": {
+      "trigger": "minecraft:impossible"
+    }
+  },
+  "requirements": [
+    [
+      "root"
+    ]
+  ]
+}

src/main/java/com/robotgryphon/compactmachines/advancement/AdvancementTriggers.java

@@ -0,0 +1,11 @@
+package com.robotgryphon.compactmachines.advancement;
+
+import com.robotgryphon.compactmachines.advancement.trigger.HowDidYouGetHereTrigger;
+import net.minecraft.advancements.CriteriaTriggers;
+
+public class AdvancementTriggers {
+
+    public static final HowDidYouGetHereTrigger HOW_DID_YOU_GET_HERE = CriteriaTriggers.register(new HowDidYouGetHereTrigger());
+
+    public static void init() {}
+}

src/main/java/com/robotgryphon/compactmachines/advancement/GenericAdvancementTriggerListener.java

@@ -0,0 +1,33 @@
+package com.robotgryphon.compactmachines.advancement;
+
+import java.util.Set;
+import com.google.common.collect.Sets;
+import net.minecraft.advancements.ICriterionInstance;
+import net.minecraft.advancements.ICriterionTrigger;
+import net.minecraft.advancements.PlayerAdvancements;
+
+public class GenericAdvancementTriggerListener<T extends ICriterionInstance> {
+
+    private final PlayerAdvancements advancements;
+    private final Set<ICriterionTrigger.Listener<T>> listeners = Sets.newHashSet();
+
+    public GenericAdvancementTriggerListener(PlayerAdvancements advancements) {
+        this.advancements = advancements;
+    }
+
+    public void add(ICriterionTrigger.Listener<T> listener) {
+        listeners.add(listener);
+    }
+
+    public void remove(ICriterionTrigger.Listener<T> listener) {
+        listeners.remove(listener);
+    }
+
+    public boolean empty() {
+        return listeners.isEmpty();
+    }
+
+    public void trigger() {
+        listeners.forEach(a -> a.run(advancements));
+    }
+}

src/main/java/com/robotgryphon/compactmachines/advancement/GenericAdvancementTriggerListenerList.java

@@ -0,0 +1,39 @@
+package com.robotgryphon.compactmachines.advancement;
+
+import javax.annotation.Nullable;
+import java.util.Map;
+import com.google.common.collect.Maps;
+import com.robotgryphon.compactmachines.advancement.trigger.HowDidYouGetHereTrigger;
+import net.minecraft.advancements.ICriterionInstance;
+import net.minecraft.advancements.ICriterionTrigger;
+import net.minecraft.advancements.PlayerAdvancements;
+import net.minecraft.entity.player.ServerPlayerEntity;
+
+public class GenericAdvancementTriggerListenerList<T extends ICriterionInstance> {
+    private final Map<PlayerAdvancements, GenericAdvancementTriggerListener<T>> listeners = Maps.newHashMap();
+
+
+    public void addPlayerListener(PlayerAdvancements advancements, ICriterionTrigger.Listener<T> listener) {
+        GenericAdvancementTriggerListener<T> listeners = this.listeners.computeIfAbsent(advancements, GenericAdvancementTriggerListener::new);
+        listeners.add(listener);
+    }
+
+    public void removePlayerListener(PlayerAdvancements advancements, ICriterionTrigger.Listener<T> listener) {
+        GenericAdvancementTriggerListener<T> listeners = this.listeners.get(advancements);
+        if (listeners != null) {
+            listeners.remove(listener);
+            if (listeners.empty()) {
+                this.listeners.remove(advancements);
+            }
+        }
+    }
+
+    public void removePlayerListeners(PlayerAdvancements advancements) {
+        this.listeners.remove(advancements);
+    }
+
+    @Nullable
+    public GenericAdvancementTriggerListener<T> getListeners(ServerPlayerEntity player) {
+        return listeners.get(player.getAdvancements());
+    }
+}

src/main/java/com/robotgryphon/compactmachines/advancement/trigger/HowDidYouGetHereTrigger.java

@@ -0,0 +1,60 @@
+package com.robotgryphon.compactmachines.advancement.trigger;
+
+import com.google.gson.JsonObject;
+import com.robotgryphon.compactmachines.advancement.GenericAdvancementTriggerListener;
+import com.robotgryphon.compactmachines.advancement.GenericAdvancementTriggerListenerList;
+import com.robotgryphon.compactmachines.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 HowDidYouGetHereTrigger implements ICriterionTrigger<HowDidYouGetHereTrigger.Instance> {
+
+    private final GenericAdvancementTriggerListenerList<HowDidYouGetHereTrigger.Instance> listeners = new GenericAdvancementTriggerListenerList<>();
+
+    @Override
+    public ResourceLocation getId() {
+        return Advancements.HOW_DID_YOU_GET_HERE;
+    }
+
+    @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(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 {
+
+        public Instance(EntityPredicate.AndPredicate player) {
+            super(Advancements.HOW_DID_YOU_GET_HERE, player);
+        }
+
+        public static Instance create() {
+            return new Instance(EntityPredicate.AndPredicate.ANY);
+        }
+    }
+}

src/main/java/com/robotgryphon/compactmachines/api/core/Advancements.java

@@ -0,0 +1,8 @@
+package com.robotgryphon.compactmachines.api.core;
+
+import net.minecraft.util.ResourceLocation;
+
+public class Advancements {
+    public static final ResourceLocation HOW_DID_YOU_GET_HERE = new ResourceLocation(Constants.MOD_ID, "how_did_you_get_here");
+    public static final ResourceLocation ROOT = new ResourceLocation(Constants.MOD_ID, "root");
+}

src/main/java/com/robotgryphon/compactmachines/api/core/Messages.java

@@ -7,4 +7,5 @@ public abstract class Messages {
     public static final ResourceLocation NO_MACHINE_DATA = new ResourceLocation(Constants.MOD_ID, "no_machine_data");
     public static final ResourceLocation MACHINE_SPAWNPOINT_SET = new ResourceLocation(Constants.MOD_ID, "spawnpoint_set");
     public static final ResourceLocation TELEPORT_OUT_OF_BOUNDS = new ResourceLocation(Constants.MOD_ID, "teleport_oob");
+    public static final ResourceLocation HOW_DID_YOU_GET_HERE = new ResourceLocation(Constants.MOD_ID, "how_did_you_get_here");
 }