Merge branch 'master' into 1.16

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):
  * `'^<format> <text>'` - hover over tooltip text, appearing when hovering with your mouse over the text below.

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.8.2+build.194
 
 # Mod Properties
-	mod_version = 1.3.20+v200422
+	mod_version = 1.3.21+v200429
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 

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;

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();

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",