.gitignore

@@ -22,6 +22,4 @@ bin/
 
 # fabric
 
-run/
+run/
-
-remappedSrc/

API.md

@@ -4,18 +4,17 @@
 1. Add Dependency to Gradle
     ```gradle
     repositories {
-        maven { url 'https://maven.thebrokenrail.com' }
+        maven { url 'https://jitpack.io' }
     }
     dependencies {
-        modImplementation 'com.thebrokenrail:sorcerycraft:VERSION'
+        modImplementation 'com.thebrokenrail:sorcerycraft:1.1.+'
-        // VERSION = "<Mod Version>+<MC Version>", for example "1.2.4+20w12a"
     }
     ```
 2. Add Dependency to ```fabric.mod.json```
     ```json
     {
         "depends": {
-            "sorcerycraft": "1.2.x"
+            "sorcerycraft": "1.1.x"
         }
     }
     ```
@@ -105,11 +104,8 @@
 - ```(non-static) Spell.getID()```
 - ```(static) SpellRegistry.register()```
 
-## API Stability
+## Note on Spell Levels
-APIs are only guaranteed to be stable in the ```com.thebrokenrail.sorcerycraft.api``` package, it is unrecommended to rely on any SorceryCraft classes outside of this package.
-
-## Spell Levels
 Spell levels are 0-indexed, if you have a level 1 Example Spell, ```Spell.getLevel()``` wil return 0, and if it is level 2 ```Spell.getLevel()``` wil return 1, ```Spell.getMaxSpell()``` should be the maximum-acceptable value of ```Spell.getLevel() + 1```, so if Example Spell has levels 1-2, ```Spell.getMaxLevel()``` should return 2.
 
 ## JavaDoc
-[View JavaDoc](https://jenkins.thebrokenrail.com/job/SorceryCraft/job/master/JavaDoc/)
+[View JavaDoc](https://javadoc.jitpack.io/com/thebrokenrail/sorcerycraft/latest/javadoc/index.html)

CHANGELOG.md

@@ -1,40 +1,5 @@
 # Changelog
 
-**1.2.9**
-* Fix Dedicated Server Crash
-
-**1.2.8**
-* Register Loot Table Function
-
-**1.2.7**
-* Fix Cooling Spell Bug
-
-**1.2.6**
-* Fix Potential Client-Server De-sync Bug
-
-**1.2.5**
-* Fix Casting Table Bug
-
-**1.2.4**
-* Optimize Packets
-* Allow Command Blocks to use ```/spell``` Command
-* Namespace Statistics
-
-**1.2.3**
-* Tweak Cooling Spell
-* Tweak Versioning
-
-**1.2.2**
-* Allow ```/spell``` command to work with multiple players
-
-**1.2.1**
-* Fix Launching Without ModMenu
-
-**1.2**
-* Update Mappings
-* Update API (More Consistent Package Names)
-* Fix Bug When Casting Spell
-
 **1.1.21**
 * Update Mappings
 * Tweak Teleport and Flame Spells

Jenkinsfile

@@ -7,32 +7,11 @@ pipeline {
     stages {
         stage('Build') {
             steps {
-                sh './gradlew build javadoc'
+                sh './gradlew build'
             }
             post {
                 success {
                     archiveArtifacts artifacts: 'build/libs/*', fingerprint: true
-
-                    publishHTML target: [
-                        allowMissing: false,
-                        alwaysLinkToLastBuild: false,
-                        keepAll: false,
-                        reportDir: 'build/docs/javadoc',
-                        reportFiles: 'index.html',
-                        reportName: 'JavaDoc'
-                    ]
-                }
-            }
-        }
-        stage('Publish') {
-            when {
-                expression {
-                    return sh(returnStdout: true, script: 'git tag --contains').trim().length() > 0
-                }
-            }
-            steps {
-                withCredentials([string(credentialsId: 'curseforge_key', variable: 'CURSEFORGE_KEY')]) {
-                    sh './gradlew -Pcurseforge.api_key="${CURSEFORGE_KEY}" curseforge publish'
                 }
             }
         }

build.gradle

@@ -1,7 +1,6 @@
 plugins {
-	id 'fabric-loom' version '0.4-SNAPSHOT'
+	id 'fabric-loom' version '0.2.7-SNAPSHOT'
 	id 'com.matthewprenger.cursegradle' version '1.4.0'
-	id 'maven-publish'
 }
 
 compileJava {
@@ -10,8 +9,7 @@ compileJava {
 }
 
 archivesBaseName = project.archives_base_name
-def mod_version = project.mod_version as Object
+version = project.mod_version as Object
-version = "${mod_version}+${project.minecraft_version}"
 group = project.maven_group as Object
 
 minecraft {
@@ -38,12 +36,12 @@ dependencies {
 }
 
 processResources {
-	inputs.property 'version', project.version
+	inputs.property 'version', version
 	inputs.property 'name', rootProject.name
 
 	from(sourceSets.main.resources.srcDirs) {
 		include 'fabric.mod.json'
-		expand 'version': project.version, 'name': rootProject.name
+		expand 'version': version, 'name': rootProject.name
 	}
 
 	from(sourceSets.main.resources.srcDirs) {
@@ -80,23 +78,6 @@ jar {
 	from "LICENSE"
 }
 
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			artifactId archivesBaseName
-
-			artifact(remapJar) {
-				builtBy remapJar
-			}
-		}
-	}
-	repositories {
-		maven {
-			url '/data/maven'
-		}
-	}
-}
-
 if (project.hasProperty('curseforge.api_key')) {
 	curseforge {
 		apiKey = project.getProperty('curseforge.api_key')
@@ -107,7 +88,7 @@ if (project.hasProperty('curseforge.api_key')) {
 			addGameVersion project.simple_minecraft_version
 			addGameVersion 'Fabric'
 			mainArtifact(remapJar) {
-				displayName = "SorceryCraft v${mod_version} for ${project.minecraft_version}"
+				displayName = "SorceryCraft v${version} for ${project.minecraft_version}"
 			}
 			afterEvaluate {
 				uploadTask.dependsOn('remapJar')

gradle.properties

@@ -3,20 +3,20 @@ org.gradle.jvmargs = -Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version = 1.16.4
+	minecraft_version = 20w12a
 	curseforge_id = 365308
-	simple_minecraft_version = 1.16.4
+	simple_minecraft_version = 1.16-Snapshot
-	yarn_build = 7
+	yarn_build = 14
-	fabric_loader_version = 0.10.8
+	fabric_loader_version = 0.7.8+build.189
 
 # Mod Properties
-	mod_version = 1.2.9
+	mod_version = 1.1.21
 	maven_group = com.thebrokenrail
 	archives_base_name = sorcerycraft
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_api_version = 0.28.1+1.16
+	fabric_api_version = 0.5.5+build.311-1.16
-	cloth_config_version = 4.8.3
+	cloth_config_version = 3.1.0-unstable
-	auto_config_version = 3.3.1
+	auto_config_version = 1.2.4
-	mod_menu_version = 1.14.13+build.19
+	mod_menu_version = 1.10.2+build.1

src/main/java/com/thebrokenrail/sorcerycraft/SorceryCraft.java

@@ -6,10 +6,10 @@ import com.thebrokenrail.sorcerycraft.block.CastingTableBlock;
 import com.thebrokenrail.sorcerycraft.command.SpellCommand;
 import com.thebrokenrail.sorcerycraft.entity.SpellEntity;
 import com.thebrokenrail.sorcerycraft.item.SpellItem;
-import com.thebrokenrail.sorcerycraft.mixin.CriteriaRegistryHook;
+import com.thebrokenrail.sorcerycraft.mixin.CriterionRegistryHook;
 import com.thebrokenrail.sorcerycraft.packet.SelectSpellC2SPacket;
 import com.thebrokenrail.sorcerycraft.spell.util.RandomSpellLootTableFunction;
-import com.thebrokenrail.sorcerycraft.spell.api.registry.Spells;
+import com.thebrokenrail.sorcerycraft.spell.registry.Spells;
 import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
 import me.sargunvohra.mcmods.autoconfig1u.serializer.GsonConfigSerializer;
 import net.fabricmc.api.ModInitializer;
@@ -22,9 +22,9 @@ import net.fabricmc.fabric.api.registry.CommandRegistry;
 import net.fabricmc.fabric.impl.networking.ServerSidePacketRegistryImpl;
 import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.dispenser.ProjectileDispenserBehavior;
+import net.minecraft.entity.EntityCategory;
 import net.minecraft.entity.EntityDimensions;
 import net.minecraft.entity.EntityType;
-import net.minecraft.entity.SpawnGroup;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.ProjectileEntity;
 import net.minecraft.item.BlockItem;
@@ -34,7 +34,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.loot.BinomialLootTableRange;
 import net.minecraft.loot.LootTables;
 import net.minecraft.loot.entry.ItemEntry;
-import net.minecraft.loot.function.LootFunctionType;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
@@ -71,9 +70,7 @@ public class SorceryCraft implements ModInitializer {
             LootTables.JUNGLE_TEMPLE_CHEST,
             LootTables.STRONGHOLD_LIBRARY_CHEST,
             LootTables.PILLAGER_OUTPOST_CHEST,
-            LootTables.WOODLAND_MANSION_CHEST,
+            LootTables.WOODLAND_MANSION_CHEST
-            LootTables.BURIED_TREASURE_CHEST,
-            LootTables.FISHING_TREASURE_GAMEPLAY
     };
 
     public static Identifier INTERACT_WITH_CASTING_TABLE_STAT;
@@ -97,7 +94,6 @@ public class SorceryCraft implements ModInitializer {
 
     @Override
     public void onInitialize() {
-        //noinspection InstantiationOfUtilityClass
         new Spells();
 
         AutoConfig.register(ModConfig.class, GsonConfigSerializer::new);
@@ -111,7 +107,7 @@ public class SorceryCraft implements ModInitializer {
         CASTING_TABLE_BLOCK_ITEM = new BlockItem(CASTING_TABLE_BLOCK, new Item.Settings().group(ITEM_GROUP));
         SPELL_ITEM = new SpellItem();
 
-        SPELL_ENTITY = FabricEntityTypeBuilder.create(SpawnGroup.MISC, (EntityType.EntityFactory<SpellEntity>) SpellEntity::new).size(EntityDimensions.fixed(0.25f, 0.25f)).build();
+        SPELL_ENTITY = FabricEntityTypeBuilder.create(EntityCategory.MISC, (EntityType.EntityFactory<SpellEntity>) SpellEntity::new).size(EntityDimensions.fixed(0.25f, 0.25f)).build();
 
         Registry.register(Registry.ITEM, new Identifier(NAMESPACE, "spell"), SPELL_ITEM);
         Registry.register(Registry.BLOCK, new Identifier(NAMESPACE, "casting_table"), CASTING_TABLE_BLOCK);
@@ -131,14 +127,13 @@ public class SorceryCraft implements ModInitializer {
         LootTableLoadingCallback.EVENT.register((resourceManager, lootManager, id, supplier, setter) -> {
             if (isSelectedLootTable(id)) {
                 FabricLootPoolBuilder poolBuilder = FabricLootPoolBuilder.builder()
-                        .rolls(new BinomialLootTableRange(2, 0.5f))
+                        .withRolls(new BinomialLootTableRange(2, 0.5f))
-                        .withEntry(ItemEntry.builder(SPELL_ITEM).build())
+                        .withEntry(ItemEntry.builder(SPELL_ITEM))
-                        .withFunction(new RandomSpellLootTableFunction.Builder().build());
+                        .withFunction(new RandomSpellLootTableFunction.Builder());
 
-                supplier.withPool(poolBuilder.build());
+                supplier.withPool(poolBuilder);
             }
         });
-        Registry.register(Registry.LOOT_FUNCTION_TYPE, new Identifier(NAMESPACE, "random_spell"), new LootFunctionType(new RandomSpellLootTableFunction.Factory()));
 
         DispenserBlock.registerBehavior(SorceryCraft.SPELL_ITEM, new ProjectileDispenserBehavior() {
             @Override
@@ -157,13 +152,13 @@ public class SorceryCraft implements ModInitializer {
         INTERACT_WITH_CASTING_TABLE_STAT = registerStat("interact_with_casting_table");
         CAST_SPELL_STAT = registerStat("cast_spell");
 
-        DISCOVER_ALL_SPELLS_CRITERION = CriteriaRegistryHook.callRegister(new DiscoverAllSpellsCriterion());
+        DISCOVER_ALL_SPELLS_CRITERION = CriterionRegistryHook.callRegister(new DiscoverAllSpellsCriterion());
-        CREATE_SPELL_CRITERION = CriteriaRegistryHook.callRegister(new CreateSpellCriterion());
+        CREATE_SPELL_CRITERION = CriterionRegistryHook.callRegister(new CreateSpellCriterion());
     }
 
     private Identifier registerStat(String name) {
         Identifier statID = new Identifier(NAMESPACE, name);
-        Registry.register(Registry.CUSTOM_STAT, statID, statID);
+        Registry.register(Registry.CUSTOM_STAT, name, statID);
         Stats.CUSTOM.getOrCreateStat(statID, StatFormatter.DEFAULT);
         return statID;
     }

src/main/java/com/thebrokenrail/sorcerycraft/advancement/CreateSpellCriterion.java

@@ -1,11 +1,10 @@
 package com.thebrokenrail.sorcerycraft.advancement;
 
+import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import net.minecraft.advancement.criterion.AbstractCriterion;
 import net.minecraft.advancement.criterion.AbstractCriterionConditions;
-import net.minecraft.predicate.entity.AdvancementEntityPredicateDeserializer;
-import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
 
@@ -15,23 +14,21 @@ public class CreateSpellCriterion extends AbstractCriterion<CreateSpellCriterion
     public CreateSpellCriterion() {
     }
 
-    @Override
-    protected Conditions conditionsFromJson(JsonObject obj, EntityPredicate.Extended playerPredicate, AdvancementEntityPredicateDeserializer predicateDeserializer) {
-        return new CreateSpellCriterion.Conditions(playerPredicate);
-    }
-
-    @Override
     public Identifier getId() {
         return ID;
     }
 
+    public CreateSpellCriterion.Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) {
+        return new CreateSpellCriterion.Conditions();
+    }
+
     public void trigger(ServerPlayerEntity player) {
-        test(player, (conditions) -> true);
+        test(player.getAdvancementTracker(), (conditions) -> true);
     }
 
     public static class Conditions extends AbstractCriterionConditions {
-        public Conditions(EntityPredicate.Extended player) {
+        public Conditions() {
-            super(ID, player);
+            super(ID);
         }
     }
 }

src/main/java/com/thebrokenrail/sorcerycraft/advancement/DiscoverAllSpellsCriterion.java

@@ -1,14 +1,13 @@
 package com.thebrokenrail.sorcerycraft.advancement;
 
+import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.spell.api.Spell;
-import com.thebrokenrail.sorcerycraft.spell.api.registry.SpellRegistry;
+import com.thebrokenrail.sorcerycraft.spell.registry.SpellRegistry;
 import com.thebrokenrail.sorcerycraft.spell.util.SpellPlayerEntity;
 import net.minecraft.advancement.criterion.AbstractCriterion;
 import net.minecraft.advancement.criterion.AbstractCriterionConditions;
-import net.minecraft.predicate.entity.AdvancementEntityPredicateDeserializer;
-import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
 
@@ -20,18 +19,16 @@ public class DiscoverAllSpellsCriterion extends AbstractCriterion<DiscoverAllSpe
     public DiscoverAllSpellsCriterion() {
     }
 
-    @Override
     public Identifier getId() {
         return ID;
     }
 
-    @Override
+    public DiscoverAllSpellsCriterion.Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) {
-    protected DiscoverAllSpellsCriterion.Conditions conditionsFromJson(JsonObject obj, EntityPredicate.Extended playerPredicate, AdvancementEntityPredicateDeserializer predicateDeserializer) {
+        return new DiscoverAllSpellsCriterion.Conditions();
-        return new DiscoverAllSpellsCriterion.Conditions(playerPredicate);
     }
 
     public void trigger(ServerPlayerEntity player) {
-        test(player, (conditions) -> {
+        test(player.getAdvancementTracker(), (conditions) -> {
             SpellPlayerEntity spellPlayer = (SpellPlayerEntity) player;
             Map<Identifier, Integer> spells = spellPlayer.getDiscoveredSpells();
             Spell[] maxSpells = SpellRegistry.getMaxSpells();
@@ -47,8 +44,8 @@ public class DiscoverAllSpellsCriterion extends AbstractCriterion<DiscoverAllSpe
     }
 
     public static class Conditions extends AbstractCriterionConditions {
-        public Conditions(EntityPredicate.Extended player) {
+        public Conditions() {
-            super(ID, player);
+            super(ID);
         }
     }
 }

src/main/java/com/thebrokenrail/sorcerycraft/block/CastingTableBlock.java

@@ -2,7 +2,6 @@ package com.thebrokenrail.sorcerycraft.block;
 
 import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.gui.CastingTableScreenHandler;
-import com.thebrokenrail.sorcerycraft.spell.util.SpellServerPlayerEntity;
 import net.fabricmc.fabric.api.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.container.ContainerProviderRegistry;
 import net.minecraft.block.Block;
@@ -37,11 +36,6 @@ public class CastingTableBlock extends Block {
 
     @Override
     public NamedScreenHandlerFactory createScreenHandlerFactory(BlockState state, World world, BlockPos pos) {
-        return new SimpleNamedScreenHandlerFactory((i, playerInventory, playerEntity) -> {
+        return new SimpleNamedScreenHandlerFactory((i, playerInventory, playerEntity) -> new CastingTableScreenHandler(i, playerInventory, ScreenHandlerContext.create(world, pos)), new TranslatableText("container." + SorceryCraft.NAMESPACE + ".casting_table"));
-            if (!playerEntity.getEntityWorld().isClient()) {
-                ((SpellServerPlayerEntity) playerEntity).sync();
-            }
-            return new CastingTableScreenHandler(i, playerInventory, ScreenHandlerContext.create(world, pos));
-        }, new TranslatableText("container." + SorceryCraft.NAMESPACE + ".casting_table"));
     }
 }

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

@@ -1,24 +0,0 @@
-package com.thebrokenrail.sorcerycraft.client;
-
-import com.thebrokenrail.sorcerycraft.ModConfig;
-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() {
-        return SorceryCraft.NAMESPACE;
-    }
-
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return (ConfigScreenFactory<Screen>) screen -> AutoConfig.getConfigScreen(ModConfig.class, screen).get();
-    }
-}

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

@@ -6,33 +6,31 @@ import com.thebrokenrail.sorcerycraft.client.entity.SpellEntityRenderer;
 import com.thebrokenrail.sorcerycraft.client.gui.CastingTableScreen;
 import com.thebrokenrail.sorcerycraft.gui.CastingTableScreenHandler;
 import com.thebrokenrail.sorcerycraft.packet.UpdateKnownSpellsS2CPacket;
+import io.github.prospector.modmenu.api.ConfigScreenFactory;
+import io.github.prospector.modmenu.api.ModMenuApi;
 import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
 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;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.LiteralText;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
 
 import java.util.Collections;
 
-@SuppressWarnings("unused")
+public class SorceryCraftClient implements ClientModInitializer, ModMenuApi {
-@Environment(EnvType.CLIENT)
-public class SorceryCraftClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         GuiRegistry guiRegistry = AutoConfig.getGuiRegistry(ModConfig.class);
         guiRegistry.registerAnnotationProvider((s, field, config, defaults, guiRegistryAccess) -> {
             ModConfig.UsePercentage bounds = field.getAnnotation(ModConfig.UsePercentage.class);
-            return Collections.singletonList(ConfigEntryBuilder.create().startIntSlider(new TranslatableText(s), MathHelper.ceil(Utils.getUnsafely(field, config, 0.0) * 100), MathHelper.ceil(bounds.min() * 100), MathHelper.ceil(bounds.max() * 100)).setDefaultValue(() -> MathHelper.ceil((double) Utils.getUnsafely(field, defaults) * 100)).setSaveConsumer((newValue) -> Utils.setUnsafely(field, config, newValue / 100d)).setTextGetter(integer -> new LiteralText(String.format("%d%%", integer))).build());
+            return Collections.singletonList(ConfigEntryBuilder.create().startIntSlider(s, MathHelper.ceil(Utils.getUnsafely(field, config, 0.0) * 100), MathHelper.ceil(bounds.min() * 100), MathHelper.ceil(bounds.max() * 100)).setDefaultValue(() -> MathHelper.ceil((double) Utils.getUnsafely(field, defaults) * 100)).setSaveConsumer((newValue) -> Utils.setUnsafely(field, config, newValue / 100d)).setTextGetter(integer -> String.format("%d%%", integer)).build());
         }, field -> field.getType() == Double.TYPE || field.getType() == Double.class, ModConfig.UsePercentage.class);
 
         EntityRendererRegistry.INSTANCE.register(SorceryCraft.SPELL_ENTITY, (entityRenderDispatcher, context) -> new SpellEntityRenderer(entityRenderDispatcher));
@@ -43,4 +41,14 @@ public class SorceryCraftClient implements ClientModInitializer {
 
         ClientSidePacketRegistryImpl.INSTANCE.register(new Identifier(SorceryCraft.NAMESPACE, "update_known_spells"), UpdateKnownSpellsS2CPacket::handle);
     }
+
+    @Override
+    public String getModId() {
+        return SorceryCraft.NAMESPACE;
+    }
+
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return (ConfigScreenFactory<Screen>) screen -> AutoConfig.getConfigScreen(ModConfig.class, screen).get();
+    }
 }

src/main/java/com/thebrokenrail/sorcerycraft/client/gui/CastingTableScreen.java

@@ -5,15 +5,14 @@ import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.gui.CastingTableScreenHandler;
 import com.thebrokenrail.sorcerycraft.packet.SelectSpellC2SPacket;
 import com.thebrokenrail.sorcerycraft.spell.api.Spell;
-import com.thebrokenrail.sorcerycraft.spell.util.SpellHelper;
+import com.thebrokenrail.sorcerycraft.spell.util.SpellTag;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Identifier;
@@ -22,9 +21,9 @@ import net.minecraft.util.math.MathHelper;
 @Environment(EnvType.CLIENT)
 public class CastingTableScreen extends HandledScreen<CastingTableScreenHandler> {
     private static final Identifier TEXTURE = new Identifier("textures/gui/container/villager2.png");
-    private int selectedIndex = 0;
+    private int selectedIndex;
-    private int indexStartOffset = 0;
+    private int indexStartOffset;
-    private boolean scrolling = false;
+    private boolean scrolling;
 
     public CastingTableScreen(CastingTableScreenHandler container, PlayerInventory inventory, Text title) {
         super(container, inventory, title);
@@ -32,52 +31,47 @@ public class CastingTableScreen extends HandledScreen<CastingTableScreenHandler>
     }
 
     @Override
-    protected void drawForeground(MatrixStack matrixStack, int i, int j) {
+    protected void drawForeground(int mouseX, int mouseY) {
         int titleY = backgroundHeight - 94;
-        textRenderer.draw(matrixStack, title, (float) (49 + this.backgroundWidth / 2 - textRenderer.getWidth(title) / 2), 6.0F, 4210752);
+        textRenderer.draw(title.asFormattedString(), (float) (49 + this.backgroundWidth / 2 - textRenderer.getStringWidth(title.asFormattedString()) / 2), 6.0F, 4210752);
-        textRenderer.draw(matrixStack, playerInventory.getDisplayName(), 107.0F, (float) titleY, 4210752);
+        textRenderer.draw(playerInventory.getDisplayName().asFormattedString(), 107.0F, (float) titleY, 4210752);
-        Text spells = new TranslatableText("container." + SorceryCraft.NAMESPACE + ".spells");
+        String spells = new TranslatableText("container." + SorceryCraft.NAMESPACE + ".spells").getString();
-        textRenderer.draw(matrixStack, spells, (float) (5 - textRenderer.getWidth(spells) / 2 + 48), 6.0F, 4210752);
+        textRenderer.draw(spells, (float) (5 - textRenderer.getStringWidth(spells) / 2 + 48), 6.0F, 4210752);
-        renderXPCost(matrixStack);
+        renderXPCost();
-    }
-
-    public void resetIndex() {
-        selectedIndex = 0;
-        indexStartOffset = 0;
     }
 
     @Override
-    protected void drawBackground(MatrixStack matrixStack, float delta, int mouseX, int mouseY) {
+    protected void drawBackground(float delta, int mouseX, int mouseY) {
         RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
         assert client != null;
         client.getTextureManager().bindTexture(TEXTURE);
         int i = (width - backgroundWidth) / 2;
         int j = (height - backgroundHeight) / 2;
-        drawTexture(matrixStack, i, j, getZOffset(), 0.0F, 0.0F, backgroundWidth, backgroundHeight, 256, 512);
+        drawTexture(i, j, getZOffset(), 0.0F, 0.0F, backgroundWidth, backgroundHeight, 256, 512);
     }
 
     @Override
-    public void render(MatrixStack matrixStack, int mouseX, int mouseY, float delta) {
+    public void render(int mouseX, int mouseY, float delta) {
-        renderBackground(matrixStack);
+        renderBackground();
-        super.render(matrixStack, mouseX, mouseY, delta);
+        super.render(mouseX, mouseY, delta);
-        drawMouseoverTooltip(matrixStack, mouseX, mouseY);
+        drawMouseoverTooltip(mouseX, mouseY);
 
-        renderScrollbar(matrixStack);
+        renderScrollbar();
         renderItems();
 
         for (WidgetButtonPage button : buttons) {
             if (button.isHovered()) {
-                button.renderToolTip(matrixStack, mouseX, mouseY);
+                button.renderToolTip(mouseX, mouseY);
             }
             button.visible = button.index < handler.getRecipes().length;
             if (button.visible) {
                 Spell spell = handler.getRecipes()[button.getIndex() + indexStartOffset];
-                button.setMessage(SpellHelper.getTranslatedSpell(spell.getID(), spell.getLevel()));
+                button.setMessage(SpellTag.getTranslatedSpell(spell.getID(), spell.getLevel()).getString());
             }
         }
     }
 
-    private void renderScrollbar(MatrixStack matrixStack) {
+    private void renderScrollbar() {
         Spell[] spells = handler.getRecipes();
         assert client != null;
         client.getTextureManager().bindTexture(TEXTURE);
@@ -87,9 +81,9 @@ public class CastingTableScreen extends HandledScreen<CastingTableScreenHandler>
 
         if (k > 0) {
             int modifier = (int) (((float) indexStartOffset / k) * (1 + 139 - 27));
-            drawTexture(matrixStack, i + 94, j + 18 + modifier, getZOffset(), 0.0F, 199.0F, 6, 27, 256, 512);
+            drawTexture(i + 94, j + 18 + modifier, getZOffset(), 0.0F, 199.0F, 6, 27, 256, 512);
         } else {
-            drawTexture(matrixStack, i + 94, j + 18, getZOffset(), 6.0F, 199.0F, 6, 27, 256, 512);
+            drawTexture(i + 94, j + 18, getZOffset(), 6.0F, 199.0F, 6, 27, 256, 512);
         }
     }
 
@@ -105,7 +99,7 @@ public class CastingTableScreen extends HandledScreen<CastingTableScreenHandler>
                 itemRenderer.zOffset = 100.0F;
                 int y = k + 2;
 
-                itemRenderer.renderInGuiWithOverrides(itemStack, i + 5 + 68, y);
+                itemRenderer.renderGuiItem(itemStack, i + 5 + 68, y);
                 itemRenderer.renderGuiItemOverlay(textRenderer, itemStack, i + 5 + 68, y);
                 itemRenderer.zOffset = 0.0F;
                 k += 20;
@@ -113,21 +107,21 @@ public class CastingTableScreen extends HandledScreen<CastingTableScreenHandler>
         }
     }
 
-    private void renderXPCost(MatrixStack matrixStack) {
+    private void renderXPCost() {
         if (handler.getRecipes().length > 0) {
             int cost = handler.getRecipes()[selectedIndex].getXPCost();
             int color = 8453920;
             assert client != null;
             assert client.player != null;
-            Text string = new TranslatableText("container.repair.cost", cost);
+            String string = new TranslatableText("container.repair.cost", cost).getString();
             if (!handler.canTakeResult(playerInventory.player)) {
                 color = 16736352;
             }
 
             int x2 = backgroundWidth - 8;
-            int x1 = x2 - textRenderer.getWidth(string);
+            int x1 = x2 - textRenderer.getStringWidth(string);
-            fill(matrixStack, x1, 65, x2, 77, 1325400064);
+            fill(x1, 65, x2, 77, 1325400064);
-            textRenderer.drawWithShadow(matrixStack, string, (float) x1, 67.0F, color);
+            textRenderer.drawWithShadow(string, (float) x1, 67.0F, color);
         }
     }
 
@@ -200,32 +194,37 @@ public class CastingTableScreen extends HandledScreen<CastingTableScreenHandler>
     }
 
     @Environment(EnvType.CLIENT)
-    public class WidgetButtonPage extends ButtonWidget {
+    private class WidgetButtonPage extends ButtonWidget {
         final int index;
 
         public WidgetButtonPage(int i, int j, int k, PressAction pressAction) {
-            super(i, j, 89, 20, new LiteralText(""), pressAction);
+            super(i, j, 89, 20, "", pressAction);
             index = k;
             visible = false;
         }
 
         @Override
-        public void render(MatrixStack matrixStack, int mouseX, int mouseY, float delta) {
+        public void render(int mouseX, int mouseY, float delta) {
             active = (index + CastingTableScreen.this.indexStartOffset) != CastingTableScreen.this.selectedIndex;
-            super.render(matrixStack, mouseX, mouseY, delta);
+            super.render(mouseX, mouseY, delta);
         }
 
         public int getIndex() {
             return this.index;
         }
 
-        public void renderToolTip(MatrixStack matrixStack, int mouseX, int mouseY) {
+        public void renderToolTip(int mouseX, int mouseY) {
             if (hovered && handler.getRecipes().length > index + indexStartOffset && mouseX > this.x + 65) {
                 ItemStack itemStack = handler.getRecipes()[index + indexStartOffset].getItemCost();
                 if (!itemStack.isEmpty()) {
-                    renderTooltip(matrixStack, itemStack, mouseX, mouseY);
+                    renderTooltip(itemStack, mouseX, mouseY);
                 }
             }
         }
+
+        @Override
+        public void drawCenteredString(TextRenderer textRenderer, String str, int centerX, int y, int color) {
+            drawString(textRenderer, str, x + 5, y, color);
+        }
     }
 }

src/main/java/com/thebrokenrail/sorcerycraft/command/SpellArgumentType.java

@@ -13,8 +13,8 @@ import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.spell.api.Spell;
-import com.thebrokenrail.sorcerycraft.spell.api.registry.SpellRegistry;
+import com.thebrokenrail.sorcerycraft.spell.registry.SpellRegistry;
-import net.minecraft.command.CommandSource;
+import net.minecraft.server.command.CommandSource;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Identifier;

src/main/java/com/thebrokenrail/sorcerycraft/command/SpellCommand.java

@@ -5,20 +5,18 @@ import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
 import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.spell.api.Spell;
-import com.thebrokenrail.sorcerycraft.spell.api.registry.SpellRegistry;
+import com.thebrokenrail.sorcerycraft.spell.registry.SpellRegistry;
-import com.thebrokenrail.sorcerycraft.spell.util.SpellHelper;
 import com.thebrokenrail.sorcerycraft.spell.util.SpellPlayerEntity;
-import net.minecraft.command.argument.EntityArgumentType;
+import com.thebrokenrail.sorcerycraft.spell.util.SpellTag;
+import net.minecraft.command.arguments.EntityArgumentType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Texts;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Identifier;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,147 +25,120 @@ public class SpellCommand {
 
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
         dispatcher.register(CommandManager.literal("spell")
-                .requires(source -> source.hasPermissionLevel(2))
+                .requires(source -> source.hasPermissionLevel(4))
                 .then(CommandManager.literal("list")
-                        .then(CommandManager.argument("player", EntityArgumentType.players())
+                        .then(CommandManager.argument("player", EntityArgumentType.player())
                             .executes(ctx -> {
-                                int i = 0;
+                                PlayerEntity player = EntityArgumentType.getPlayer(ctx, "player");
-                                Collection<ServerPlayerEntity> players = EntityArgumentType.getPlayers(ctx, "player");
+                                SpellPlayerEntity spellPlayer = (SpellPlayerEntity) player;
-                                for (PlayerEntity player : players) {
+                                Map<Identifier, Integer> spellMap = spellPlayer.getDiscoveredSpells();
-                                    SpellPlayerEntity spellPlayer = (SpellPlayerEntity) player;
+                                ctx.getSource().sendFeedback(new TranslatableText("command." + SorceryCraft.NAMESPACE + ".spell.listing_spells", player.getDisplayName(), Texts.join(spellMap.entrySet(), spell -> SpellTag.getTranslatedSpell(spell.getKey(), spell.getValue()))), false);
-                                    Map<Identifier, Integer> spellMap = spellPlayer.getDiscoveredSpells();
+                                return 0;
-                                    ctx.getSource().sendFeedback(new TranslatableText("command." + SorceryCraft.NAMESPACE + ".spell.listing_spells", player.getDisplayName(), Texts.join(spellMap.entrySet(), spell -> SpellHelper.getTranslatedSpell(spell.getKey(), spell.getValue()))), false);
-                                    i++;
-                                }
-                                return i;
                             })
                         )
                 )
                 .then(CommandManager.literal("forget")
-                        .then(CommandManager.argument("player", EntityArgumentType.players())
+                        .then(CommandManager.argument("player", EntityArgumentType.player())
                                 .executes(ctx -> {
-                                    int i = 0;
+                                    PlayerEntity player = EntityArgumentType.getPlayer(ctx, "player");
-                                    Collection<ServerPlayerEntity> players = EntityArgumentType.getPlayers(ctx, "player");
+                                    SpellPlayerEntity spellPlayer = (SpellPlayerEntity) player;
-                                    for (PlayerEntity player : players) {
+                                    Map<Identifier, Integer> spells = spellPlayer.getDiscoveredSpells();
-                                        SpellPlayerEntity spellPlayer = (SpellPlayerEntity) player;
+                                    for (Map.Entry<Identifier, Integer> entry : spells.entrySet()) {
-                                        Map<Identifier, Integer> spells = spellPlayer.getDiscoveredSpells();
+                                        ctx.getSource().sendFeedback(new TranslatableText("command." + SorceryCraft.NAMESPACE + ".spell.forgotten_spell", player.getDisplayName(), SpellTag.getTranslatedSpellChat(entry.getKey(), entry.getValue())), true);
-                                        for (Map.Entry<Identifier, Integer> entry : spells.entrySet()) {
-                                            ctx.getSource().sendFeedback(new TranslatableText("command." + SorceryCraft.NAMESPACE + ".spell.forgotten_spell", player.getDisplayName(), SpellHelper.getTranslatedSpellChat(entry.getKey(), entry.getValue())), true);
-                                            i++;
-                                        }
-                                        spellPlayer.setDiscoveredSpells(new HashMap<>());
                                     }
-                                    return i;
+                                    spellPlayer.setDiscoveredSpells(new HashMap<>());
+                                    return 1;
                                 })
                                 .then(CommandManager.argument("spell", SpellArgumentType.spell())
                                         .executes(ctx -> {
-                                            int i = 0;
+                                            PlayerEntity player = EntityArgumentType.getPlayer(ctx, "player");
-                                            Collection<ServerPlayerEntity> players = EntityArgumentType.getPlayers(ctx, "player");
+                                            Identifier spell = SpellArgumentType.getSpell(ctx, "spell");
-                                            for (PlayerEntity player : players) {
+                                            SpellPlayerEntity spellPlayer = (SpellPlayerEntity) player;
-                                                Identifier spell = SpellArgumentType.getSpell(ctx, "spell");
+                                            Map<Identifier, Integer> spells = spellPlayer.getDiscoveredSpells();
-                                                SpellPlayerEntity spellPlayer = (SpellPlayerEntity) player;
+                                            if (spells.containsKey(spell)) {
-                                                Map<Identifier, Integer> spells = spellPlayer.getDiscoveredSpells();
+                                                ctx.getSource().sendFeedback(new TranslatableText("command." + SorceryCraft.NAMESPACE + ".spell.forgotten_spell", player.getDisplayName(), SpellTag.getTranslatedSpellChat(spell, spells.get(spell))), true);
-                                                if (spells.containsKey(spell)) {
+                                                spells.remove(spell);
-                                                    ctx.getSource().sendFeedback(new TranslatableText("command." + SorceryCraft.NAMESPACE + ".spell.forgotten_spell", player.getDisplayName(), SpellHelper.getTranslatedSpellChat(spell, spells.get(spell))), true);
-                                                    spells.remove(spell);
-                                                    i++;
-                                                }
-                                                spellPlayer.setDiscoveredSpells(spells);
                                             }
-                                            return i;
+                                            spellPlayer.setDiscoveredSpells(spells);
+                                            return 1;
                                         })
                                 )
                         )
                 )
                 .then(CommandManager.literal("discover")
-                        .then(CommandManager.argument("player", EntityArgumentType.players())
+                        .then(CommandManager.argument("player", EntityArgumentType.player())
                                 .executes(ctx -> {
-                                    int i = 0;
+                                    PlayerEntity player = EntityArgumentType.getPlayer(ctx, "player");
-                                    Collection<ServerPlayerEntity> players = EntityArgumentType.getPlayers(ctx, "player");
+                                    Map<Identifier, Integer> spellMap = new HashMap<>();
-                                    for (PlayerEntity player : players) {
+                                    Spell[] maxSpells = SpellRegistry.getMaxSpells();
-                                        Map<Identifier, Integer> spellMap = new HashMap<>();
+                                    for (Spell spell : maxSpells) {
-                                        Spell[] maxSpells = SpellRegistry.getMaxSpells();
+                                        spellMap.put(spell.getID(), spell.getLevel());
-                                        for (Spell spell : maxSpells) {
-                                            spellMap.put(spell.getID(), spell.getLevel());
-                                            i++;
-                                        }
-                                        SpellHelper.learnSpells(player, spellMap);
                                     }
-                                    return i;
+                                    SpellTag.learnSpells(player, spellMap);
+                                    return 1;
                                 })
                                 .then(CommandManager.argument("spell", SpellArgumentType.spell())
                                         .then(CommandManager.argument("level", IntegerArgumentType.integer())
                                                 .executes(ctx -> {
-                                                    int i = 0;
+                                                    PlayerEntity player = EntityArgumentType.getPlayer(ctx, "player");
-                                                    Collection<ServerPlayerEntity> players = EntityArgumentType.getPlayers(ctx, "player");
+                                                    Identifier spell = SpellArgumentType.getSpell(ctx, "spell");
-                                                    for (PlayerEntity player : players) {
+                                                    int level = IntegerArgumentType.getInteger(ctx, "level") - 1;
-                                                        Identifier spell = SpellArgumentType.getSpell(ctx, "spell");
+                                                    Map<Identifier, Integer> spellMap = new HashMap<>();
-                                                        int level = IntegerArgumentType.getInteger(ctx, "level") - 1;
+                                                    spellMap.put(spell, level);
-                                                        Map<Identifier, Integer> spellMap = new HashMap<>();
+                                                    SpellTag.learnSpells(player, spellMap);
-                                                        spellMap.put(spell, level);
+                                                    return 1;
-                                                        i++;
-                                                        SpellHelper.learnSpells(player, spellMap);
-                                                    }
-                                                    return i;
                                                 })
                                         )
                                 )
                         )
                 )
                 .then(CommandManager.literal("apply")
-                        .then(CommandManager.argument("player", EntityArgumentType.players())
+                        .then(CommandManager.argument("player", EntityArgumentType.player())
                                 .then(CommandManager.argument("spell", SpellArgumentType.spell())
                                         .then(CommandManager.argument("level", IntegerArgumentType.integer())
                                                 .executes(ctx -> {
-                                                    int i = 0;
+                                                    PlayerEntity player = EntityArgumentType.getPlayer(ctx, "player");
-                                                    Collection<ServerPlayerEntity> players = EntityArgumentType.getPlayers(ctx, "player");
+                                                    Identifier spell = SpellArgumentType.getSpell(ctx, "spell");
-                                                    for (PlayerEntity player : players) {
+                                                    int level = IntegerArgumentType.getInteger(ctx, "level") - 1;
-                                                        Identifier spell = SpellArgumentType.getSpell(ctx, "spell");
-                                                        int level = IntegerArgumentType.getInteger(ctx, "level") - 1;
 
-                                                        ItemStack stack = player.getMainHandStack();
+                                                    ItemStack stack = player.getMainHandStack();
 
-                                                        if (stack.getItem() != SorceryCraft.SPELL_ITEM) {
+                                                    if (stack.getItem() != SorceryCraft.SPELL_ITEM) {
-                                                            throw NOT_HOLDING_SPELL_EXCEPTION.create(player);
+                                                        throw NOT_HOLDING_SPELL_EXCEPTION.create(player);
-                                                        }
-
-                                                        Map<Identifier, Integer> spellMap = SpellHelper.getSpells(stack);
-                                                        spellMap.put(spell, level);
-                                                        i++;
-                                                        SpellHelper.setSpells(stack, spellMap);
-
-                                                        ctx.getSource().sendFeedback(new TranslatableText("command." + SorceryCraft.NAMESPACE + ".spell.applied_spell", SpellHelper.getTranslatedSpell(spell, level)), true);
                                                     }
-                                                    return i;
+
+                                                    Map<Identifier, Integer> spellMap = SpellTag.getSpells(stack);
+                                                    spellMap.put(spell, level);
+                                                    SpellTag.setSpells(stack, spellMap);
+
+                                                    ctx.getSource().sendFeedback(new TranslatableText("command." + SorceryCraft.NAMESPACE + ".spell.applied_spell", SpellTag.getTranslatedSpell(spell, level)), true);
+                                                    return 1;
                                                 })
                                         )
                                 )
                         )
                 )
                 .then(CommandManager.literal("remove")
-                        .then(CommandManager.argument("player", EntityArgumentType.players())
+                        .then(CommandManager.argument("player", EntityArgumentType.player())
                                 .then(CommandManager.argument("spell", SpellArgumentType.spell())
                                         .executes(ctx -> {
-                                            int i = 0;
+                                            PlayerEntity player = EntityArgumentType.getPlayer(ctx, "player");
-                                            Collection<ServerPlayerEntity> players = EntityArgumentType.getPlayers(ctx, "player");
+                                            Identifier spell = SpellArgumentType.getSpell(ctx, "spell");
-                                            for (PlayerEntity player : players) {
-                                                Identifier spell = SpellArgumentType.getSpell(ctx, "spell");
 
-                                                ItemStack stack = player.getMainHandStack();
+                                            ItemStack stack = player.getMainHandStack();
 
-                                                if (stack.getItem() != SorceryCraft.SPELL_ITEM) {
+                                            if (stack.getItem() != SorceryCraft.SPELL_ITEM) {
-                                                    throw NOT_HOLDING_SPELL_EXCEPTION.create(player);
+                                                throw NOT_HOLDING_SPELL_EXCEPTION.create(player);
-                                                }
-
-                                                Map<Identifier, Integer> spellMap = SpellHelper.getSpells(stack);
-                                                if (spellMap.containsKey(spell)) {
-                                                    ctx.getSource().sendFeedback(new TranslatableText("command." + SorceryCraft.NAMESPACE + ".spell.removed_spell", SpellHelper.getTranslatedSpell(spell, spellMap.get(spell))), true);
-                                                    spellMap.remove(spell);
-                                                    i++;
-                                                }
-                                                SpellHelper.setSpells(stack, spellMap);
                                             }
-                                            return i;
+
+                                            Map<Identifier, Integer> spellMap = SpellTag.getSpells(stack);
+                                            if (spellMap.containsKey(spell)) {
+                                                ctx.getSource().sendFeedback(new TranslatableText("command." + SorceryCraft.NAMESPACE + ".spell.removed_spell", SpellTag.getTranslatedSpell(spell, spellMap.get(spell))), true);
+                                                spellMap.remove(spell);
+                                            }
+                                            SpellTag.setSpells(stack, spellMap);
+
+                                            return 1;
                                         })
                                 )
                         )

src/main/java/com/thebrokenrail/sorcerycraft/entity/SpellEntity.java

@@ -2,9 +2,9 @@ package com.thebrokenrail.sorcerycraft.entity;
 
 import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.spell.api.Spell;
-import com.thebrokenrail.sorcerycraft.spell.api.registry.SpellRegistry;
+import com.thebrokenrail.sorcerycraft.spell.registry.SpellRegistry;
-import com.thebrokenrail.sorcerycraft.spell.util.SpellHelper;
+import com.thebrokenrail.sorcerycraft.spell.util.SpellTag;
-import com.thebrokenrail.sorcerycraft.spell.api.registry.Spells;
+import com.thebrokenrail.sorcerycraft.spell.registry.Spells;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
@@ -28,7 +28,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-@SuppressWarnings("unused")
 public class SpellEntity extends ThrownItemEntity {
     public SpellEntity(EntityType<SpellEntity> entityType, World world) {
         super(entityType, world);
@@ -42,19 +41,14 @@ public class SpellEntity extends ThrownItemEntity {
         super(SorceryCraft.SPELL_ENTITY, x, y, z, world);
     }
 
-    public SpellEntity(World world) {
-        super(SorceryCraft.SPELL_ENTITY, world);
-    }
-
     private boolean didSpellSucceed(Map<Identifier, Integer> spells) {
         return Math.random() > SorceryCraft.getConfig().failureChance || spells.containsKey(Spells.STEADFAST_SPELL);
     }
 
     @Override
     protected void onCollision(HitResult hitResult) {
-        super.onCollision(hitResult);
         if (!getEntityWorld().isClient()) {
-            Map<Identifier, Integer> spells = SpellHelper.getSpells(getItem());
+            Map<Identifier, Integer> spells = SpellTag.getSpells(getItem());
             if (!spells.containsKey(Spells.INWARD_SPELL)) {
                 boolean success = didSpellSucceed(spells);
                 for (Map.Entry<Identifier, Integer> entry : spells.entrySet()) {
@@ -86,7 +80,7 @@ public class SpellEntity extends ThrownItemEntity {
     public void tick() {
         super.tick();
         if (!getEntityWorld().isClient()) {
-            Map<Identifier, Integer> spells = SpellHelper.getSpells(getItem());
+            Map<Identifier, Integer> spells = SpellTag.getSpells(getItem());
             if (spells.containsKey(Spells.INWARD_SPELL)) {
                 if (getOwner() != null) {
                     boolean success = didSpellSucceed(spells);

src/main/java/com/thebrokenrail/sorcerycraft/gui/CastingTableScreenHandler.java

@@ -3,13 +3,13 @@ package com.thebrokenrail.sorcerycraft.gui;
 import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.spell.api.Spell;
 import com.thebrokenrail.sorcerycraft.spell.util.SpellPlayerEntity;
-import com.thebrokenrail.sorcerycraft.spell.api.registry.SpellRegistry;
+import com.thebrokenrail.sorcerycraft.spell.registry.SpellRegistry;
-import com.thebrokenrail.sorcerycraft.spell.util.SpellHelper;
+import com.thebrokenrail.sorcerycraft.spell.util.SpellTag;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.BasicInventory;
 import net.minecraft.inventory.CraftingResultInventory;
 import net.minecraft.inventory.Inventory;
-import net.minecraft.inventory.SimpleInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.screen.ScreenHandlerContext;
@@ -28,14 +28,14 @@ import java.util.function.BiConsumer;
 public class CastingTableScreenHandler extends ScreenHandler {
     private final Inventory inventory;
     private final Inventory result;
-    private Spell[] spells = new Spell[0];
+    private final Spell[] spells;
     private final ScreenHandlerContext context;
     private int index = 0;
 
     public CastingTableScreenHandler(int syncId, PlayerInventory playerInventory, ScreenHandlerContext blockContext) {
         super(ScreenHandlerType.STONECUTTER, syncId);
 
-        inventory = new SimpleInventory(2) {
+        inventory = new BasicInventory(2) {
             public void markDirty() {
                 super.markDirty();
                 CastingTableScreenHandler.this.onContentChanged(this);
@@ -44,7 +44,21 @@ public class CastingTableScreenHandler extends ScreenHandler {
         context = blockContext;
         result = new CraftingResultInventory();
 
-        setSpells(playerInventory.player);
+        if (playerInventory.player.isCreative() ? SorceryCraft.getConfig().limitCastingTable.creative : SorceryCraft.getConfig().limitCastingTable.survival) {
+            SpellPlayerEntity spellPlayer = (SpellPlayerEntity) playerInventory.player;
+            Map<Identifier, Integer> spellsMap = spellPlayer.getDiscoveredSpells();
+            List<Spell> spellsArray = new ArrayList<>();
+
+            Spell[] allSpells = SpellRegistry.getSpells();
+            for (Spell spell : allSpells) {
+                if (spellsMap.containsKey(spell.getID()) && spellsMap.get(spell.getID()) >= spell.getLevel()) {
+                    spellsArray.add(spell);
+                }
+            }
+            spells = spellsArray.toArray(new Spell[0]);
+        } else {
+            spells = SpellRegistry.getSpells();
+        }
 
         addSlot(new Slot(inventory, 0, 136, 37) {
             @Override
@@ -53,7 +67,7 @@ public class CastingTableScreenHandler extends ScreenHandler {
             }
 
             @Override
-            public int getMaxItemCount() {
+            public int getMaxStackAmount() {
                 return 1;
             }
 
@@ -91,8 +105,8 @@ public class CastingTableScreenHandler extends ScreenHandler {
                     }
                 });
 
-                CastingTableScreenHandler.this.inventory.setStack(0, ItemStack.EMPTY);
+                CastingTableScreenHandler.this.inventory.setInvStack(0, ItemStack.EMPTY);
-                CastingTableScreenHandler.this.inventory.removeStack(1, spells[index].getItemCost().getCount());
+                CastingTableScreenHandler.this.inventory.takeInvStack(1, spells[index].getItemCost().getCount());
                 return stack;
             }
         });
@@ -109,30 +123,6 @@ public class CastingTableScreenHandler extends ScreenHandler {
         }
     }
 
-    private void resetIndex() {
-        index = 0;
-        onContentChanged(inventory);
-    }
-
-    public void setSpells(PlayerEntity player) {
-        if (player.isCreative() ? SorceryCraft.getConfig().limitCastingTable.creative : SorceryCraft.getConfig().limitCastingTable.survival) {
-            SpellPlayerEntity spellPlayer = (SpellPlayerEntity) player;
-            Map<Identifier, Integer> spellsMap = spellPlayer.getDiscoveredSpells();
-            List<Spell> spellsArray = new ArrayList<>();
-
-            Spell[] allSpells = SpellRegistry.getSpells();
-            for (Spell spell : allSpells) {
-                if (spellsMap.containsKey(spell.getID()) && spellsMap.get(spell.getID()) >= spell.getLevel()) {
-                    spellsArray.add(spell);
-                }
-            }
-            spells = spellsArray.toArray(new Spell[0]);
-        } else {
-            spells = SpellRegistry.getSpells();
-        }
-        resetIndex();
-    }
-
     public boolean canTakeResult(PlayerEntity playerEntity) {
         return playerEntity.isCreative() || playerEntity.experienceLevel >= spells[index].getXPCost();
     }
@@ -141,7 +131,7 @@ public class CastingTableScreenHandler extends ScreenHandler {
         this.index = index;
         onContentChanged(inventory);
 
-        if (inventory.getStack(0).isEmpty() && inventory.getStack(1).isEmpty()) {
+        if (inventory.getInvStack(0).isEmpty() && inventory.getInvStack(1).isEmpty()) {
             ItemStack spellItem = new ItemStack(SorceryCraft.SPELL_ITEM);
             autoFill(0, spellItem, true);
             ItemStack paymentItem = getRecipes()[index].getItemCost();
@@ -198,22 +188,22 @@ public class CastingTableScreenHandler extends ScreenHandler {
     @Override
     public void onContentChanged(Inventory inventory) {
         super.onContentChanged(inventory);
-        ItemStack item = inventory.getStack(0);
+        ItemStack item = inventory.getInvStack(0);
-        ItemStack cost = inventory.getStack(1);
+        ItemStack cost = inventory.getInvStack(1);
         if (inventory == this.inventory) {
             if (spells.length > 0 &&
                     !item.isEmpty() &&
                     cost.getItem() == spells[index].getItemCost().getItem() &&
                     cost.getCount() >= spells[index].getItemCost().getCount()) {
                 ItemStack resultItem = item.copy();
-                Map<Identifier, Integer> resultSpells = SpellHelper.getSpells(resultItem);
+                Map<Identifier, Integer> resultSpells = SpellTag.getSpells(resultItem);
                 if (!resultSpells.containsKey(spells[index].getID()) || resultSpells.get(spells[index].getID()) <= spells[index].getLevel()) {
                     resultSpells.put(spells[index].getID(), spells[index].getLevel());
                 }
-                SpellHelper.setSpells(resultItem, resultSpells);
+                SpellTag.setSpells(resultItem, resultSpells);
-                result.setStack(2, resultItem);
+                result.setInvStack(2, resultItem);
             } else {
-                result.setStack(2, ItemStack.EMPTY);
+                result.setInvStack(2, ItemStack.EMPTY);
             }
         }
     }
@@ -223,14 +213,14 @@ public class CastingTableScreenHandler extends ScreenHandler {
             for (int i = 3; i < 39; ++i) {
                 ItemStack itemStack = slots.get(i).getStack();
                 if (!itemStack.isEmpty() && itemCompatible(stack, itemStack)) {
-                    ItemStack invSlot = inventory.getStack(slot);
+                    ItemStack invSlot = inventory.getInvStack(slot);
                     int count = invSlot.isEmpty() ? 0 : invSlot.getCount();
                     int requiredCount = Math.min((onlyOne ? 1 : stack.getMaxCount()) - count, itemStack.getCount());
                     ItemStack modifiedItem = itemStack.copy();
                     int totalCount = count + requiredCount;
                     itemStack.decrement(requiredCount);
                     modifiedItem.setCount(totalCount);
-                    inventory.setStack(slot, modifiedItem);
+                    inventory.setInvStack(slot, modifiedItem);
                     if (totalCount >= stack.getMaxCount() || onlyOne) {
                         break;
                     }

src/main/java/com/thebrokenrail/sorcerycraft/item/SpellItem.java

@@ -3,11 +3,10 @@ package com.thebrokenrail.sorcerycraft.item;
 import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.entity.SpellEntity;
 import com.thebrokenrail.sorcerycraft.spell.api.Spell;
-import com.thebrokenrail.sorcerycraft.spell.api.registry.SpellRegistry;
+import com.thebrokenrail.sorcerycraft.spell.registry.SpellRegistry;
-import com.thebrokenrail.sorcerycraft.spell.util.SpellHelper;
+import com.thebrokenrail.sorcerycraft.spell.util.SpellTag;
 import net.minecraft.client.item.TooltipContext;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
@@ -53,22 +52,16 @@ public class SpellItem extends Item {
     }
 
     @Override
-    public ActionResult useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity entity, Hand hand) {
+    public boolean hasEnchantmentGlint(ItemStack stack) {
-        use(user.getEntityWorld(), user, hand);
+        Map<Identifier, Integer> spells = SpellTag.getSpells(stack);
-        return ActionResult.SUCCESS;
+        return spells.size() > 0 || super.hasEnchantmentGlint(stack);
-    }
-
-    @Override
-    public boolean hasGlint(ItemStack stack) {
-        Map<Identifier, Integer> spells = SpellHelper.getSpells(stack);
-        return spells.size() > 0 || super.hasGlint(stack);
     }
 
     @Override
     public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
-        Map<Identifier, Integer> spells = SpellHelper.getSpells(itemStack);
+        Map<Identifier, Integer> spells = SpellTag.getSpells(itemStack);
         for (Map.Entry<Identifier, Integer> entry : spells.entrySet()) {
-            tooltip.add(SpellHelper.getTranslatedSpell(entry.getKey(), entry.getValue()));
+            tooltip.add(SpellTag.getTranslatedSpell(entry.getKey(), entry.getValue()));
         }
     }
 
@@ -81,7 +74,7 @@ public class SpellItem extends Item {
                 ItemStack item = new ItemStack(this);
                 Map<Identifier, Integer> spell = new HashMap<>();
                 spell.put(value.getID(), value.getLevel());
-                SpellHelper.setSpells(item, spell);
+                SpellTag.setSpells(item, spell);
                 stacks.add(item);
             }
         }
@@ -97,9 +90,9 @@ public class SpellItem extends Item {
         super.inventoryTick(stack, world, entity, slot, selected);
         if (!world.isClient() && entity instanceof PlayerEntity) {
             PlayerEntity player = (PlayerEntity) entity;
-            Map<Identifier, Integer> itemSpells = SpellHelper.getSpells(player.inventory.getStack(slot));
+            Map<Identifier, Integer> itemSpells = SpellTag.getSpells(player.inventory.getInvStack(slot));
 
-            SpellHelper.learnSpells(player, itemSpells);
+            SpellTag.learnSpells(player, itemSpells);
         }
     }
 }

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

@@ -1,12 +1,13 @@
 package com.thebrokenrail.sorcerycraft.mixin;
 
-import net.minecraft.advancement.criterion.Criteria;
 import net.minecraft.advancement.criterion.Criterion;
+import net.minecraft.advancement.criterion.Criterions;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-@Mixin(Criteria.class)
+@SuppressWarnings("PublicStaticMixinMember")
-public interface CriteriaRegistryHook {
+@Mixin(Criterions.class)
+public interface CriterionRegistryHook {
     @Invoker("register")
     static <T extends Criterion<?>> T callRegister(T criterion) {
         return criterion;

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

@@ -1,24 +0,0 @@
-package com.thebrokenrail.sorcerycraft.mixin;
-
-import com.thebrokenrail.sorcerycraft.client.gui.CastingTableScreen;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.client.gui.widget.AbstractButtonWidget;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.Text;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@SuppressWarnings("ConstantConditions")
-@Mixin(AbstractButtonWidget.class)
-public class MixinAbstractButtonWidget {
-    @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/AbstractButtonWidget;drawCenteredText(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;III)V"), method = "renderButton")
-    public void drawCenteredText(MatrixStack matrices, TextRenderer textRenderer, Text text, int centerX, int y, int color) {
-        if ((Object) this instanceof CastingTableScreen.WidgetButtonPage) {
-            DrawableHelper.drawStringWithShadow(matrices, textRenderer, text.getString(), ((CastingTableScreen.WidgetButtonPage) (Object) this).x + 5, y, color);
-        } else {
-            DrawableHelper.drawCenteredText(matrices, textRenderer, text, centerX, y, color);
-        }
-    }
-}

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

@@ -2,8 +2,6 @@ package com.thebrokenrail.sorcerycraft.mixin;
 
 import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.entity.SpellEntity;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
@@ -16,7 +14,6 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @SuppressWarnings("unused")
-@Environment(EnvType.CLIENT)
 @Mixin(ClientPlayNetworkHandler.class)
 public class MixinClientPlayNetworkHandler {
     @Shadow

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

@@ -1,30 +0,0 @@
-package com.thebrokenrail.sorcerycraft.mixin;
-
-import com.thebrokenrail.sorcerycraft.client.gui.CastingTableScreen;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.util.Map;
-
-@SuppressWarnings("unused")
-@Mixin(ClientPlayerEntity.class)
-@Environment(EnvType.CLIENT)
-public class MixinClientPlayerEntity extends MixinPlayerEntity {
-    @Shadow
-    @Final
-    protected MinecraftClient client;
-
-    @Override
-    public void setDiscoveredSpells(Map<Identifier, Integer> spells) {
-        super.setDiscoveredSpells(spells);
-        if (client.currentScreen instanceof CastingTableScreen) {
-            ((CastingTableScreen) client.currentScreen).resetIndex();
-        }
-    }
-}

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

@@ -1,15 +1,11 @@
 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 com.thebrokenrail.sorcerycraft.spell.util.SpellTag;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.screen.ScreenHandler;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -20,32 +16,26 @@ import java.util.Map;
 @SuppressWarnings("unused")
 @Mixin(PlayerEntity.class)
 public class MixinPlayerEntity implements SpellPlayerEntity {
-    @Shadow
+    // Namespace Fields
-    public ScreenHandler currentScreenHandler;
+    private Map<Identifier, Integer> sorceryCraftDiscoveredSpells = new HashMap<>();
-    @Unique
-    private Map<Identifier, Integer> discoveredSpells = new HashMap<>();
 
     @Inject(at = @At("HEAD"), method = "readCustomDataFromTag")
     public void readCustomDataFromTag(CompoundTag tag, CallbackInfo info) {
-        discoveredSpells = SpellHelper.getSpells(tag);
+        sorceryCraftDiscoveredSpells = SpellTag.getSpells(tag);
     }
 
     @Inject(at = @At("HEAD"), method = "writeCustomDataToTag")
     public void writeCustomDataToTag(CompoundTag tag, CallbackInfo info) {
-        tag.put(SpellHelper.SPELL_TAG, SpellHelper.createSpellsTag(discoveredSpells));
+        tag.put(SpellTag.SPELL_TAG, SpellTag.createSpellsTag(sorceryCraftDiscoveredSpells));
     }
 
     @Override
     public void setDiscoveredSpells(Map<Identifier, Integer> spells) {
-        discoveredSpells = spells;
+        this.sorceryCraftDiscoveredSpells = spells;
-        if (currentScreenHandler instanceof CastingTableScreenHandler) {
-            //noinspection ConstantConditions
-            ((CastingTableScreenHandler) currentScreenHandler).setSpells((PlayerEntity) (Object) this);
-        }
     }
 
     @Override
     public Map<Identifier, Integer> getDiscoveredSpells() {
-        return discoveredSpells;
+        return sorceryCraftDiscoveredSpells;
     }
 }

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

@@ -1,25 +1,18 @@
 package com.thebrokenrail.sorcerycraft.mixin;
 
-import com.thebrokenrail.sorcerycraft.gui.CastingTableScreenHandler;
 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 com.thebrokenrail.sorcerycraft.spell.util.SpellTag;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.Map;
-
 @SuppressWarnings("unused")
 @Mixin(ServerPlayerEntity.class)
-public abstract class MixinServerPlayerEntity extends MixinPlayerEntity implements SpellServerPlayerEntity {
+public abstract class MixinServerPlayerEntity implements SpellPlayerEntity {
     @Inject(at = @At("HEAD"), method = "copyFrom")
     public void copyFrom(ServerPlayerEntity oldPlayer, boolean alive, CallbackInfo info) {
         SpellPlayerEntity oldSpellPlayer = (SpellPlayerEntity) oldPlayer;
@@ -28,18 +21,10 @@ public abstract class MixinServerPlayerEntity extends MixinPlayerEntity implemen
         newSpellPlayer.setDiscoveredSpells(oldSpellPlayer.getDiscoveredSpells());
     }
 
-    @Override
+    @Inject(at = @At("HEAD"), method = "playerTick")
-    public void setDiscoveredSpells(Map<Identifier, Integer> spells) {
+    public void playerTick(CallbackInfo info) {
-        super.setDiscoveredSpells(spells);
-        if (currentScreenHandler instanceof CastingTableScreenHandler) {
-            sync();
-        }
-    }
-
-    @Override
-    public void sync() {
         CompoundTag tag = new CompoundTag();
-        tag.put(SpellHelper.SPELL_TAG, SpellHelper.createSpellsTag(getDiscoveredSpells()));
+        tag.put(SpellTag.SPELL_TAG, SpellTag.createSpellsTag(getDiscoveredSpells()));
         //noinspection ConstantConditions
         UpdateKnownSpellsS2CPacket.send((ServerPlayerEntity) (Object) this, tag);
     }

src/main/java/com/thebrokenrail/sorcerycraft/packet/SelectSpellC2SPacket.java

@@ -3,8 +3,6 @@ package com.thebrokenrail.sorcerycraft.packet;
 import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.gui.CastingTableScreenHandler;
 import io.netty.buffer.Unpooled;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.network.PacketContext;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.network.PacketByteBuf;
@@ -22,7 +20,6 @@ public class SelectSpellC2SPacket {
         }
     }
 
-    @Environment(EnvType.CLIENT)
     public static void send(MinecraftClient minecraft, int index) {
         PacketByteBuf bytes = new PacketByteBuf(Unpooled.buffer());
         bytes.writeInt(index);

src/main/java/com/thebrokenrail/sorcerycraft/packet/UpdateKnownSpellsS2CPacket.java

@@ -2,10 +2,8 @@ package com.thebrokenrail.sorcerycraft.packet;
 
 import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.spell.util.SpellPlayerEntity;
-import com.thebrokenrail.sorcerycraft.spell.util.SpellHelper;
+import com.thebrokenrail.sorcerycraft.spell.util.SpellTag;
 import io.netty.buffer.Unpooled;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.network.PacketContext;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.PacketByteBuf;
@@ -14,12 +12,11 @@ import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
 
 public class UpdateKnownSpellsS2CPacket {
-    @Environment(EnvType.CLIENT)
     public static void handle(PacketContext context, PacketByteBuf bytes) {
         CompoundTag tag = bytes.readCompoundTag();
         if (context.getPlayer() != null) {
             SpellPlayerEntity spellPlayer = (SpellPlayerEntity) context.getPlayer();
-            spellPlayer.setDiscoveredSpells(SpellHelper.getSpells(tag));
+            spellPlayer.setDiscoveredSpells(SpellTag.getSpells(tag));
         }
     }
 

src/main/java/com/thebrokenrail/sorcerycraft/spell/CoolingSpell.java

@@ -4,7 +4,6 @@ import com.thebrokenrail.sorcerycraft.spell.api.Spell;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.state.property.Properties;
 import net.minecraft.tag.BlockTags;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.hit.BlockHitResult;
@@ -27,9 +26,6 @@ public class CoolingSpell extends Spell {
         if (world.getBlockState(blockPos).isIn(BlockTags.FIRE)) {
             world.removeBlock(blockPos, false);
         }
-        if (world.getBlockState(blockPos).contains(Properties.LIT) && world.getBlockState(blockPos).get(Properties.LIT)) {
-            world.setBlockState(blockPos, world.getBlockState(blockPos).with(Properties.LIT, false));
-        }
 
         BlockPos sideBlockPos = blockPos.offset(hitResult.getSide());
         if (world.getBlockState(sideBlockPos).isIn(BlockTags.FIRE)) {

src/main/java/com/thebrokenrail/sorcerycraft/spell/FlameSpell.java

@@ -1,13 +1,18 @@
 package com.thebrokenrail.sorcerycraft.spell;
 
 import com.thebrokenrail.sorcerycraft.spell.api.Spell;
+import net.minecraft.block.AbstractFireBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.TntBlock;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
-import net.minecraft.item.AutomaticItemPlacementContext;
+import net.minecraft.item.FlintAndSteelItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.state.property.Properties;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public class FlameSpell extends Spell {
@@ -25,7 +30,20 @@ public class FlameSpell extends Spell {
 
     @Override
     public void execute(World world, Entity source, Entity attacker, BlockHitResult hitResult) {
-        Items.FLINT_AND_STEEL.useOnBlock(new AutomaticItemPlacementContext(world, hitResult.getBlockPos(), hitResult.getSide().getOpposite(), new ItemStack(Items.FLINT_AND_STEEL), hitResult.getSide()));
+        BlockPos blockPos = hitResult.getBlockPos();
+        BlockState blockState = world.getBlockState(blockPos);
+
+        BlockPos sideBlockPos = hitResult.getBlockPos().offset(hitResult.getSide());
+        BlockState sideBlockState = world.getBlockState(sideBlockPos);
+
+        if (blockState.getBlock() instanceof TntBlock) {
+            TntBlock.primeTnt(world, blockPos);
+            world.removeBlock(blockPos, false);
+        } else if (FlintAndSteelItem.canIgnite(sideBlockState, world, sideBlockPos)) {
+            world.setBlockState(sideBlockPos, AbstractFireBlock.getState(world, sideBlockPos));
+        } else if (FlintAndSteelItem.isIgnitable(blockState)) {
+            world.setBlockState(blockPos, blockState.with(Properties.LIT, true));
+        }
     }
 
     @Override

src/main/java/com/thebrokenrail/sorcerycraft/spell/LightningSpell.java

@@ -2,7 +2,6 @@ package com.thebrokenrail.sorcerycraft.spell;
 
 import com.thebrokenrail.sorcerycraft.spell.api.Spell;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LightningEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -30,13 +29,11 @@ public class LightningSpell extends Spell {
 
     private void strike(World world, Vec3d pos, Entity attacker) {
         ServerWorld serverWorld = (ServerWorld) world;
-        LightningEntity lightningEntity = EntityType.LIGHTNING_BOLT.create(world);
+        LightningEntity lightningEntity = new LightningEntity(world, pos.getX(), pos.getY(), pos.getZ(), false);
-        assert lightningEntity != null;
-        lightningEntity.updatePosition(pos.x, pos.y, pos.z);
         if (attacker instanceof ServerPlayerEntity) {
-            lightningEntity.setChanneler((ServerPlayerEntity) attacker);
+            lightningEntity.setChanneller((ServerPlayerEntity) attacker);
         }
-        serverWorld.spawnEntity(lightningEntity);
+        serverWorld.addLightning(lightningEntity);
     }
 
     @Override

src/main/java/com/thebrokenrail/sorcerycraft/spell/TeleportSpell.java

@@ -17,7 +17,7 @@ public class TeleportSpell extends Spell {
     }
 
     private int getMaxTeleport(World world) {
-        return world.getRegistryKey() != World.OVERWORLD ? 128 : 256;
+        return world.getDimension().isNether() ? 128 : 256;
     }
 
     @Override

src/main/java/com/thebrokenrail/sorcerycraft/spell/api/Spell.java

@@ -1,17 +1,14 @@
 package com.thebrokenrail.sorcerycraft.spell.api;
 
-import com.thebrokenrail.sorcerycraft.spell.api.registry.SpellRegistry;
+import com.thebrokenrail.sorcerycraft.spell.registry.SpellRegistry;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.world.World;
 
-/**
- * Spell Implementation Base Class
- */
 public abstract class Spell {
     private final Identifier id;
     private final int level;
@@ -83,8 +80,8 @@ public abstract class Spell {
      * @param level Spell Level
      * @return Translated Display Name
      */
-    public static MutableText getDefaultTranslation(Identifier id, int level) {
+    public static Text getDefaultTranslation(Identifier id, int level) {
-        MutableText text = new TranslatableText("spell." + id.getNamespace() + '.' +  id.getPath());
+        Text text = new TranslatableText("spell." + id.getNamespace() + '.' +  id.getPath());
         if (level != 0 || SpellRegistry.getMaxLevel(id) != 1) {
             text.append(" ").append(new TranslatableText("enchantment.level." + (level + 1)));
         }
@@ -95,7 +92,7 @@ public abstract class Spell {
      * Get Translated Display Name
      * @return Translated Display Name
      */
-    public MutableText getTranslation() {
+    public Text getTranslation() {
         return getDefaultTranslation(getID(), getLevel());
     }
 }

src/main/java/com/thebrokenrail/sorcerycraft/spell/registry/SpellRegistry.java

@@ -1,4 +1,4 @@
-package com.thebrokenrail.sorcerycraft.spell.api.registry;
+package com.thebrokenrail.sorcerycraft.spell.registry;
 
 import com.thebrokenrail.sorcerycraft.spell.api.Spell;
 import net.minecraft.util.Identifier;
@@ -9,28 +9,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-/**
- * Spell Implementation Registry
- */
 public class SpellRegistry {
     private static final Map<Identifier, Class<?>> spells = new HashMap<>();
 
-    /**
-     * Get Spell Implementation
-     * @param entry Map Entry
-     * @return Spell Implementation
-     */
     public static Spell getSpell(Map.Entry<Identifier, Integer> entry) {
         return getSpell(entry.getKey(), entry.getValue());
     }
 
-    /**
-     * Get Spell Implementation
-     * @param id Spell ID
-     * @param level Spell Level
-     * @return Spell Implementation
-     */
     public static Spell getSpell(Identifier id, int level) {
         if (!spells.containsKey(id)) {
             return null;
@@ -43,11 +28,6 @@ public class SpellRegistry {
         }
     }
 
-    /**
-     * Get Max Level of a Spell
-     * @param id Spell ID
-     * @return Max Level
-     */
     public static int getMaxLevel(Identifier id) {
         Spell tempSpell = getSpell(id, 0);
         if (tempSpell == null) {
@@ -56,10 +36,6 @@ public class SpellRegistry {
         return tempSpell.getMaxLevel();
     }
 
-    /**
-     * Get All Spell Implementations
-     * @return List of Spell Implementations
-     */
     public static Spell[] getSpells() {
         List<Spell> out = new ArrayList<>();
         for (Map.Entry<Identifier, Class<?>> entry : spells.entrySet()) {
@@ -77,10 +53,6 @@ public class SpellRegistry {
         return out.toArray(new Spell[0]);
     }
 
-    /**
-     * Get All Max Level Spell Implementations
-     * @return List of Spell Implementations
-     */
     public static Spell[] getMaxSpells() {
         List<Spell> out = new ArrayList<>();
         for (Map.Entry<Identifier, Class<?>> entry : spells.entrySet()) {
@@ -104,10 +76,6 @@ public class SpellRegistry {
         return id;
     }
 
-    /**
-     * Gat All Spell IDs
-     * @return List of Spell IDs
-     */
     public static Identifier[] getSpellsID() {
         return spells.keySet().toArray(new Identifier[0]);
     }

src/main/java/com/thebrokenrail/sorcerycraft/spell/registry/Spells.java

@@ -1,4 +1,4 @@
-package com.thebrokenrail.sorcerycraft.spell.api.registry;
+package com.thebrokenrail.sorcerycraft.spell.registry;
 
 import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.spell.CoolingSpell;
@@ -13,9 +13,6 @@ import com.thebrokenrail.sorcerycraft.spell.SteadfastSpell;
 import com.thebrokenrail.sorcerycraft.spell.TeleportSpell;
 import net.minecraft.util.Identifier;
 
-/**
- * All Builtin Spells
- */
 @SuppressWarnings("unused")
 public class Spells {
     public static final Identifier HEAL_SPELL;

src/main/java/com/thebrokenrail/sorcerycraft/spell/util/RandomSpellLootTableFunction.java

@@ -1,18 +1,13 @@
 package com.thebrokenrail.sorcerycraft.spell.util;
 
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonObject;
-import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.spell.api.Spell;
-import com.thebrokenrail.sorcerycraft.spell.api.registry.SpellRegistry;
+import com.thebrokenrail.sorcerycraft.spell.registry.SpellRegistry;
 import net.minecraft.item.ItemStack;
 import net.minecraft.loot.condition.LootCondition;
 import net.minecraft.loot.context.LootContext;
 import net.minecraft.loot.function.ConditionalLootFunction;
 import net.minecraft.loot.function.LootFunction;
-import net.minecraft.loot.function.LootFunctionType;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
 
 import java.util.Map;
 
@@ -26,30 +21,14 @@ public class RandomSpellLootTableFunction extends ConditionalLootFunction {
         while (!(context.getRandom().nextDouble() > chance)) {
             Spell[] spells = SpellRegistry.getSpells();
             int index = context.getRandom().nextInt(spells.length);
-            Map<Identifier, Integer> spell = SpellHelper.getSpells(stack);
+            Map<Identifier, Integer> spell = SpellTag.getSpells(stack);
             spell.put(spells[index].getID(), spells[index].getLevel());
-            SpellHelper.setSpells(stack, spell);
+            SpellTag.setSpells(stack, spell);
             chance = chance * 0.25d;
         }
         return stack;
     }
 
-    @Override
-    public LootFunctionType getType() {
-        return Registry.LOOT_FUNCTION_TYPE.get(new Identifier(SorceryCraft.NAMESPACE, "random_spell"));
-    }
-
-    public static class Factory extends ConditionalLootFunction.Serializer<RandomSpellLootTableFunction> {
-        public Factory() {
-            super();
-        }
-
-        @Override
-        public RandomSpellLootTableFunction fromJson(JsonObject json, JsonDeserializationContext context, LootCondition[] conditions) {
-            return (RandomSpellLootTableFunction) new com.thebrokenrail.sorcerycraft.spell.util.RandomSpellLootTableFunction.Builder().build();
-        }
-    }
-
     public static class Builder extends ConditionalLootFunction.Builder<RandomSpellLootTableFunction.Builder> {
         @Override
         protected RandomSpellLootTableFunction.Builder getThisBuilder() {

src/main/java/com/thebrokenrail/sorcerycraft/spell/util/SpellServerPlayerEntity.java

@@ -1,5 +0,0 @@
-package com.thebrokenrail.sorcerycraft.spell.util;
-
-public interface SpellServerPlayerEntity extends SpellPlayerEntity {
-    void sync();
-}

src/main/java/com/thebrokenrail/sorcerycraft/spell/util/SpellTag.java

@@ -2,28 +2,24 @@ package com.thebrokenrail.sorcerycraft.spell.util;
 
 import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import com.thebrokenrail.sorcerycraft.spell.api.Spell;
-import com.thebrokenrail.sorcerycraft.spell.api.registry.SpellRegistry;
+import com.thebrokenrail.sorcerycraft.spell.registry.SpellRegistry;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
-import net.minecraft.network.MessageType;
-import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.LiteralText;
-import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.Util;
 import net.minecraft.world.World;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class SpellHelper {
+public class SpellTag {
     public static final String SPELL_TAG = "Spells";
 
     public static void setSpells(ItemStack itemStack, Map<Identifier, Integer> map) {
@@ -89,7 +85,7 @@ public class SpellHelper {
 
     public static Text getTranslatedSpell(Identifier id, int level) {
         Spell spell = SpellRegistry.getSpell(id, level);
-        MutableText text;
+        Text text;
         if (spell != null) {
             text = spell.getTranslation();
         } else {
@@ -100,7 +96,7 @@ public class SpellHelper {
     }
 
     public static Text getTranslatedSpellChat(Identifier id, int level) {
-        return new LiteralText("[").append(SpellHelper.getTranslatedSpell(id, level).getString()).append("]").formatted(Formatting.GREEN);
+        return new LiteralText("[").append(SpellTag.getTranslatedSpell(id, level).getString()).append("]").formatted(Formatting.GREEN);
     }
 
     public static void learnSpells(PlayerEntity player, Map<Identifier, Integer> itemSpells) {
@@ -124,7 +120,7 @@ public class SpellHelper {
                     playerSpells.put(spell.getID(), spell.getLevel());
                     assert world.getServer() != null;
                     Text text = getTranslatedSpellChat(spell.getID(), spell.getLevel());
-                    world.getServer().getPlayerManager().sendToAll(new GameMessageS2CPacket(new TranslatableText("chat." + SorceryCraft.NAMESPACE + ".discovered_spell", player.getDisplayName(), text), MessageType.CHAT, Util.NIL_UUID));
+                    world.getServer().getPlayerManager().sendToAll(new TranslatableText("chat." + SorceryCraft.NAMESPACE + ".discovered_spell", player.getDisplayName(), text));
                 }
             }
         }

src/main/resources/fabric.mod.json

@@ -23,7 +23,7 @@
             "com.thebrokenrail.sorcerycraft.client.SorceryCraftClient"
         ],
         "modmenu": [
-            "com.thebrokenrail.sorcerycraft.client.ModMenu"
+            "com.thebrokenrail.sorcerycraft.client.SorceryCraftClient"
         ]
     },
     "mixins": [
@@ -33,11 +33,5 @@
         "fabricloader": ">=0.7.4",
         "fabric": "*",
         "minecraft": "1.16.x"
-    },
-    "custom": {
-        "modupdater": {
-            "strategy": "curseforge",
-            "projectID": 365308
-        }
     }
 }

src/main/resources/sorcerycraft.mixins.json

@@ -3,14 +3,12 @@
     "package": "com.thebrokenrail.sorcerycraft.mixin",
     "compatibilityLevel": "JAVA_8",
     "client": [
-        "MixinClientPlayerEntity",
+        "MixinClientPlayNetworkHandler"
-        "MixinClientPlayNetworkHandler",
-        "MixinAbstractButtonWidget"
     ],
     "mixins": [
-        "CriteriaRegistryHook",
         "MixinPlayerEntity",
-        "MixinServerPlayerEntity"
+        "MixinServerPlayerEntity",
+        "CriterionRegistryHook"
     ],
     "injectors": {
         "defaultRequire": 1