diff --git a/src/main/java/xyz/pixelatedw/finalbeta/ModConfig.java b/src/main/java/xyz/pixelatedw/finalbeta/ModConfig.java index 3079ad1..5ac1f9e 100644 --- a/src/main/java/xyz/pixelatedw/finalbeta/ModConfig.java +++ b/src/main/java/xyz/pixelatedw/finalbeta/ModConfig.java @@ -75,6 +75,8 @@ public class ModConfig { "Fixes double doors not being in their correct state when pressure plates are used to open them"); public static final Option FIX_SLABS_RECIPE = make("Fix Slabs Recipe", true, "Givs two slabs for every block, since 1 block = 2 slabs => 3 blocks = 6 slabs (instead of 3)"); + public static final Option FIX_SLIME_SPLITS = make("Fix Slime Splits", true, + "Fixes slimes not splitting if their HP is not exactly zero"); private static ModConfig instance = new ModConfig(); public static final ModConfig instance() { diff --git a/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java b/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java index b288153..db3f846 100644 --- a/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java +++ b/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java @@ -8,8 +8,6 @@ import java.util.HashMap; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.Player; -import net.minecraft.item.ItemInstance; -import net.minecraft.item.ItemType; public class WyHelper { @@ -94,12 +92,17 @@ public class WyHelper { } public static void cheatCommand(Player player) { - player.level.entities.stream().filter(e -> !(e instanceof Player)).forEach((e) -> ((net.minecraft.entity.Entity)e).remove()); +// Slime slime = new Slime(player.level); +// slime.setPositionAndAngles(player.x, player.y + 0.5D, player.z, player.level.rand.nextFloat() * 360.0F, 0.0F); +// player.level.spawnEntity(slime); +// slime.setSize(10); +// player.level.entities.stream().filter(e -> !(e instanceof Player)).forEach((e) -> ((net.minecraft.entity.Entity)e).remove()); + // player.dropItem(new ItemInstance(Tile.LADDER, 64)); - player.dropItem(new ItemInstance(ItemType.minecart, 1)); - player.dropItem(new ItemInstance(ItemType.minecartFurnace, 1)); - player.dropItem(new ItemInstance(ItemType.coal, 64)); +// player.dropItem(new ItemInstance(ItemType.minecart, 1)); +// player.dropItem(new ItemInstance(ItemType.minecartFurnace, 1)); +// player.dropItem(new ItemInstance(ItemType.coal, 64)); // player.dropItem(new ItemInstance(Tile.GOLDEN_RAIL, 64)); // player.dropItem(new ItemInstance(Tile.COBBLESTONE, 64)); @@ -113,11 +116,10 @@ public class WyHelper { // player.level.setTile(x + i, y, z, Tile.REDSTONE_TORCH_LIT.id); // } - - player.level.setLevelTime(0); - player.level.getProperties().setRaining(false); - player.level.getProperties().setRainTime(0); - player.level.getProperties().setThundering(false); - player.level.getProperties().setThunderTime(0); +// player.level.setLevelTime(0); +// player.level.getProperties().setRaining(false); +// player.level.getProperties().setRainTime(0); +// player.level.getProperties().setThundering(false); +// player.level.getProperties().setThunderTime(0); } } diff --git a/src/main/java/xyz/pixelatedw/finalbeta/mixin/SlimeMixin.java b/src/main/java/xyz/pixelatedw/finalbeta/mixin/SlimeMixin.java new file mode 100644 index 0000000..6b86ee6 --- /dev/null +++ b/src/main/java/xyz/pixelatedw/finalbeta/mixin/SlimeMixin.java @@ -0,0 +1,20 @@ +package xyz.pixelatedw.finalbeta.mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import net.minecraft.entity.monster.Slime; +import xyz.pixelatedw.finalbeta.ModConfig; + +@Mixin(Slime.class) +public class SlimeMixin { + @Inject(method = "remove", at = @At("HEAD")) + public void remove(CallbackInfo ci) { + if (ModConfig.FIX_SLIME_SPLITS.get()) { + Slime slime = ((Slime) (Object) this); + slime.health = Math.max(slime.health, 0); + } + } +} diff --git a/src/main/resources/finalbeta.mixins.json b/src/main/resources/finalbeta.mixins.json index 37eed87..f4bf8ae 100644 --- a/src/main/resources/finalbeta.mixins.json +++ b/src/main/resources/finalbeta.mixins.json @@ -41,7 +41,8 @@ "CraftingInventoryMixin", "RecipeRegistryMixin", "SnowballMixin", - "EntityMixin" + "EntityMixin", + "SlimeMixin" ], "injectors": { "defaultRequire": -1