1.15.2 Port

CHANGELOG.md

@@ -3,9 +3,6 @@
 **1.15.2 Port**
 * Tweak Steadfast Spell
 
-**1.2.5**
-* Fix Casting Table Bug
-
 **1.2.4**
 * Optimize Packets
 * Allow Command Blocks to use ```/spell``` Command

gradle.properties

@@ -10,7 +10,7 @@ org.gradle.jvmargs = -Xmx1G
 	fabric_loader_version = 0.7.8+build.189
 
 # Mod Properties
-	mod_version = 1.2.5
+	mod_version = 1.2.4
 	maven_group = com.thebrokenrail
 	archives_base_name = sorcerycraft
 

src/main/java/com/thebrokenrail/sorcerycraft/client/ModMenu.java

@@ -5,12 +5,8 @@ import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import io.github.prospector.modmenu.api.ConfigScreenFactory;
 import io.github.prospector.modmenu.api.ModMenuApi;
 import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screen.Screen;
 
-@SuppressWarnings("unused")
-@Environment(EnvType.CLIENT)
 public class ModMenu implements ModMenuApi {
     @Override
     public String getModId() {

src/main/java/com/thebrokenrail/sorcerycraft/client/SorceryCraftClient.java

@@ -11,8 +11,6 @@ import me.sargunvohra.mcmods.autoconfig1u.gui.registry.GuiRegistry;
 import me.sargunvohra.mcmods.autoconfig1u.util.Utils;
 import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.fabricmc.fabric.api.client.screen.ScreenProviderRegistry;
 import net.fabricmc.fabric.impl.networking.ClientSidePacketRegistryImpl;
@@ -23,8 +21,6 @@ import net.minecraft.util.math.MathHelper;
 
 import java.util.Collections;
 
-@SuppressWarnings("unused")
-@Environment(EnvType.CLIENT)
 public class SorceryCraftClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {

src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinPlayerEntity.java

@@ -1,6 +1,5 @@
 package com.thebrokenrail.sorcerycraft.mixin;
 
-import com.thebrokenrail.sorcerycraft.gui.CastingTableScreenHandler;
 import com.thebrokenrail.sorcerycraft.spell.util.SpellHelper;
 import com.thebrokenrail.sorcerycraft.spell.util.SpellPlayerEntity;
 import net.minecraft.container.Container;
@@ -36,10 +35,6 @@ public class MixinPlayerEntity implements SpellPlayerEntity {
     @Override
     public void setDiscoveredSpells(Map<Identifier, Integer> spells) {
         this.sorceryCraftDiscoveredSpells = spells;
-        if (container instanceof CastingTableScreenHandler) {
-            //noinspection ConstantConditions
-            ((CastingTableScreenHandler) container).setSpells((PlayerEntity) (Object) this);
-        }
     }
 
     @Override

src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinServerPlayerEntity.java

@@ -5,6 +5,7 @@ import com.thebrokenrail.sorcerycraft.packet.UpdateKnownSpellsS2CPacket;
 import com.thebrokenrail.sorcerycraft.spell.util.SpellHelper;
 import com.thebrokenrail.sorcerycraft.spell.util.SpellPlayerEntity;
 import com.thebrokenrail.sorcerycraft.spell.util.SpellServerPlayerEntity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
@@ -29,9 +30,7 @@ public abstract class MixinServerPlayerEntity extends MixinPlayerEntity implemen
     @Override
     public void setDiscoveredSpells(Map<Identifier, Integer> spells) {
         super.setDiscoveredSpells(spells);
-        if (container instanceof CastingTableScreenHandler) {
-            sync();
-        }
+        sync();
     }
 
     @Override
@@ -40,5 +39,10 @@ public abstract class MixinServerPlayerEntity extends MixinPlayerEntity implemen
         tag.put(SpellHelper.SPELL_TAG, SpellHelper.createSpellsTag(getDiscoveredSpells()));
         //noinspection ConstantConditions
         UpdateKnownSpellsS2CPacket.send((ServerPlayerEntity) (Object) this, tag);
+
+        if (container instanceof CastingTableScreenHandler) {
+            //noinspection ConstantConditions
+            ((CastingTableScreenHandler) container).setSpells((PlayerEntity) (Object) this);
+        }
     }
 }