From fd6a4335cf71359e039accb62b2fdc0971c8ca7f Mon Sep 17 00:00:00 2001 From: Brian Semrau Date: Tue, 23 Jul 2019 20:43:02 -0400 Subject: [PATCH] Migrated to 1.14.4, fixed keepInventory bug --- gradle.properties | 10 +++++----- .../ingame/CosmeticArmorInventoryScreen.java | 2 +- .../mixin/common/PlayerEntityMixin.java | 2 +- .../mixin/common/PlayerInventoryMixin.java | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index fa4a4bd..93145f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.14.3 - yarn_mappings=1.14.3+build.9 - loader_version=0.4.8+build.155 + minecraft_version=1.14.4 + yarn_mappings=1.14.4+build.2 + loader_version=0.4.8+build.158 # Mod Properties - mod_version = 1.1.2 + mod_version = 1.1.3 maven_group = com.github.briansemrau archives_base_name = cosmetic-armor-slots # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric - fabric_version=0.3.0+build.183 + fabric_version=0.3.0+build.200 diff --git a/src/main/java/com/github/briansemrau/cosmeticarmorslots/client/gui/screen/ingame/CosmeticArmorInventoryScreen.java b/src/main/java/com/github/briansemrau/cosmeticarmorslots/client/gui/screen/ingame/CosmeticArmorInventoryScreen.java index b9c7608..064936c 100644 --- a/src/main/java/com/github/briansemrau/cosmeticarmorslots/client/gui/screen/ingame/CosmeticArmorInventoryScreen.java +++ b/src/main/java/com/github/briansemrau/cosmeticarmorslots/client/gui/screen/ingame/CosmeticArmorInventoryScreen.java @@ -48,7 +48,7 @@ protected void init() { IPlayerEntityMixin player = ((IPlayerEntityMixin) this.playerInventory.player); this.addButton(new ButtonWidget(this.left + 94, this.top + 12 + i * 18, 8, 8, "", (buttonWidget) -> { player.setUseCosmeticArmorSlot(slotIndex, !player.getUseCosmeticArmorSlot(slotIndex)); - this.minecraft.getNetworkHandler().getClientConnection().send(CosmeticArmorSlotsNetwork.createCosmeticSlotVisibilityUpdatePacket(EquipmentSlot.fromTypeIndex(EquipmentSlot.Type.ARMOR, slotIndex), player.getUseCosmeticArmorSlot(slotIndex))); + this.minecraft.getNetworkHandler().getConnection().send(CosmeticArmorSlotsNetwork.createCosmeticSlotVisibilityUpdatePacket(EquipmentSlot.fromTypeIndex(EquipmentSlot.Type.ARMOR, slotIndex), player.getUseCosmeticArmorSlot(slotIndex))); }) { @Override public void render(int int_1, int int_2, float float_1) { diff --git a/src/main/java/com/github/briansemrau/cosmeticarmorslots/mixin/common/PlayerEntityMixin.java b/src/main/java/com/github/briansemrau/cosmeticarmorslots/mixin/common/PlayerEntityMixin.java index 3e913f9..3bfeeac 100644 --- a/src/main/java/com/github/briansemrau/cosmeticarmorslots/mixin/common/PlayerEntityMixin.java +++ b/src/main/java/com/github/briansemrau/cosmeticarmorslots/mixin/common/PlayerEntityMixin.java @@ -35,7 +35,7 @@ public abstract class PlayerEntityMixin extends LivingEntity implements IPlayerE @Environment(EnvType.SERVER) @Unique - private final DefaultedList equippedCosmeticArmor = DefaultedList.create(4, ItemStack.EMPTY); + private final DefaultedList equippedCosmeticArmor = DefaultedList.ofSize(4, ItemStack.EMPTY); @Environment(EnvType.SERVER) @Unique private final boolean[] storedUsingCosmeticArmorSlot = new boolean[4]; diff --git a/src/main/java/com/github/briansemrau/cosmeticarmorslots/mixin/common/PlayerInventoryMixin.java b/src/main/java/com/github/briansemrau/cosmeticarmorslots/mixin/common/PlayerInventoryMixin.java index 15dd61e..3b74f7e 100644 --- a/src/main/java/com/github/briansemrau/cosmeticarmorslots/mixin/common/PlayerInventoryMixin.java +++ b/src/main/java/com/github/briansemrau/cosmeticarmorslots/mixin/common/PlayerInventoryMixin.java @@ -9,10 +9,7 @@ import net.minecraft.nbt.ListTag; import net.minecraft.util.DefaultedList; import net.minecraft.util.Nameable; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -56,7 +53,7 @@ public DefaultedList getCosmeticArmor() { @Inject(method = "*", at = @At("RETURN")) public void onConstructed(PlayerEntity playerEntity, CallbackInfo ci) { - cosmeticArmor = DefaultedList.create(4, ItemStack.EMPTY); + cosmeticArmor = DefaultedList.ofSize(4, ItemStack.EMPTY); // Change combinedInventory to a mutable type combinedInventory = new ArrayList<>(combinedInventory); @@ -96,8 +93,11 @@ public void onDeserialize(ListTag listTag_1, CallbackInfo ci) { } } - // Overwrite - public int getInvSize(CallbackInfo ci) { + /** + * @author brian_flakes + */ + @Overwrite + public int getInvSize() { int size = 0; for (DefaultedList list : combinedInventory) { size += list.size();