From 07439cf648a9c72d2f5f771f7c00d91e3fcd5546 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 29 Apr 2020 00:53:57 -0300 Subject: [PATCH 1/3] detail --- docs/scarpet/api/Auxiliary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/scarpet/api/Auxiliary.md b/docs/scarpet/api/Auxiliary.md index 0a752150..241c2716 100644 --- a/docs/scarpet/api/Auxiliary.md +++ b/docs/scarpet/api/Auxiliary.md @@ -95,7 +95,7 @@ And colors: * `e` - grEEn * `v` - naVy blue * `k` - blaK - * `#FFAACC` - arbitrary RGB color (1.16+), hex notation + * `#FFAACC` - arbitrary RGB color (1.16+), hex notation. Use uppercase for A-F symbols Decorators (listed as extra argument after the component they would affect): * `'^ '` - hover over tooltip text, appearing when hovering with your mouse over the text below. From 434dedc57dcb1cabcaca61f90faa943754b9f129 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 29 Apr 2020 01:03:39 -0300 Subject: [PATCH 2/3] 1.3.21 --- gradle.properties | 2 +- src/main/java/carpet/CarpetSettings.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 98ac82ca..2655bf11 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.7.8+build.188 # Mod Properties - mod_version = 1.3.20+v200422 + mod_version = 1.3.21+v200429 maven_group = carpet archives_base_name = fabric-carpet diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index ddb535bb..1d7c7010 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -33,7 +33,7 @@ import static carpet.settings.RuleCategory.CLIENT; @SuppressWarnings("CanBeFinal") public class CarpetSettings { - public static final String carpetVersion = "1.3.20+v200422"; + public static final String carpetVersion = "1.3.21+v200429"; public static final Logger LOG = LogManager.getLogger(); public static boolean skipGenerationChecks = false; public static boolean impendingFillSkipUpdates = false; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 61d93fb5..249332b6 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "carpet", - "version": "1.3.20", + "version": "1.3.21", "name": "Carpet Mod in Fabric", "description": "Carpet made out of fabric", From 94ffd5b9900653f1a2994bf051046790a87e5168 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 29 Apr 2020 01:24:54 -0300 Subject: [PATCH 3/3] rotatorBlock can rotate hoppers, fixes #238 --- src/main/java/carpet/helpers/BlockRotator.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/carpet/helpers/BlockRotator.java b/src/main/java/carpet/helpers/BlockRotator.java index 78dfd716..2d83f824 100644 --- a/src/main/java/carpet/helpers/BlockRotator.java +++ b/src/main/java/carpet/helpers/BlockRotator.java @@ -263,6 +263,15 @@ public class BlockRotator } world.setBlockState(blockpos, iblockstate.with(HorizontalFacingBlock.FACING, face), 3); } + else if(block == Blocks.HOPPER ) + { + Direction face = iblockstate.get(HopperBlock.FACING); + if (face != Direction.DOWN) + { + face = rotateClockwise(face, Direction.Axis.Y); + world.setBlockState(blockpos, iblockstate.with(HopperBlock.FACING, face), 3); + } + } // Send block update to the block that just have been rotated. world.updateNeighbor(blockpos, block, source.getBlockPos()); @@ -270,8 +279,6 @@ public class BlockRotator } - - public static boolean flip_block(BlockState state, World world, PlayerEntity player, Hand hand, BlockHitResult hit) { Block block = state.getBlock();