Room preview, worldborder fixes, more admin commands :D

Author: robotgryphon

build.gradle

@@ -184,8 +184,6 @@ minecraft {
             args '--all'
             args '--output', file('src/generated/resources/')
 
-            forceExit false
-
             mods {
                 compactmachines {
                     source sourceSets.tunnels
@@ -271,10 +269,7 @@ dependencies {
 //    runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}")
 
     // Nicephore - Screenshots and Stuff
-    runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3651214"))
-
-    // Shut up Experimental Settings - so we don't have to deal with that CONSTANTLY
-    runtimeOnly(fg.deobf("curse.maven:shutupexperimental-407174:3544525"))
+    runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3741832"))
 
 //    // Testing Mods - Trash Cans, Pipez, Create, Refined Pipes, Pretty Pipes, Refined Storage
 //    runtimeOnly(fg.deobf("curse.maven:SuperMartijn642-454372:3649270"))
@@ -294,9 +289,15 @@ dependencies {
 //    // Immersive Eng - 7.1.0-145 (Dec 31)
 //    runtimeOnly(fg.deobf("curse.maven:immersiveeng-231951:3587149"))
 
+    // FTB Chunks
+    runtimeOnly(fg.deobf("curse.maven:architectury-forge-419699:3781711"))
+    runtimeOnly(fg.deobf("curse.maven:ftb-teams-404468:3725501"))
+    runtimeOnly(fg.deobf("curse.maven:ftblib-404465:3725485"))
+    runtimeOnly(fg.deobf("curse.maven:ftbchunks-314906:3780113"))
+
     // Mekanism + Mek Generators - Tunnel testing
-//    runtimeOnly(fg.deobf("curse.maven:mekanism-268560:3206392"))
-//    runtimeOnly(fg.deobf("curse.maven:mekanismgenerators-268566:3206395"))
+    runtimeOnly(fg.deobf("curse.maven:mekanism-268560:3743835"))
+    runtimeOnly(fg.deobf("curse.maven:mekanismgenerators-268566:3743837"))
 }
 
 processResources {

gradle.properties

@@ -10,7 +10,7 @@ mod_id=compactmachines
 
 # Dependencies and Libs
 jei_mc_version=1.18.2
-jei_version=9.5.2.135
+jei_version=9.7.0.194
 #top_version=1.16-3.1.4-22
 
 # Curseforge

normal_render.png

@@ -15,4 +15,6 @@ public class Advancements {
     public static final ResourceLocation CLAIMED_LARGE_MACHINE = new ResourceLocation(Constants.MOD_ID, "claimed_machine_large");
     public static final ResourceLocation CLAIMED_GIANT_MACHINE = new ResourceLocation(Constants.MOD_ID, "claimed_machine_giant");
     public static final ResourceLocation CLAIMED_MAX_MACHINE = new ResourceLocation(Constants.MOD_ID, "claimed_machine_max");
+
+    public static final ResourceLocation RECURSIVE_ROOMS = new ResourceLocation(Constants.MOD_ID, "recursion");
 }

raw-assets/face-template.png

@@ -29,4 +29,7 @@ public class CMCommands {
     public static final ResourceLocation WRONG_DIMENSION = new ResourceLocation(MOD_ID, "not_in_compact_dimension");
     public static final ResourceLocation NOT_IN_COMPACT_DIMENSION = new ResourceLocation(MOD_ID, "not_in_compact_dim");
     public static final ResourceLocation FAILED_CMD_FILE_ERROR = new ResourceLocation(MOD_ID, "failed_command_file_error");
+
+    public static final ResourceLocation CANNOT_GIVE_MACHINE = new ResourceLocation(MOD_ID, "cannot_give_machine_item");
+    public static final ResourceLocation MACHINE_GIVEN = new ResourceLocation(MOD_ID, "machine_given_successfully");
 }

raw-assets/machine_maximum.png

@@ -7,6 +7,7 @@ public abstract class Tooltips {
     public static final ResourceLocation UNKNOWN_PLAYER_NAME = new ResourceLocation(Constants.MOD_ID, "unknown_player");
     public static final ResourceLocation TUNNEL_TYPE = new ResourceLocation(Constants.MOD_ID, "tunnel_type");
     public static final ResourceLocation UNKNOWN_TUNNEL_TYPE = new ResourceLocation(Constants.MOD_ID, "unknown_tunnel_type");
+    public static final ResourceLocation ROOM_NAME = new ResourceLocation(Constants.MOD_ID, "room_name");
 
     public static abstract class Machines {
         public static final ResourceLocation ID = new ResourceLocation(Constants.MOD_ID, "machine.id");

raw-assets/machine_normal.png

@@ -4,7 +4,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import dev.compactmods.machines.CompactMachines;
-import dev.compactmods.machines.advancement.trigger.ClaimedMachineTrigger;
+import dev.compactmods.machines.advancement.trigger.BasicPlayerAdvTrigger;
 import dev.compactmods.machines.advancement.trigger.HowDidYouGetHereTrigger;
 import dev.compactmods.machines.api.core.Advancements;
 import dev.compactmods.machines.core.Registration;
@@ -87,6 +87,17 @@ private void generateAdvancements(Consumer<Advancement> consumer) {
                         .build())
                 .save(consumer, Advancements.HOW_DID_YOU_GET_HERE.toString());
 
+        Advancement.Builder.advancement()
+                .parent(root)
+                .addCriterion("recursion", BasicPlayerAdvTrigger.Instance.create(Advancements.RECURSIVE_ROOMS))
+                .display(new DisplayBuilder()
+                        .frame(FrameType.CHALLENGE)
+                        .item(new ItemStack(Registration.PERSONAL_SHRINKING_DEVICE.get()))
+                        .id(Advancements.RECURSIVE_ROOMS)
+                        .toast(false).hidden(true)
+                        .build())
+                .save(consumer, Advancements.RECURSIVE_ROOMS.toString());
+
         Advancement.Builder.advancement()
                 .parent(root)
                 .addCriterion("obtained_wall", InventoryChangeTrigger.TriggerInstance.hasItems(Registration.BLOCK_BREAKABLE_WALL.get()))
@@ -118,7 +129,7 @@ private void generateAdvancements(Consumer<Advancement> consumer) {
     private void machineAdvancement(Consumer<Advancement> consumer, Advancement root, ResourceLocation advancement, Supplier<Item> item) {
         Advancement.Builder.advancement()
                 .parent(root)
-                .addCriterion("claimed_machine", ClaimedMachineTrigger.Instance.create(advancement))
+                .addCriterion("claimed_machine", BasicPlayerAdvTrigger.Instance.create(advancement))
                 .display(new DisplayBuilder()
                         .frame(FrameType.TASK)
                         .item(new ItemStack(item.get()))