From 624a333b5595231caf4cb50b8fd75aac8469f525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=86=AC=E7=85=9C?= <10185101162@stu.ecnu.edu.cn> Date: Tue, 17 Jun 2025 12:10:32 +0800 Subject: [PATCH 1/5] Update DecalBlock.java Fix: Decal never rotate or mirror when generating custom structures --- .../java/com/github/talrey/createdeco/blocks/DecalBlock.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/github/talrey/createdeco/blocks/DecalBlock.java b/src/main/java/com/github/talrey/createdeco/blocks/DecalBlock.java index ab63de6b8..e05ac54bf 100644 --- a/src/main/java/com/github/talrey/createdeco/blocks/DecalBlock.java +++ b/src/main/java/com/github/talrey/createdeco/blocks/DecalBlock.java @@ -7,6 +7,7 @@ import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.SimpleWaterloggedBlock; import net.minecraft.world.level.block.SupportType; import net.minecraft.world.level.block.state.BlockState; @@ -21,7 +22,7 @@ import javax.annotation.Nullable; -public class DecalBlock extends Block implements SimpleWaterloggedBlock { +public class DecalBlock extends HorizontalDirectionalBlock implements SimpleWaterloggedBlock { private static final VoxelShape NORTH = Block.box( 1d, 1d, 0d, 15d, 15d, 1d From 2219a890a67d41f4a1733da507f1dab628258a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=86=AC=E7=85=9C?= <10185101162@stu.ecnu.edu.cn> Date: Tue, 17 Jun 2025 12:11:36 +0800 Subject: [PATCH 2/5] Update CatwalkStairBlock.java --- .../com/github/talrey/createdeco/blocks/CatwalkStairBlock.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/github/talrey/createdeco/blocks/CatwalkStairBlock.java b/src/main/java/com/github/talrey/createdeco/blocks/CatwalkStairBlock.java index 3535568d1..fed5ab754 100644 --- a/src/main/java/com/github/talrey/createdeco/blocks/CatwalkStairBlock.java +++ b/src/main/java/com/github/talrey/createdeco/blocks/CatwalkStairBlock.java @@ -16,6 +16,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.SimpleWaterloggedBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -32,7 +33,7 @@ import javax.annotation.Nullable; import java.util.function.Predicate; -public class CatwalkStairBlock extends Block implements IWrenchable, SimpleWaterloggedBlock { +public class CatwalkStairBlock extends HorizontalDirectionalBlock implements IWrenchable, SimpleWaterloggedBlock { private static final VoxelShape BOX_NORTH = Shapes.join( Block.box(0d, 14d, 8d, 16d, 16d, 16d), From ed335c87c0535ea84dab7a54aa8b0b9b43371f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=86=AC=E7=85=9C?= <10185101162@stu.ecnu.edu.cn> Date: Tue, 17 Jun 2025 12:14:19 +0800 Subject: [PATCH 3/5] Create build.yml --- .github/workflows/build.yml | 57 +++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..e3dc46407 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,57 @@ +# This workflow will build a Java project with Gradle +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle + +name: Build Release + +on : [push, pull_request] + +env: + ## set env + git_sha: ${{github.sha}} + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Cache + uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + src/generated + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle + - uses: actions/checkout@v4 + - uses: BrycensRanch/read-properties-action@v1 + id: version + with: + file: gradle.properties + property: mod_version + default: 1.0.0 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'adopt' + - name: Set version env + run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Datagen with gradle + run: ./gradlew runData + - name: Build with Gradle + run: ./gradlew build + - name: Upload binaries to release + uses: actions/upload-artifact@v4 + with: + name: createdeco-${{steps.version.outputs.value}}-${{github.sha}}.jar + path: build/libs/createdeco-${{steps.version.outputs.value}}.jar + repo-token: ${{ secrets.ACTION_TOKEN }} + - name: Upload sources to release + uses: actions/upload-artifact@v4 + with: + name: createdeco-${{steps.version.outputs.value}}-${{github.sha}}-sources.jar + path: build/libs/createdeco-${{steps.version.outputs.value}}-sources.jar + repo-token: ${{ secrets.ACTION_TOKEN }} From 1479eeacd2e616e997fbbbe65f59e7b8f90f5ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=86=AC=E7=85=9C?= <10185101162@stu.ecnu.edu.cn> Date: Tue, 17 Jun 2025 12:19:52 +0800 Subject: [PATCH 4/5] Update SupportBlock.java --- .../github/talrey/createdeco/blocks/SupportBlock.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/github/talrey/createdeco/blocks/SupportBlock.java b/src/main/java/com/github/talrey/createdeco/blocks/SupportBlock.java index 20e1c2e6c..d4e87d279 100644 --- a/src/main/java/com/github/talrey/createdeco/blocks/SupportBlock.java +++ b/src/main/java/com/github/talrey/createdeco/blocks/SupportBlock.java @@ -123,6 +123,16 @@ public VoxelShape getShape (BlockState state, BlockGetter reader, BlockPos pos, }; } + @Override + public BlockState rotate(BlockState state, Rotation rotation) { + return state.setValue(FACING, rotation.rotate(state.getValue(FACING))); + } + + @Override + public BlockState mirror(BlockState state, Mirror mirror) { + return state.setValue(FACING, mirror.mirror(state.getValue(FACING))); + } + public static boolean isSupportBlock (ItemStack test) { return (test.getItem() instanceof BlockItem) && isSupportBlock(((BlockItem)test.getItem()).getBlock()); From beb30fb1899eb10f493338c9db4905a6f4429c43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=86=AC=E7=85=9C?= <10185101162@stu.ecnu.edu.cn> Date: Tue, 17 Jun 2025 12:26:42 +0800 Subject: [PATCH 5/5] Update SupportBlock.java --- .../java/com/github/talrey/createdeco/blocks/SupportBlock.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/github/talrey/createdeco/blocks/SupportBlock.java b/src/main/java/com/github/talrey/createdeco/blocks/SupportBlock.java index d4e87d279..a3d367b1d 100644 --- a/src/main/java/com/github/talrey/createdeco/blocks/SupportBlock.java +++ b/src/main/java/com/github/talrey/createdeco/blocks/SupportBlock.java @@ -17,6 +17,8 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.DirectionalBlock; +import net.minecraft.world.level.block.Mirror; +import net.minecraft.world.level.block.Rotation; import net.minecraft.world.level.block.SimpleWaterloggedBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition;