Skip to content

Commit 6a88250

Browse files
zly2006zly2006
committed
feat: 1.21.2
1 parent 6b24003 commit 6a88250

29 files changed

+135
-138
lines changed

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
org.gradle.jvmargs=-Xmx5G
33
org.gradle.parallel=true
44
# Mod Properties
5-
mod_version=0.4.6
5+
mod_version=0.4.7-alpha+1.21.2
66
archices_preview_version=
77

88
maven_group=com.github.zly2006
@@ -11,9 +11,9 @@ archives_base_name=enclosure-fabric
1111
rei_version = 9.1.550
1212

1313
# check these on https://fabricmc.net/develop
14-
minecraft_version=1.21.1
15-
yarn_mappings=1.21.1+build.3
14+
minecraft_version=1.21.2
15+
yarn_mappings=1.21.2+build.1
1616
loader_version=0.16.7
1717

1818
# Fabric API
19-
fabric_version=0.106.0+1.21.1
19+
fabric_version=0.106.1+1.21.2

‎src/main/java/com/github/zly2006/enclosure/client/mixin/MixinServerEntry.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
88
import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget;
99
import net.minecraft.client.network.ServerInfo;
10+
import net.minecraft.client.render.RenderLayer;
1011
import net.minecraft.text.Text;
1112
import net.minecraft.util.Identifier;
1213
import org.spongepowered.asm.mixin.Final;
@@ -36,7 +37,7 @@ private void onRender(DrawContext context, int index, int y, int x, int entryWid
3637
);
3738
}
3839
}
39-
context.drawTexture(NOTIFY_TEXTURE, x + 24, y + 24, 0, offset, 8, 8, 8, 16);
40+
context.drawTexture(RenderLayer::getGuiTexturedOverlay, NOTIFY_TEXTURE, x + 24, y + 24, 0, offset, 8, 8, 8, 16);
4041
}
4142
}
4243
}

‎src/main/java/com/github/zly2006/enclosure/gui/ConfirmScreen.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import net.minecraft.client.gui.DrawContext;
44
import net.minecraft.client.gui.screen.Screen;
55
import net.minecraft.client.gui.widget.ButtonWidget;
6+
import net.minecraft.client.render.RenderLayer;
67
import net.minecraft.text.Text;
78
import net.minecraft.util.Identifier;
89

@@ -45,7 +46,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
4546
int height = 150;
4647
int x = (parent.width - 200) / 2;
4748
int y = (parent.height - height) / 2;
48-
context.drawTexture(TEXTURE, x, y, 0, 0, 200, 150, 200, 150);
49+
context.drawTexture(RenderLayer::getGuiTexturedOverlay, TEXTURE, x, y, 0, 0, 200, 150, 200, 150);
4950
context.drawTextWrapped(textRenderer, message, x + 10, y + 10, 180, 0xFFFFFF);
5051
yesButton.setY(y + height - 30);
5152
noButton.setY(y + height - 30);

‎src/main/java/com/github/zly2006/enclosure/mixin/MixinAbstractSignBlock.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
public class MixinAbstractSignBlock {
1818
@Inject(method = "openEditScreen", at = @At("HEAD"), cancellable = true)
1919
private void openEditScreen(PlayerEntity player, SignBlockEntity blockEntity, boolean front, CallbackInfo ci) {
20-
if (player instanceof ServerPlayerEntity) {
20+
if (player instanceof ServerPlayerEntity serverPlayer) {
2121
@SuppressWarnings("DataFlowIssue")
2222
EnclosureArea area = ServerMain.INSTANCE.getSmallestEnclosure((ServerWorld) blockEntity.getWorld(), blockEntity.getPos());
23-
if (area != null && !area.hasPerm((ServerPlayerEntity) player, Permission.EDIT_SIGN)) {
24-
player.sendMessage(Permission.EDIT_SIGN.getNoPermissionMsg(player));
23+
if (area != null && !area.hasPerm(serverPlayer, Permission.EDIT_SIGN)) {
24+
serverPlayer.sendMessage(Permission.EDIT_SIGN.getNoPermissionMsg(player));
2525
ci.cancel();
2626
}
2727
}

‎src/main/java/com/github/zly2006/enclosure/mixin/MixinAnimalEntity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private void onEating(PlayerEntity player, Hand hand, CallbackInfoReturnable<Act
3939
}
4040
EnclosureArea area = ServerMain.INSTANCE.getSmallestEnclosure((ServerWorld) this.getWorld(), getBlockPos());
4141
if (area != null && !area.hasPerm((ServerPlayerEntity) player, FEED_ANIMAL)) {
42-
player.sendMessage(FEED_ANIMAL.getNoPermissionMsg(player));
42+
player.sendMessage(FEED_ANIMAL.getNoPermissionMsg(player), false);
4343
cir.setReturnValue(ActionResult.FAIL);
4444
}
4545
}

‎src/main/java/com/github/zly2006/enclosure/mixin/MixinBoatEntity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import net.minecraft.entity.Entity;
55
import net.minecraft.entity.EntityType;
66
import net.minecraft.entity.player.PlayerEntity;
7-
import net.minecraft.entity.vehicle.BoatEntity;
7+
import net.minecraft.entity.vehicle.AbstractBoatEntity;
88
import net.minecraft.util.ActionResult;
99
import net.minecraft.util.Hand;
1010
import net.minecraft.world.World;
@@ -15,7 +15,7 @@
1515

1616
import static com.github.zly2006.enclosure.utils.Permission.VEHICLE;
1717

18-
@Mixin(BoatEntity.class)
18+
@Mixin(AbstractBoatEntity.class)
1919
public abstract class MixinBoatEntity extends Entity {
2020
protected MixinBoatEntity(EntityType<?> entityType, World world) {
2121
super(entityType, world);
@@ -24,7 +24,7 @@ protected MixinBoatEntity(EntityType<?> entityType, World world) {
2424
@Inject(method = "interact", at = @At("HEAD"), cancellable = true)
2525
private void onInteract(PlayerEntity player, Hand hand, CallbackInfoReturnable<ActionResult> cir) {
2626
if (!ServerMain.INSTANCE.checkPermission(getWorld(), getBlockPos(), player, VEHICLE)) {
27-
player.sendMessage(VEHICLE.getNoPermissionMsg(player));
27+
player.sendMessage(VEHICLE.getNoPermissionMsg(player), true);
2828
cir.setReturnValue(ActionResult.FAIL);
2929
}
3030
}

‎src/main/java/com/github/zly2006/enclosure/mixin/MixinBucketItem.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import net.minecraft.item.BucketItem;
99
import net.minecraft.item.ItemStack;
1010
import net.minecraft.server.network.ServerPlayerEntity;
11+
import net.minecraft.util.ActionResult;
1112
import net.minecraft.util.Hand;
12-
import net.minecraft.util.TypedActionResult;
1313
import net.minecraft.util.hit.BlockHitResult;
1414
import net.minecraft.util.math.BlockPos;
1515
import net.minecraft.util.math.Direction;
@@ -27,14 +27,14 @@ public class MixinBucketItem {
2727
@Shadow @Final private Fluid fluid;
2828

2929
@Inject(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;canPlayerModifyAt(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/math/BlockPos;)Z"), locals = LocalCapture.CAPTURE_FAILSOFT, cancellable = true)
30-
private void onUse(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable<TypedActionResult<ItemStack>> cir, ItemStack itemStack, BlockHitResult blockHitResult, BlockPos blockPos, Direction direction, BlockPos blockPos2) {
30+
private void onUse(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable<ActionResult> cir, ItemStack itemStack, BlockHitResult blockHitResult, BlockPos blockPos, Direction direction, BlockPos blockPos2) {
3131
if (user instanceof ServerPlayerEntity player) {
3232
Permission permission = this.fluid == Fluids.EMPTY ? Permission.BREAK_BLOCK : Permission.PLACE_BLOCK;
3333
if (!ServerMain.INSTANCE.checkPermission(world, blockPos, player, permission) ||
3434
!ServerMain.INSTANCE.checkPermission(world, blockPos2, player, permission)) {
3535
player.currentScreenHandler.syncState();
3636
player.sendMessage(permission.getNoPermissionMsg(player));
37-
cir.setReturnValue(TypedActionResult.fail(itemStack));
37+
cir.setReturnValue(ActionResult.FAIL);
3838
}
3939
}
4040
}

‎src/main/java/com/github/zly2006/enclosure/mixin/MixinChestBoatEntity.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
import com.github.zly2006.enclosure.ServerMain;
44
import net.minecraft.entity.EntityType;
55
import net.minecraft.entity.player.PlayerEntity;
6-
import net.minecraft.entity.vehicle.BoatEntity;
7-
import net.minecraft.entity.vehicle.ChestBoatEntity;
6+
import net.minecraft.entity.vehicle.AbstractBoatEntity;
7+
import net.minecraft.entity.vehicle.AbstractChestBoatEntity;
8+
import net.minecraft.item.Item;
89
import net.minecraft.server.network.ServerPlayerEntity;
910
import net.minecraft.util.ActionResult;
1011
import net.minecraft.util.Hand;
@@ -14,13 +15,15 @@
1415
import org.spongepowered.asm.mixin.injection.Inject;
1516
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
1617

18+
import java.util.function.Supplier;
19+
1720
import static com.github.zly2006.enclosure.utils.Permission.CONTAINER;
1821
import static com.github.zly2006.enclosure.utils.Permission.VEHICLE;
1922

20-
@Mixin(ChestBoatEntity.class)
21-
public class MixinChestBoatEntity extends BoatEntity {
22-
public MixinChestBoatEntity(EntityType<? extends BoatEntity> entityType, World world) {
23-
super(entityType, world);
23+
@Mixin(AbstractChestBoatEntity.class)
24+
public abstract class MixinChestBoatEntity extends AbstractBoatEntity {
25+
public MixinChestBoatEntity(EntityType<? extends AbstractBoatEntity> type, World world, Supplier<Item> itemSupplier) {
26+
super(type, world, itemSupplier);
2427
}
2528

2629
@Inject(method = "canPlayerUse", at = @At("HEAD"), cancellable = true)
@@ -39,10 +42,10 @@ private void canPlayerUse(PlayerEntity player, CallbackInfoReturnable<Boolean> c
3942
@Inject(method = "interact", at = @At("HEAD"), cancellable = true)
4043
private void onInteract(PlayerEntity player, Hand hand, CallbackInfoReturnable<ActionResult> cir) {
4144
if (!ServerMain.INSTANCE.checkPermission(getWorld(), getBlockPos(), player, VEHICLE)) {
42-
player.sendMessage(VEHICLE.getNoPermissionMsg(player));
45+
player.sendMessage(VEHICLE.getNoPermissionMsg(player), true);
4346
cir.setReturnValue(ActionResult.FAIL);
4447
} else if (!ServerMain.INSTANCE.checkPermission(getWorld(), getBlockPos(), player, CONTAINER)) {
45-
player.sendMessage(CONTAINER.getNoPermissionMsg(player));
48+
player.sendMessage(CONTAINER.getNoPermissionMsg(player), true);
4649
cir.setReturnValue(ActionResult.FAIL);
4750
}
4851
}

‎src/main/java/com/github/zly2006/enclosure/mixin/MixinChiseledBookshelfBlock.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import net.minecraft.item.ItemStack;
1010
import net.minecraft.util.ActionResult;
1111
import net.minecraft.util.Hand;
12-
import net.minecraft.util.ItemActionResult;
1312
import net.minecraft.util.hit.BlockHitResult;
1413
import net.minecraft.util.math.BlockPos;
1514
import net.minecraft.world.World;
@@ -35,7 +34,7 @@ public class MixinChiseledBookshelfBlock {
3534
)
3635
private void onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit, CallbackInfoReturnable<ActionResult> cir, @Local OptionalInt optionalInt) {
3736
if (optionalInt.isPresent() && !ServerMain.INSTANCE.checkPermission(world, pos, player, Permission.CONTAINER)) {
38-
player.sendMessage(CONTAINER.getNoPermissionMsg(player));
37+
player.sendMessage(CONTAINER.getNoPermissionMsg(player), true);
3938
cir.setReturnValue(ActionResult.FAIL);
4039
}
4140
}
@@ -48,10 +47,10 @@ private void onUse(BlockState state, World world, BlockPos pos, PlayerEntity pla
4847
),
4948
cancellable = true
5049
)
51-
private void onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit, CallbackInfoReturnable<ItemActionResult> cir, @Local OptionalInt optionalInt) {
50+
private void onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit, CallbackInfoReturnable<ActionResult> cir, @Local OptionalInt optionalInt) {
5251
if (optionalInt.isPresent() && !ServerMain.INSTANCE.checkPermission(world, pos, player, Permission.CONTAINER)) {
53-
player.sendMessage(CONTAINER.getNoPermissionMsg(player));
54-
cir.setReturnValue(ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION);
52+
player.sendMessage(CONTAINER.getNoPermissionMsg(player), true);
53+
cir.setReturnValue(ActionResult.PASS_TO_DEFAULT_BLOCK_ACTION);
5554
}
5655
}
5756
}

‎src/main/java/com/github/zly2006/enclosure/mixin/MixinChorusFruitItem.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)