Skip to content

Commit 4fbff0d

Browse files
committed
Update for 1.20.2, mixin fixes
(cherry picked from commit 9c42c95) Signed-off-by: Noaaan <[email protected]>
1 parent fab7d17 commit 4fbff0d

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

gradle.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ mod_version=1.7.0
55
maven_group=net.devtech
66
archives_base_name=stacc
77

8-
minecraft_version=1.20.1
9-
yarn_mappings=1.20.1+build.10
10-
loader_version=0.14.25
8+
minecraft_version=1.20.2
9+
yarn_mappings=1.20.2+build.4
10+
loader_version=0.15.1
1111

1212
#Fabric api
13-
fabric_version=0.91.0+1.20.1
13+
fabric_version=0.91.2+1.20.2

src/main/java/net/devtech/stacc/mixin/CraftingInventoryMixin_LimitStackSize.java

+2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
import net.minecraft.inventory.Inventory;
77

88
import net.fabricmc.loader.api.FabricLoader;
9+
import org.spongepowered.asm.mixin.Unique;
910

1011
@Mixin(CraftingInventory.class)
1112
public abstract class CraftingInventoryMixin_LimitStackSize implements Inventory {
13+
@Unique
1214
private static final int STACC_SIZE_LIMIT;
1315
static {
1416
if(FabricLoader.getInstance().isModLoaded("fastbench")) {

src/main/java/net/devtech/stacc/mixin/DesyncFixin.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
public abstract class DesyncFixin {
1919
@Inject (method = "writeItemStack(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/network/PacketByteBuf;",
2020
at = @At (value = "INVOKE",
21-
target =
22-
"Lnet/minecraft/network/PacketByteBuf;writeNbt(Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/network/PacketByteBuf;"))
21+
target = "Lnet/minecraft/network/PacketByteBuf;writeNbt(Lnet/minecraft/nbt/NbtElement;)Lnet/minecraft/network/PacketByteBuf;"))
2322
private void write(ItemStack itemStack, CallbackInfoReturnable<PacketByteBuf> cir) {
2423
this.writeInt(itemStack.getCount());
2524
}

src/main/java/net/devtech/stacc/mixin/SerializationFixin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import java.util.List;
55
import java.util.Locale;
66

7-
import org.spongepowered.asm.mixin.Mixin;
8-
import org.spongepowered.asm.mixin.Shadow;
7+
import org.spongepowered.asm.mixin.*;
98
import org.spongepowered.asm.mixin.injection.At;
109
import org.spongepowered.asm.mixin.injection.Inject;
1110
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -23,6 +22,7 @@
2322
*/
2423
@Mixin (ItemStack.class)
2524
public abstract class SerializationFixin {
25+
@Unique
2626
private static final NumberFormat FORMAT = NumberFormat.getNumberInstance(Locale.US);
2727
@Shadow private int count;
2828

0 commit comments

Comments
 (0)