diff --git a/gradle.properties b/gradle.properties index 5b04e728..f87ef46c 100644 --- a/gradle.properties +++ b/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=1.14.3-pre2 - yarn_mappings=1.14.3-pre2+build.1 - loader_version=0.4.8+build.154 + minecraft_version=1.14.3-pre4 + yarn_mappings=1.14.3-pre4+build.1 + loader_version=0.4.8+build.155 # Mod Properties mod_version = 0.1a diff --git a/src/main/java/carpet/mixins/BlockPlacementDispenserBehaviourMixin.java b/src/main/java/carpet/mixins/BlockPlacementDispenserBehaviourMixin.java deleted file mode 100644 index 8fda5326..00000000 --- a/src/main/java/carpet/mixins/BlockPlacementDispenserBehaviourMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -package carpet.mixins; - -import carpet.settings.CarpetSettings; -import net.minecraft.block.dispenser.BlockPlacementDispenserBehavior; -import net.minecraft.item.ItemStack; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(BlockPlacementDispenserBehavior.class) -public class BlockPlacementDispenserBehaviourMixin -{ - @Redirect(method = "dispenseSilently", at = @At(value="INVOKE", target="Lnet/minecraft/item/ItemStack;decrement(I)V")) - private void cancleDoubleDecrement(ItemStack stack, int amount) - { - if (!CarpetSettings.stackableShulkerBoxes) - { - stack.decrement(amount); - } - } -} diff --git a/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java b/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java index d88ea96a..25af57e5 100644 --- a/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java +++ b/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java @@ -32,7 +32,7 @@ public abstract class LivingEntity_maxCollisionsMixin extends Entity { List list_1 = this.world.getEntities((Entity)this, this.getBoundingBox(), EntityPredicates.canBePushedBy(this)); if (!list_1.isEmpty()) { - int int_1 = this.world.getGameRules().getInteger(GameRules.MAX_ENTITY_CRAMMING); + int int_1 = this.world.getGameRules().getInt(GameRules.MAX_ENTITY_CRAMMING); int int_2; if (int_1 > 0 && list_1.size() > int_1 - 1 && this.random.nextInt(4) == 0) { int_2 = 0; diff --git a/src/main/java/carpet/mixins/ServerChunkManager_tickMixin.java b/src/main/java/carpet/mixins/ServerChunkManager_tickMixin.java index 099165a8..969051e7 100644 --- a/src/main/java/carpet/mixins/ServerChunkManager_tickMixin.java +++ b/src/main/java/carpet/mixins/ServerChunkManager_tickMixin.java @@ -19,7 +19,7 @@ import java.util.function.BooleanSupplier; @Mixin(ServerChunkManager.class) public abstract class ServerChunkManager_tickMixin { - /* + @Shadow @Final private ServerWorld world; CarpetProfiler.ProfilerToken currentSection; @@ -66,7 +66,7 @@ public abstract class ServerChunkManager_tickMixin { CarpetProfiler.end_current_section(currentSection); } - }*/ + } //// Tick freeze @Redirect(method = "tickChunks", at = @At( diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 77d83597..9117b02e 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -174,8 +174,8 @@ public class EntityValue extends Value put("invulnerable", (e, a) -> new NumericValue(e.isInvulnerable())); put("dimension", (e, a) -> new StringValue(e.dimension.toString().replaceFirst("minecraft:",""))); - put("height", (e, a) -> new NumericValue(e.getSize(EntityPose.STANDING).height)); - put("width", (e, a) -> new NumericValue(e.getSize(EntityPose.STANDING).width)); + put("height", (e, a) -> new NumericValue(e.getDimensions(EntityPose.STANDING).height)); + put("width", (e, a) -> new NumericValue(e.getDimensions(EntityPose.STANDING).width)); put("eye_height", (e, a) -> new NumericValue(e.getEyeHeight(EntityPose.STANDING))); put("age", (e, a) -> new NumericValue(e.age)); put("item", (e, a) -> (e instanceof ItemEntity)?new StringValue(((ItemEntity) e).getStack().getName().getString()):Value.NULL); diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index e84a6f93..99dfa292 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -91,9 +91,7 @@ "PistonBlock_movableTEMixin", "PistonBlockEntity_movableTEMixin", "World_movableTEMixin", - "WorldChunk_movableTEMixin", - - "BlockPlacementDispenserBehaviourMixin" + "WorldChunk_movableTEMixin" ], "client": [ "MinecraftClientMixin",