23w13a

src/main/java/carpet/mixins/BlockBehaviourBlockStateBase_mixin.java

@@ -0,0 +1,27 @@
+package carpet.mixins;
+
+import carpet.CarpetSettings;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.BuddingAmethystBlock;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.material.PushReaction;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(BlockBehaviour.BlockStateBase.class)
+public abstract class BlockBehaviourBlockStateBase_mixin
+{
+    @Shadow public abstract Block getBlock();
+
+    @Inject(method = "getPistonPushReaction", at = @At("HEAD"), cancellable = true)
+    private void onGetPistonPushReaction(CallbackInfoReturnable<PushReaction> cir)
+    {
+        if (CarpetSettings.movableAmethyst && getBlock() instanceof BuddingAmethystBlock)
+        {
+            cir.setReturnValue(PushReaction.NORMAL);
+        }
+    }
+}

src/main/java/carpet/mixins/BuddingAmethystBlock_movableAmethystMixin.java

@@ -26,11 +26,6 @@ public class BuddingAmethystBlock_movableAmethystMixin extends Block {
         super(settings);
     }
 
-    @Inject(at = @At("HEAD"), method = "getPistonPushReaction(Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/material/PushReaction;", cancellable = true)
-    void getPistonBehavior(BlockState state, CallbackInfoReturnable<PushReaction> cir) {
-        if (CarpetSettings.movableAmethyst) cir.setReturnValue(PushReaction.NORMAL);
-    }
-
     @Override
     public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack stack) {
         super.playerDestroy(world, player, pos, state, blockEntity, stack);

src/main/java/carpet/script/api/WorldAccess.java

@@ -524,7 +524,7 @@ public class WorldAccess
                 booleanStateTest(c, "liquid", lv, (s, p) -> !s.getFluidState().isEmpty()));
 
         expression.addContextFunction("flammable", -1, (c, t, lv) ->
-                booleanStateTest(c, "flammable", lv, (s, p) -> s.getMaterial().isFlammable()));
+                booleanStateTest(c, "flammable", lv, (s, p) -> s.ignitedByLava()));
 
         expression.addContextFunction("transparent", -1, (c, t, lv) ->
                 booleanStateTest(c, "transparent", lv, (s, p) -> !s.getMaterial().isSolid()));

src/main/java/carpet/script/utils/Colors.java

@@ -182,7 +182,6 @@ public class Colors
             entry(Material.SPONGE         , "sponge"       ),
             entry(Material.SHULKER_SHELL    , "shulker"      ),
             entry(Material.WOOD           , "wood"         ),
-            entry(Material.NETHER_WOOD    , "nether_wood"  ),
             entry(Material.BAMBOO_SAPLING , "shoots"       ),
             entry(Material.BAMBOO         , "bamboo"       ),
             entry(Material.WOOL           , "wool"         ),

src/main/java/carpet/utils/BlockInfo.java

@@ -61,7 +61,7 @@ public class BlockInfo
         lst.add(Messenger.s(String.format(" - Blocks movement on land: %s", !state.isPathfindable(world,pos, PathComputationType.LAND))));
         lst.add(Messenger.s(String.format(" - Blocks movement in air: %s", !state.isPathfindable(world,pos, PathComputationType.AIR))));
         lst.add(Messenger.s(String.format(" - Blocks movement in liquids: %s", !state.isPathfindable(world,pos, PathComputationType.WATER))));
-        lst.add(Messenger.s(String.format(" - Can burn: %s", material.isFlammable())));
+        lst.add(Messenger.s(String.format(" - Can burn: %s", state.ignitedByLava())));
         lst.add(Messenger.s(String.format(" - Requires a tool: %s", !material.isReplaceable()))); //?maybe
         lst.add(Messenger.s(String.format(" - Hardness: %.2f", state.getDestroySpeed(world, pos))));
         lst.add(Messenger.s(String.format(" - Blast resistance: %.2f", block.getExplosionResistance())));

src/main/resources/carpet.mixins.json

@@ -183,6 +183,7 @@
     "CollectingNeighborUpdaterAccessor",
 
     "BlockBehaviour_customStickyMixin",
+    "BlockBehaviourBlockStateBase_mixin",
     "ChainBlock_customStickyMixin",
     "ChestBlock_customStickyMixin",
     "HoneyBlock_customStickyMixin",