19w39a first fixes

gradle.properties

@@ -4,9 +4,9 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
-	minecraft_version=19w38b
-	yarn_mappings=19w38b+build.4
-	loader_version=0.6.1+build.165
+	minecraft_version=19w39a
+	yarn_mappings=19w39a+build.2
+	loader_version=0.6.2+build.166
 
 # Mod Properties
 	mod_version = 1.1.0+v190927

src/main/java/carpet/helpers/BlockRotator.java

@@ -255,7 +255,7 @@ public class BlockRotator
             if (block instanceof BedBlock)
                 return stack;
             Direction face = iblockstate.get(HorizontalFacingBlock.FACING);
-            face = face.rotateClockwise(Direction.Axis.Y);
+            face = rotateClockwise(face, Direction.Axis.Y);
 
             if(sourceFace == Direction.DOWN)
             { // same as above.

src/main/java/carpet/mixins/GameRenderer_pausedShakeMixin.java

@@ -5,7 +5,7 @@ import carpet.helpers.TickSpeed;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.render.VisibleRegion;
+//import net.minecraft.client.render.VisibleRegion;
 import net.minecraft.client.render.WorldRenderer;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/carpet/mixins/RedstoneWireBlockMixin.java

@@ -105,7 +105,7 @@ public abstract class RedstoneWireBlockMixin implements RedstoneWireBlockInterfa
                     if (blockState_3.isSimpleFullBlock(world_1, blockPos_2) && !world_1.getBlockState(blockPos_3).isSimpleFullBlock(world_1, blockPos_3)) {
                         int_3 = this.increasePower(int_3, world_1.getBlockState(blockPos_2.up()));
                     } else if (!blockState_3.isSimpleFullBlock(world_1, blockPos_2)) {
-                        int_3 = this.increasePower(int_3, world_1.getBlockState(blockPos_2.down()));
+                        int_3 = this.increasePower(int_3, world_1.getBlockState(blockPos_2.down(1)));
                     }
                 }
             }

src/main/java/carpet/script/CarpetExpression.java

@@ -58,7 +58,7 @@ import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.sound.SoundCategory;
-import net.minecraft.state.StateFactory;
+import net.minecraft.state.StateManager;
 import net.minecraft.state.property.Property;
 import net.minecraft.text.LiteralText;
 import net.minecraft.util.Clearable;
@@ -238,7 +238,7 @@ public class CarpetExpression
     private <T extends Comparable<T>> BlockState setProperty(Property<T> property, String name, String value,
                                                               BlockState bs)
     {
-        Optional<T> optional = property.getValue(value);
+        Optional<T> optional = property.parse(value);
 
         if (optional.isPresent())
         {
@@ -807,7 +807,7 @@ public class CarpetExpression
             BlockState targetBlockState = world.getBlockState(targetLocator.block.getPos());
             if (sourceLocator.offset < lv.size())
             {
-                StateFactory<Block, BlockState> states = sourceBlockState.getBlock().getStateFactory();
+                StateManager<Block, BlockState> states = sourceBlockState.getBlock().getStateFactory();
                 for (int i = sourceLocator.offset; i < lv.size(); i += 2)
                 {
                     String paramString = lv.get(i).evalValue(c).getString();
@@ -979,7 +979,7 @@ public class CarpetExpression
             if (lv.size() <= locator.offset)
                 throw new InternalExpressionException("property requires to specify a property to query");
             String tag = lv.get(locator.offset).evalValue(c).getString();
-            StateFactory<Block, BlockState> states = state.getBlock().getStateFactory();
+            StateManager<Block, BlockState> states = state.getBlock().getStateFactory();
             Property<?> property = states.getProperty(tag);
             if (property == null)
                 return LazyValue.NULL;
@@ -991,7 +991,7 @@ public class CarpetExpression
         {
             BlockValue.LocatorResult locator = BlockValue.fromParams((CarpetContext) c, lv, 0);
             BlockState state = locator.block.getBlockState();
-            StateFactory<Block, BlockState> states = state.getBlock().getStateFactory();
+            StateManager<Block, BlockState> states = state.getBlock().getStateFactory();
             Value res = ListValue.wrap(states.getProperties().stream().map(
                     p -> new StringValue(p.getName())).collect(Collectors.toList())
             );
@@ -1987,7 +1987,7 @@ public class CarpetExpression
 
             List<Value> neighbours = new ArrayList<>();
             neighbours.add(new BlockValue(null, world, center.up()));
-            neighbours.add(new BlockValue(null, world, center.down()));
+            neighbours.add(new BlockValue(null, world, center.down(1)));
             neighbours.add(new BlockValue(null, world, center.north()));
             neighbours.add(new BlockValue(null, world, center.south()));
             neighbours.add(new BlockValue(null, world, center.east()));

src/main/java/carpet/utils/PerimeterDiagnostics.java

@@ -107,7 +107,7 @@ public class PerimeterDiagnostics
                     pos = new BlockPos(eX+x, y, eZ+z);
 
                     BlockState iblockstate = worldserver.getBlockState(pos);
-                    BlockState iblockstate_down = worldserver.getBlockState(pos.down());
+                    BlockState iblockstate_down = worldserver.getBlockState(pos.down(1));
                     BlockState iblockstate_up = worldserver.getBlockState(pos.up());
 
                     if ( iblockstate.getMaterial() == Material.WATER && iblockstate_down.getMaterial() == Material.WATER && !iblockstate_up.isSimpleFullBlock(worldserver, pos))

src/main/java/carpet/utils/SpawnReporter.java

@@ -165,7 +165,7 @@ public class SpawnReporter
     
     public static List<BaseText> show_mobcaps(BlockPos pos, World worldIn)
     {
-        DyeColor under = WoolTool.getWoolColorAtPosition(worldIn, pos.down());
+        DyeColor under = WoolTool.getWoolColorAtPosition(worldIn, pos.down(1));
         if (under == null)
         {
             if (track_spawns > 0L)

src/main/java/carpet/utils/WoolTool.java

@@ -60,7 +60,7 @@ public class WoolTool
                 break;
             case GRAY:
                 if (CarpetSettings.commandInfo)
-                    Messenger.send(placer, BlockInfo.blockInfo(pos.down(), worldIn));
+                    Messenger.send(placer, BlockInfo.blockInfo(pos.down(1), worldIn));
                 break;
             case YELLOW:
                 if (CarpetSettings.commandInfo)
@@ -70,7 +70,7 @@ public class WoolTool
 			case GREEN:
                 if (CarpetSettings.hopperCounters)
                 {
-                    DyeColor under = getWoolColorAtPosition(worldIn, pos.down());
+                    DyeColor under = getWoolColorAtPosition(worldIn, pos.down(1));
                     if (under == null) return;
                     HopperCounter counter = HopperCounter.getCounter(under.toString());
                     if (counter != null)
@@ -80,7 +80,7 @@ public class WoolTool
 			case RED:
                 if (CarpetSettings.hopperCounters)
                 {
-                    DyeColor under = getWoolColorAtPosition(worldIn, pos.down());
+                    DyeColor under = getWoolColorAtPosition(worldIn, pos.down(1));
                     if (under == null) return;
                     HopperCounter counter = HopperCounter.getCounter(under.toString());
                     if (counter == null) return;