Skip to content

Commit 34831db

Browse files
committed
1.21.8
1 parent 4c26eff commit 34831db

File tree

6 files changed

+16
-14
lines changed

6 files changed

+16
-14
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins {
2-
id 'fabric-loom' version '1.7-SNAPSHOT'
2+
id 'fabric-loom' version '1.11-SNAPSHOT'
33
id 'maven-publish'
44
}
55

6-
sourceCompatibility = JavaVersion.VERSION_17
7-
targetCompatibility = JavaVersion.VERSION_17
6+
sourceCompatibility = JavaVersion.VERSION_21
7+
targetCompatibility = JavaVersion.VERSION_21
88

99
archivesBaseName = project.archives_base_name
1010
version = project.mod_version

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/develop
6-
minecraft_version=1.21
7-
yarn_mappings=1.21+build.9
8-
loader_version=0.16.3
6+
minecraft_version=1.21.8
7+
yarn_mappings=1.21.8+build.1
8+
loader_version=0.17.2
99

1010
# Fabric API
11-
fabric_version=0.102.0+1.21
11+
fabric_version=0.133.0+1.21.8
1212

1313
# Mod Properties
14-
mod_version = 1.1.0_1.21
14+
mod_version = 1.1.0+1.21.8
1515
maven_group = net.just_s.sframes
1616
archives_base_name = seamless-itemframes
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/java/net/just_s/sframes/SFramesMod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public static boolean shouldGlow(ItemFrameEntity frame) {
105105
}
106106

107107
public static List<ServerPlayerEntity> getPlayersNearby(ItemFrameEntity itemFrame) {
108-
return (List<ServerPlayerEntity>)(Object)itemFrame.getEntityWorld().getOtherEntities(
108+
return (List<ServerPlayerEntity>)(Object)itemFrame.getWorld().getOtherEntities(
109109
null,
110110
new Box(
111111
itemFrame.getPos().add(

src/main/java/net/just_s/sframes/mixin/DecorationItemMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class DecorationItemMixin {
4040

4141
@Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;spawnEntity(Lnet/minecraft/entity/Entity;)Z"), method = "useOnBlock")
4242
private boolean sframes$addFrameToTeamOnSpawn(World world, Entity abstractDecorationEntity) {
43-
if (abstractDecorationEntity instanceof ItemFrameEntity && customData.getBoolean("invisibleframe")) {
43+
if (abstractDecorationEntity instanceof ItemFrameEntity && customData.getBoolean("invisibleframe").orElse(false)) {
4444
SFramesMod.addFrameToTeam((ItemFrameEntity) abstractDecorationEntity);
4545
}
4646

src/main/java/net/just_s/sframes/mixin/ItemFrameMixin.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import net.minecraft.network.packet.s2c.play.ParticleS2CPacket;
1616
import net.minecraft.particle.ParticleTypes;
1717
import net.minecraft.server.network.ServerPlayerEntity;
18+
import net.minecraft.server.world.ServerWorld;
1819
import net.minecraft.sound.SoundCategory;
1920
import net.minecraft.sound.SoundEvents;
2021
import net.minecraft.text.Text;
@@ -31,12 +32,12 @@
3132
@Mixin(ItemFrameEntity.class)
3233
public class ItemFrameMixin {
3334
@Inject(at = @At("HEAD"), method = "damage", cancellable = true)
34-
private void sframes$onItemFrameDamageWithTool(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
35+
private void sframes$onItemFrameDamageWithTool(ServerWorld world, DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
3536
Entity attacker = source.getAttacker();
3637
if (attacker == null || !attacker.isPlayer() || attacker.getWorld().isClient()) return;
3738

3839
ServerPlayerEntity player = (ServerPlayerEntity) attacker;
39-
ItemStack itemStackInHand = player.getInventory().getStack(player.getInventory().selectedSlot);
40+
ItemStack itemStackInHand = player.getInventory().getStack(player.getInventory().getSelectedSlot());
4041

4142
if (itemStackInHand.isOf(Items.SHEARS) && this.applyShears(itemStackInHand, player)) {
4243
cir.setReturnValue(true);
@@ -51,7 +52,7 @@ public class ItemFrameMixin {
5152
}
5253

5354
@Inject(at = @At("RETURN"), method = "dropHeldStack")
54-
private void sframes$onDroppingHoldingItem(Entity entity, boolean alwaysDrop, CallbackInfo ci) {
55+
private void sframes$onDroppingHoldingItem(ServerWorld world, Entity entity, boolean dropSelf, CallbackInfo ci) {
5556
updateState();
5657
}
5758

@@ -108,6 +109,7 @@ private boolean applyShears(ItemStack itemStackInHand, ServerPlayerEntity player
108109
SFramesMod.sendPacket(player, new ParticleS2CPacket(
109110
ParticleTypes.CLOUD,
110111
false,
112+
true,
111113
itemFrame.getX(),
112114
itemFrame.getY(),
113115
itemFrame.getZ(),

0 commit comments

Comments
 (0)