Skip to content

Commit 49615b1

Browse files
committed
Port to 1.21.5 pre-release 1
1 parent b37f5a3 commit 49615b1

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

gradle.properties

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

44
# Fabric Properties
55
# check these on https://fabricmc.net/develop
6-
minecraft_version=25w10a
7-
yarn_mappings=25w10a+build.9
6+
minecraft_version=1.21.5-pre1
7+
yarn_mappings=1.21.5-pre1+build.2
88
loader_version=0.18.4
99

1010
# Mod Properties
@@ -13,4 +13,4 @@ org.gradle.jvmargs=-Xmx1G
1313
archives_base_name = itematic
1414

1515
# Dependencies
16-
fabric_version=0.118.5+1.21.5
16+
fabric_version=0.118.6+1.21.5

src/main/java/net/errorcraft/itematic/mixin/network/state/PlayStateFactoriesExtender.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import net.minecraft.network.RegistryByteBuf;
77
import net.minecraft.network.listener.ClientPlayPacketListener;
88
import net.minecraft.network.state.PlayStateFactories;
9+
import net.minecraft.util.Unit;
910
import org.spongepowered.asm.mixin.Mixin;
1011
import org.spongepowered.asm.mixin.injection.At;
1112
import org.spongepowered.asm.mixin.injection.Inject;
@@ -17,7 +18,7 @@ public class PlayStateFactoriesExtender {
1718
method = "method_55958",
1819
at = @At("TAIL")
1920
)
20-
private static void registerCustomS2CPackets(NetworkStateBuilder<ClientPlayPacketListener, RegistryByteBuf> builder, CallbackInfo info) {
21+
private static void registerCustomS2CPackets(NetworkStateBuilder<ClientPlayPacketListener, RegistryByteBuf, Unit> builder, CallbackInfo info) {
2122
builder.add(ItematicPlayPackets.TWIRL, TwirlS2CPacket.CODEC);
2223
}
2324
}

src/main/java/net/errorcraft/itematic/screen/BrewingStandMenuDelegate.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import net.errorcraft.itematic.recipe.book.ItematicRecipeBookTypes;
55
import net.errorcraft.itematic.recipe.brewing.BrewingRecipe;
66
import net.errorcraft.itematic.recipe.input.BrewingRecipeInput;
7+
import net.minecraft.class_10938;
78
import net.minecraft.entity.player.PlayerEntity;
89
import net.minecraft.entity.player.PlayerInventory;
910
import net.minecraft.inventory.Inventory;
@@ -138,13 +139,13 @@ public void setPreviousTrackedSlot(int slot, ItemStack stack) {
138139
}
139140

140141
@Override
141-
public void setPreviousTrackedSlotMutable(int slot, ItemStack stack) {
142-
this.delegate.setPreviousTrackedSlotMutable(slot, stack);
142+
public void setPreviousTrackedSlotMutable(int slot, class_10938 hash) {
143+
this.delegate.setPreviousTrackedSlotMutable(slot, hash);
143144
}
144145

145146
@Override
146-
public void setPreviousCursorStack(ItemStack stack) {
147-
this.delegate.setPreviousCursorStack(stack);
147+
public void setPreviousCursorStack(class_10938 cursorStackHash) {
148+
this.delegate.setPreviousCursorStack(cursorStackHash);
148149
}
149150

150151
@Override

0 commit comments

Comments
 (0)