Merge branch 'refs/heads/multiloader' into 1.19.2/multiloader

# Conflicts: # common/src/main/java/com/copycatsplus/copycats/CCDataFixers.java # common/src/main/java/com/copycatsplus/copycats/content/copycat/base/multistate/MaterialItemStorage.java # common/src/main/java/com/copycatsplus/copycats/content/copycat/bytes/CopycatByteBlock.java # common/src/main/java/com/copycatsplus/copycats/datagen/recipes/CCStandardRecipes.java # fabric/src/generated/resources/data/copycats/advancements/recipes/copycats.main/stonecutting/copycat_shaft.json # fabric/src/generated/resources/data/copycats/advancements/recipes/copycats.main/stonecutting/copycat_slope.json # fabric/src/generated/resources/data/copycats/advancements/recipes/copycats.main/stonecutting/copycat_slope_layer.json # fabric/src/generated/resources/data/copycats/advancements/recipes/copycats.main/stonecutting/copycat_vertical_slope.json # fabric/src/main/java/com/copycatsplus/copycats/content/copycat/base/model/assembly/fabric/AssemblerImpl.java # fabric/src/main/java/com/copycatsplus/copycats/content/copycat/base/model/multistate/fabric/MultiStateCopycatModel.java # fabric/src/main/resources/copycats-fabric.mixins.json # forge/src/generated/resources/data/copycats/advancements/recipes/copycats.main/stonecutting/copycat_shaft.json # forge/src/generated/resources/data/copycats/advancements/recipes/copycats.main/stonecutting/copycat_slope.json # forge/src/generated/resources/data/copycats/advancements/recipes/copycats.main/stonecutting/copycat_slope_layer.json # forge/src/generated/resources/data/copycats/advancements/recipes/copycats.main/stonecutting/copycat_vertical_slope.json # forge/src/main/resources/copycats-forge.mixins.json # gradle.properties
copycats-plus · Jun 27, 2024 · ca484b4 · ca484b4
2 parents 1524259 + 4b8705a
commit ca484b4
Show file tree

Hide file tree

Showing 202 changed files with 7,219 additions and 1,425 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,104 @@
+name: Nightly Build
+
+on:
+    workflow_dispatch:
+    push:
+        branches:
+            - "multiloader"
+            - "*/multiloader"
+
+permissions:
+    contents: read
+    packages: write
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        timeout-minutes: 30
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
+            - name: Get branch name
+              id: get_branch
+              run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
+
+            - name: Get mod version
+              id: get_mod_version
+              run: echo "version=$(git describe --tags --abbrev=0 | grep -oP '(?<=v)\d+\.\d+\.\d+(?:-\w+)?(?=\+)')" >> $GITHUB_OUTPUT
+
+            - name: Get MC version
+              uses: christian-draeger/read-properties@908f99d3334be3802ec7cb528395a69d19914e7b
+              id: read_properties
+              with:
+                  path: gradle.properties
+                  properties: minecraft_version enabled_platforms archives_base_name
+
+            - name: Set up JDK 17
+              uses: actions/setup-java@v4
+              with:
+                  java-version: 17
+                  distribution: temurin
+
+            - name: Validate Gradle wrapper
+              uses: gradle/actions/wrapper-validation@v3
+
+            - name: Grant execute permission for gradlew
+              run: chmod +x gradlew
+
+            - name: Set up Gradle
+              uses: gradle/actions/setup-gradle@v3
+              with:
+                  gradle-home-cache-includes: |
+                      caches
+                      loom-cache
+
+            - name: Build jar
+              run: ./gradlew build
+
+            - name: Publish to GitHub Packages
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              if: env.GITHUB_TOKEN != ''
+              continue-on-error: true
+              run: ./gradlew publishMavenJavaPublicationToGitHubPackagesRepository
+
+            - name: Publish to realRobotix Maven
+              env:
+                  MAVEN_USER: ${{ secrets.MAVEN_USER }}
+                  MAVEN_ACCESS_TOKEN: ${{ secrets.MAVEN_ACCESS_TOKEN }}
+              if: env.MAVEN_USER != '' && env.MAVEN_ACCESS_TOKEN != ''
+              run: ./gradlew publishMavenJavaPublicationToRealRobotixMavenRepository -PrealRobotixMavenUsername=${{ secrets.MAVEN_USER }} -PrealRobotixMavenPassword=${{ secrets.MAVEN_ACCESS_TOKEN }}
+
+            - name: Find jars
+              id: find_jars
+              run: |
+                  EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+                  echo "jars<<$EOF" >> $GITHUB_OUTPUT
+                  find . -regextype posix-extended -regex "\.\/($(tr "," "|" <<< ${{ steps.read_properties.outputs.enabled_platforms }}))\/build\/libs\/${{ steps.read_properties.outputs.archives_base_name }}-${{ steps.get_mod_version.outputs.version }}\+mc\.${{ steps.read_properties.outputs.minecraft_version }}-($(tr "," "|" <<< ${{ steps.read_properties.outputs.enabled_platforms }}))-build\.${{ github.run_number }}\.jar" >> $GITHUB_OUTPUT
+                  echo "$EOF" >> $GITHUB_OUTPUT
+
+            - name: Send building message to discord
+              env:
+                  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+              if: env.DISCORD_WEBHOOK != ''
+              uses: realRobotix/action-discord-notifier@master
+              with:
+                  webhook: ${{ secrets.DISCORD_WEBHOOK }}
+                  message-title: Building mod from branch ${{ steps.get_branch.outputs.branch }}
+
+            - name: Send built file to discord
+              env:
+                  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+              if: env.DISCORD_WEBHOOK != ''
+              run: |
+                  while IFS= read -r f
+                    do curl -F "file=@\"$f\";filename=\"$(echo ${f##*/} | sed 's/+/-/g')\"" $DISCORD_WEBHOOK
+                  done <<< "${{ steps.find_jars.outputs.jars }}"
+
+            - name: Archive Artifacts
+              uses: actions/upload-artifact@v4
+              with:
+                  name: ${{ steps.read_properties.outputs.archives_base_name }}-${{ steps.get_mod_version.outputs.version }}+mc.${{ steps.read_properties.outputs.minecraft_version }}-build.${{ github.run_number }}
+                  path: ${{ steps.find_jars.outputs.jars }}
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -0,0 +1,65 @@
+name: Pull Request
+
+on:
+    pull_request:
+
+permissions:
+    contents: read
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        timeout-minutes: 30
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
+            - name: Get branch name
+              id: get_branch
+              run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
+
+            - name: Get mod version
+              id: get_mod_version
+              run: echo "version=$(git describe --tags --abbrev=0 | grep -oP '(?<=v)\d+\.\d+\.\d+(?:-\w+)?(?=\+)')" >> $GITHUB_OUTPUT
+
+            - name: Get MC version
+              uses: christian-draeger/read-properties@908f99d3334be3802ec7cb528395a69d19914e7b
+              id: read_properties
+              with:
+                  path: gradle.properties
+                  properties: minecraft_version enabled_platforms archives_base_name
+
+            - name: Set up JDK 17
+              uses: actions/setup-java@v4
+              with:
+                  java-version: 17
+                  distribution: temurin
+
+            - name: Validate Gradle wrapper
+              uses: gradle/actions/wrapper-validation@v3
+
+            - name: Grant execute permission for gradlew
+              run: chmod +x gradlew
+
+            - name: Set up Gradle
+              uses: gradle/actions/setup-gradle@v3
+              with:
+                  cache-read-only: true
+
+            - name: Build jar
+              run: ./gradlew build
+
+            - name: Find jars
+              id: find_jars
+              run: |
+                  EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+                  echo "jars<<$EOF" >> $GITHUB_OUTPUT
+                  find . -regextype posix-extended -regex "\.\/($(tr "," "|" <<< ${{ steps.read_properties.outputs.enabled_platforms }}))\/build\/libs\/${{ steps.read_properties.outputs.archives_base_name }}-${{ steps.get_mod_version.outputs.version }}\+mc\.${{ steps.read_properties.outputs.minecraft_version }}-($(tr "," "|" <<< ${{ steps.read_properties.outputs.enabled_platforms }}))-build\.${{ github.run_number }}\.jar" >> $GITHUB_OUTPUT
+                  echo "$EOF" >> $GITHUB_OUTPUT
+
+            - name: Archive Artifacts
+              uses: actions/upload-artifact@v4
+              with:
+                  name: ${{ steps.read_properties.outputs.archives_base_name }}-${{ steps.get_mod_version.outputs.version }}+mc.${{ steps.read_properties.outputs.minecraft_version }}-build.${{ github.run_number }}
+                  path: ${{ steps.find_jars.outputs.jars }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,115 @@
+name: Release
+
+on:
+    push:
+        tags:
+            - 'v**'
+            - '!v*-dev**'
+
+permissions:
+    contents: read
+    packages: write
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        timeout-minutes: 30
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
+            - name: Get branch name
+              id: get_branch
+              run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
+
+            - name: Get mod version
+              id: get_mod_version
+              run: echo "version=$(git describe --tags --abbrev=0 | grep -oP '(?<=v)\d+\.\d+\.\d+(?:-\w+)?(?=\+)')" >> $GITHUB_OUTPUT
+
+            - name: Get MC version
+              uses: christian-draeger/read-properties@908f99d3334be3802ec7cb528395a69d19914e7b
+              id: read_properties
+              with:
+                  path: gradle.properties
+                  properties: minecraft_version enabled_platforms archives_base_name
+
+            - name: Set up JDK 17
+              uses: actions/setup-java@v4
+              with:
+                  java-version: 17
+                  distribution: temurin
+
+            - name: Validate Gradle wrapper
+              uses: gradle/actions/wrapper-validation@v3
+
+            - name: Grant execute permission for gradlew
+              run: chmod +x gradlew
+
+            - name: Set up Gradle
+              uses: gradle/actions/setup-gradle@v3
+              with:
+                  gradle-home-cache-includes: |
+                      caches
+                      loom-cache
+
+            - name: Build jar
+              env:
+                  RELEASE: true
+              run: ./gradlew build
+
+            - name: Publish to GitHub Packages
+              env:
+                  RELEASE: true
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              if: env.GITHUB_TOKEN != ''
+              continue-on-error: true
+              run: ./gradlew publishMavenJavaPublicationToGitHubPackagesRepository
+
+            - name: Publish to realRobotix Maven
+              env:
+                  RELEASE: true
+                  MAVEN_USER: ${{ secrets.MAVEN_USER }}
+                  MAVEN_ACCESS_TOKEN: ${{ secrets.MAVEN_ACCESS_TOKEN }}
+              if: env.MAVEN_USER != '' && env.MAVEN_ACCESS_TOKEN != ''
+              run: ./gradlew publishMavenJavaPublicationToRealRobotixMavenRepository -PrealRobotixMavenUsername=${{ secrets.MAVEN_USER }} -PrealRobotixMavenPassword=${{ secrets.MAVEN_ACCESS_TOKEN }}
+
+            - name: Publish to Modrinth and CurseForge
+              env:
+                RELEASE: true
+                MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+                CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
+              if: env.MODRINTH_TOKEN != '' && env.CURSEFORGE_TOKEN != ''
+              run: ./gradlew publishMods -PMODRINTH_TOKEN=${{ secrets.MODRINTH_TOKEN }} -PCURSEFORGE_TOKEN=${{ secrets.CURSEFORGE_TOKEN }}
+
+            - name: Find jars
+              id: find_jars
+              run: |
+                  EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+                  echo "jars<<$EOF" >> $GITHUB_OUTPUT
+                  find . -regextype posix-extended -regex "\.\/($(tr "," "|" <<< ${{ steps.read_properties.outputs.enabled_platforms }}))\/build\/libs\/${{ steps.read_properties.outputs.archives_base_name }}-${{ steps.get_mod_version.outputs.version }}\+mc\.${{ steps.read_properties.outputs.minecraft_version }}-($(tr "," "|" <<< ${{ steps.read_properties.outputs.enabled_platforms }}))\.jar" >> $GITHUB_OUTPUT
+                  echo "$EOF" >> $GITHUB_OUTPUT
+
+            - name: Send building message to discord
+              env:
+                  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+              if: env.DISCORD_WEBHOOK != ''
+              uses: realRobotix/action-discord-notifier@master
+              with:
+                  webhook: ${{ secrets.DISCORD_WEBHOOK }}
+                  message-title: Building mod from branch ${{ steps.get_branch.outputs.branch }}
+
+            - name: Send built file to discord
+              env:
+                  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+              if: env.DISCORD_WEBHOOK != ''
+              run: |
+                  while IFS= read -r f
+                    do curl -F "file=@\"$f\";filename=\"$(echo ${f##*/} | sed 's/+/-/g')\"" $DISCORD_WEBHOOK
+                  done <<< "${{ steps.find_jars.outputs.jars }}"
+
+            - name: Archive Artifacts
+              uses: actions/upload-artifact@v4
+              with:
+                  name: ${{ steps.read_properties.outputs.archives_base_name }}-${{ steps.get_mod_version.outputs.version }}+mc.${{ steps.read_properties.outputs.minecraft_version }}
+                  path: ${{ steps.find_jars.outputs.jars }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,9 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.3.5 - 2024-06-27
+
+### Fixed
+
+- Fixed overflow issue with explosions on forge
+
+### Added
+
+- Added Vertical Slopes (better hitbox to come)
+- Added Slope Layers (better hitbox to come)
+- Added Copycat Shaft
+
 ## 1.3.4 - 2024-06-19
 
-## Fixed
+### Fixed
 
 - Multistate copycats having much lower friction than normal
 

diff --git a/README.MD b/README.MD
@@ -1,5 +1,3 @@
-<p align="center"><img src="https://raw.githubusercontent.com/copycats-plus/copycats/multiloader/common/src/main/resources/copycats_icon.png" alt="Logo" width="128"></p>
-
 <h1 align="center">Create: Copycats+</h1>
 
 <p align="center">
@@ -12,7 +10,9 @@
 
 All the copycats you've ever wanted, combined into a single mod!
 
-![Discord Banner](https://discordapp.com/api/guilds/1202240504809652365/widget.png?style=banner2)
+[![Discord Banner](https://discordapp.com/api/guilds/1202240504809652365/widget.png?style=banner2)](https://discord.gg/YxPPFHn4SS)
+
+[![BisectHosting](https://copycats-site.vercel.app/api/banner)](https://copycats-site.vercel.app/api/link)
 
 ## Features
 
@@ -22,40 +22,36 @@ All the copycats you've ever wanted, combined into a single mod!
 
 - Copycat Block
 - Copycat Slab
-    - Supports all orientations and double slab variants.
+  - Supports all orientations and double slab variants.
 - Copycat Beam
-    - A centered Copycat Step.
+  - A centered Copycat Step.
 - Copycat Vertical Step
 - Copycat Half Panel
-    - Supports 4 orientations on each block face
+  - Supports 4 orientations on each block face
 - Copycat Stairs
 - Copycat Fence
 - Copycat Fence Gate
 - Copycat Trapdoor
 - Copycat Wall
 - Copycat Board
-    - A 1-pixel thick panel. Multiple boards can be placed in the same block space like glow lichen.
+  - A 1-pixel thick panel. Multiple boards can be placed in the same block space like glow lichen.
 - Copycat Box
-    - A pre-assembled copycat board.
+  - A pre-assembled copycat board.
 - Copycat Catwalk
-    - A pre-assembled copycat board.
+  - A pre-assembled copycat board.
 - Copycat Byte
-    - A mini-block. Bytes can be placed/dismantled individually, 8 of which forms a full block.
+  - A mini-block. Bytes can be placed/dismantled individually, 8 of which forms a full block.
 - Copycat Layer
-    - Can be placed in any orientation and stacks to full block size.
+  - Can be placed in any orientation and stacks to full block size.
 - Copycat Half Layer
-    - Can be stacked to full block size with 2 columns of half layers in one block space.
+  - Can be stacked to full block size with 2 columns of half layers in one block space.
 - Copycat Slice
-    - Can be resized to 8 different sizes.
+  - Can be resized to 8 different sizes.
 - Copycat Vertical Slice
-    - Can be resized to 8 different sizes.
+  - Can be resized to 8 different sizes.
 - Copycat Wooden/Stone Button
 - Copycat Wooden/Stone Pressure Plate
 - Copycat Light/Heavy Weighted Pressure Plate
-- Copycat Ladder
-  - A ladder block that can be made to look like any block and can be placed without needing a supporting block behind it.
-- Copycat Ghost Block
-  - A full sized block with no collision, meaning it can be walked/fallen through.
 
 ## Download