Merge branch '1.16.x' into feat/tunnels-api

Author: robotgryphon

.github/changelog.json

@@ -1,4 +1,33 @@
 {
   "resolve": "commits",
-  "sort": "asc"
+  "sort": "asc",
+  "template": ".github/changelog.tmpl",
+  "groupings": [
+    {
+      "name": "Fixes",
+      "patterns": [
+        "(?i)\\bbug\\b",
+        "(?i)\\bfix\\b"
+      ]
+    },
+    {
+      "name": "Features",
+      "patterns": [
+        "^(?i)feat:\\b",
+        "^(?i)add:\\b"
+      ]
+    },
+    {
+      "name": "Cleanup",
+      "patterns": [
+        "(?i)\\brefactor:\\b"
+      ]
+    },
+    {
+      "name": "Other",
+      "patterns": [
+        ".?"
+      ]
+    }
+  ]
 }

.github/changelog.tmpl

@@ -0,0 +1,11 @@
+## {{.Version}}
+
+{{range .Grouped -}}
+### {{ .Name }}
+
+{{range .Items -}}
+* {{.Title}}{{if .IsPull}} ([contributed]({{.PullURL}}) by [{{.Author}}]({{.AuthorURL}})){{end}} \[[{{.CommitHashShort}}]({{.CommitURL}})\]
+{{end}}
+{{end}}
+
+*For more details, see [{{.PreviousVersion}}..{{.Version}}]({{.CompareURL}})*

.github/workflows/ci-tests.yml

@@ -5,7 +5,7 @@ on: push
 jobs:
   vars:
     name: Get Variables
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     outputs:
       release_type: ${{steps.cf_release_type.outputs.value }}
       mod_version: ${{steps.mod_version.outputs.value }}
@@ -29,23 +29,25 @@ jobs:
 
   jar:
     name: Publish JAR
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: [vars]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 8
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: "8.0.282"
 
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-gradle-
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

.github/workflows/tagged-release.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   vars:
     name: Get Variables
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     outputs:
       release_type: ${{steps.cf_release_type.outputs.value }}
       cf_project: ${{steps.cf_project.outputs.value }}
@@ -49,7 +49,7 @@ jobs:
 
   changelog:
     name: Generate Changelog (tags)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -98,7 +98,7 @@ jobs:
 
   jar:
     name: Publish JAR
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: [vars, changelog]
     steps:
       - name: Download Changelog Results
@@ -113,14 +113,16 @@ jobs:
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: "8.0.282"
 
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-gradle-
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -139,7 +141,7 @@ jobs:
 
   view:
     name: View Changelog Output
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: [changelog]
     steps:
       - name: Download Build Results
@@ -151,7 +153,7 @@ jobs:
 
   release:
     name: Make GitHub Release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: [changelog, vars, jar]
     steps:
       - name: Download Build Results

README.md

@@ -30,72 +30,9 @@ By default, you spawn in the center of the room. You can change this by shift-ri
 
 Make sure not to obstruct the spawn location, there is currently no mechanic to automatically search for a better spawn location. You don't want to have to break the blocks you spawn in.
 
-#### Recovery
-
-If you accidentally deleted your Compact Machines block with all your stuff still inside the Machine it can be recovered using the ```/compactmachines machines view``` command.
-
-It allows browsing through all existing Compact Machines and  provides a button to give yourself a Compact Machine Block linked to the viewed machine. Be aware: this breaks already existing links, i.e. if the machine should already exist somewhere it is being disconnected from the room.
-
-This command only works for server operators.
-
-
-#### Technical aspects
-
-- [Compact Machines 3 Technical Details](https://github.com/CompactMods/CompactMachines/wiki/Technical-Details-(CM3))
-
-## Tunnels
-
-Use these inside your Compact Machine room to create connections to the outside faces of your Compact Machine blocks. You can place them by right-clicking one of the wall blocks inside your Compact Machine with a Tunnel Tool.
-
-By right-clicking them again you can cycle through the outside faces it is connected to - The One Probe helps with that by showing the face as well.
-
-No face can be connected to twice, which means you can place a total of six tunnels anywhere in your Machine.
-
-### Redstone Tunnels
-
-They are a separate system, meaning you can place another 6 of them, but they only transfer redstone signals. They are also not bidirectional, i.e. you have to specify whether it is an input or output tunnel. You can change their mode by hitting the colored indicator square in the top right corner.
-
-#### Compatibility
-
-Tunnels are basically proxy blocks utilizing Forge Capabilities to provide a connection between the two blocks. This means that TileEntities using capabilities to talk to each other will work out of the box, this includes e.g. items, fluids and forge energy.
-
-Other systems, usually multiblock-structures like cables and pipes, most of the time require custom implementations to work properly. 
-
-This is why e.g. EnderIO conduits and Applied Energistics connections do not work. This might change in the future when they either switch to a fully capability-based system or when this mod adds compatibility layers itself. Both are lots of work, so don't expect this to happen.
-
-Since this is asked very frequently:
-- Refined Storage is supported directly since they are using capabilities.
-- There is a AE2 addon mod called
-  [ME Capability Adapter](https://minecraft.curseforge.com/projects/capability-adapter)
-  that adds a capability proxy block.
-
 ## Miniaturization Crafting
-See the [Compact Crafting] mod instead.
-
-#### Setup
-
-You will require 4 Miniaturization Field Projectors placed in a cross shape creating an odd-sized cube structure. Right click a Field Project to let it tell you where you need to place the next projector - missing locations will be highlighted in the world.
-
-You might have to dig out the floor or place the projectors on pedestals.
-
-Once you placed the projectors correctly and no blocks are obstructing the miniaturization
-field, the field should visualize.
-
-Watch this (outdated) youtube video for a basic crafting example:
-
-[![Watch video on youtube](https://img.youtube.com/vi/p-F8ScV3z4U/0.jpg)](https://www.youtube.com/watch?v=p-F8ScV3z4U)
-
-You can disable the field projection by applying a redstone signal to any of the projectors.
-
-
-#### Creating custom recipes
-If you're looking for the Miniaturization Crafting system, take a look at [Compact Crafting] instead.
-
-
-## World Gen
+See the [Compact Crafting] mod instead. The crafting mechanic was split in 1.16 due to the dimension and worldgen changes.
 
-"Broken" Compact Machines sometimes generate in the overworld. Harvest their blocks to use for your own machines.
 
-This can be disabled in the config files.
 
 [Compact Crafting]: https://github.com/robotgryphon/CompactCrafting

gradle.properties

@@ -8,7 +8,7 @@ forge_version=35.1.13
 mappings_version=20201028-1.16.3
 
 mod_id=compactmachines
-mod_version=4.0.0-alpha.6
+mod_version=4.0.0-alpha.7
 
 # Dependencies and Libs
 jei_version=7.6.0.58

src/main/java/com/robotgryphon/compactmachines/block/BlockBaseTunnel.java

@@ -159,16 +159,14 @@ public ItemStack getPickBlock(BlockState state, RayTraceResult target, IBlockRea
         Block given = CompactMachineUtil.getMachineBlockBySize(this.size);
         ItemStack stack = new ItemStack(given, 1);
 
-        CompoundNBT nbt = stack.getOrCreateTag();
+        CompoundNBT nbt = stack.getOrCreateChildTag("cm");
         nbt.putString("size", this.size.getName());
 
         CompactMachineTile tileEntity = (CompactMachineTile) world.getTileEntity(pos);
         if (tileEntity != null) {
             nbt.putInt("coords", tileEntity.machineId);
         }
 
-        stack.setTag(nbt);
-
         return stack;
     }