fix: Fixed some advancements

.forge/update.json

@@ -1,7 +1,7 @@
 {
     "homepage": "https://www.curseforge.com/minecraft/mc-mods/electroblobs-wizardry",
     "promos": {
-        "1.12.2-latest": "4.3.18",
-        "1.12.2-recommended": "4.3.18"
+        "1.12.2-latest": "4.3.7",
+        "1.12.2-recommended": "4.3.7"
     }
 }

.github/workflows/build.yaml

@@ -1,50 +0,0 @@
-name: Gradle Build
-
-on:
-  push:
-    branches: [ "**" ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v6
-      with:
-        fetch-depth: 0
-    
-    - name: Set up JDK 8
-      uses: actions/setup-java@v4
-      with:
-        java-version: '8'
-        distribution: 'temurin'
-
-    - name: Load Cache
-      uses: actions/cache@v5
-      with:
-        path: |
-          ~/.gradle/caches
-          ~/.gradle/wrapper
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
-            
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4
-      with:
-        cache-read-only: ${{ github.ref != 'refs/heads/1.12.2' }}
-    
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    
-    - name: Build with Gradle
-      run: ./gradlew build --max-workers=1 --no-daemon
-
-    - name: Upload build artifacts
-      if: success()
-      uses: actions/upload-artifact@v4
-      with:
-        name: build-artifacts
-        path: build/libs/*.jar
-        retention-days: 30

build.gradle

@@ -1,130 +1,64 @@
-import groovy.json.JsonOutput
-
 buildscript {
     repositories {
-        gradlePluginPortal()
-        maven {
-            name 'MinecraftForge'
-            url 'https://maven.minecraftforge.net/'
-        }
-        maven {
-            name 'Garden of Fancy'
-            url 'https://maven.gofancy.wtf/releases'
-        }
-        //fallback for fancygradle maven
-        //mavenLocal()
-        maven {
-            name 'Sponge'
-            url 'https://repo.spongepowered.org/repository/maven-public/'
-        }
+        jcenter()
+        maven { url = "http://files.minecraftforge.net/maven" }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:5.+'
-        classpath 'org.ajoberstar.grgit:grgit-gradle:3.1.1'
-        classpath group: 'wtf.gofancy.fancygradle', name: 'wtf.gofancy.fancygradle.gradle.plugin', version: '1.1.+'
-    }
-
-    repositories.each {
-        if (it instanceof MavenArtifactRepository && it.url.toString() == "https://files.minecraftforge.net/maven") {
-            it.url = "https://maven.minecraftforge.net"
-        }
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
     }
 }
-
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'idea'
-apply plugin: 'maven-publish'
-apply plugin: org.ajoberstar.grgit.gradle.GrgitPlugin
-apply plugin: 'wtf.gofancy.fancygradle'
+apply plugin: 'net.minecraftforge.gradle.forge'
+//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "4.3.18"
+version = "4.3.8"
 group= "electroblob.wizardry"// http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "ElectroblobsWizardry"
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
-
-
-minecraft {
-    // The mappings can be changed at any time, and must be in the following format.
-    // snapshot_YYYYMMDD   Snapshot are built nightly.
-    // stable_#            Stables are built at the discretion of the MCP team.
-    // Use non-default mappings at your own risk. they may not always work.
-    // Simply re-run your setup task after changing the mappings to update your workspace.
-    //mappings channel: 'snapshot', version: '20171003-1.12'
-    mappings channel: "stable", version: "39-1.12"
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
-
-    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-
-    // Default run configurations.
-    // These can be tweaked, removed, or duplicated as needed.
-
-    def argsz = ['--username', 'WinDanesz', '--user', 'WinDanesz', '--uuid', '7faee354-8c60-4f5c-9862-fc0ce5f7f575']
-    runs {
-        client {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'info'
-            args argsz
-        }
-
-        server {
-
-            // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'info'
-        }
-    }
+sourceCompatibility = targetCompatibility = "1.8" // Need this here so eclipse task generates correctly.
+compileJava {
+    sourceCompatibility = targetCompatibility = "1.8"
 }
 
 repositories {
-    google()
-    mavenCentral()
     maven {
-        url = uri('https://www.cursemaven.com')
-        content {
-            includeGroup 'curse.maven'
-        }
+        // location of the maven that hosts JEI files
+        name = "Progwml6 maven"
+        url = "http://dvs1.progwml6.com/files/maven"
     }
     maven {
-        name = 'Modrinth'
-        url = uri('https://api.modrinth.com/maven')
-        content {
-            includeGroup 'maven.modrinth'
-        }
+        // location of a maven mirror for JEI files, as a fallback
+        name = "ModMaven"
+        url = "modmaven.k-4u.nl"
     }
     maven {
-        name = 'Sponge'
-        url = uri('https://repo.spongepowered.org/maven')
-    }
-    maven {
-        url = uri('https://maven.blamejared.com')
-    }
-    maven {
-        url = uri('https://m2.dv8tion.net/releases')
-    }
-    maven {
-        url = uri('https://jitpack.io')
+        name = "Curseforge Maven"
+        url = "https://minecraft.curseforge.com/api/maven/"
     }
 }
 
+minecraft {
+    version = "1.12.2-14.23.5.2847"
+    runDir = "run"
+    
+    // the mappings can be changed at any time, and must be in the following format.
+    // snapshot_YYYYMMDD   snapshot are built nightly.
+    // stable_#            stables are built at the discretion of the MCP team.
+    // Use non-default mappings at your own risk. they may not always work.
+    // simply re-run your setup task after changing the mappings to update your workspace.
+    mappings = "stable_39"
+    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+}
+
 dependencies {
-    //// MC version ////
-    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
-    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
-    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft "net.minecraftforge:forge:${project.mc_version}-${project.forge_version}"
-    //// MC version ////
-    implementation fg.deobf("curse.maven:baubles-${baubles_projectid}:${baubles_fileid}")
-    implementation fg.deobf("mezz.jei:jei_${mc_version}:${jei_version}")
-    implementation fg.deobf("curse.maven:antique-atlas-${antiqueatlas_projectid}:${antiqueatlas_fileid}")
+
+    // Compile against the JEI API but do not include it at runtime
+    deobfProvided "mezz.jei:jei_${mc_version}:${jei_version}:api"
+    // At runtime, use the full JEI jar
+    runtime "mezz.jei:jei_${mc_version}:${jei_version}"
+
+    deobfCompile "baubles:Baubles:${mc_version_short}:${baubles_version}"
+    deobfCompile "antique-atlas:antiqueatlas:${mc_version}:${antique_atlas_version}"
 
 }
 
@@ -134,19 +68,20 @@ task deobfJar(type: Jar) {
 }
 
 processResources {
-    // replace tokens in mcmod.info, and pack.mcmeta
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
-        include 'pack.mcmeta'
         include 'mcmod.info'
+                
+        // replace version and mcversion
+        expand 'version':project.version, 'mcversion':project.minecraft.version
     }
-
-    duplicatesStrategy = 'include'
-}
-
-fancyGradle {
-    patches {
-        resources
-        coremods
-        asm
+        
+    // copy everything else except the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
     }
 }

gradle.properties

@@ -1,22 +1,8 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
-mod_id=ebwizardry
 mc_version=1.12.2
 mc_version_short=1.12
 jei_version=4.15.0.291
 baubles_version=1.5.2
-antique_atlas_version=4.6.3
-forge_version=14.23.5.2860
-mappings_version=39
-mappings_channel=stable
-mappings_mc_version=1.12
-baubles_projectid=227083
-baubles_fileid=2518667
-jei_projectid=238222
-artemislib_projectid=313590
-artemislib_version=1.0.6
-artemislib_fileid=2741812
-antiqueatlas_projectid=227795
-antiqueatlas_fileid=2823030
-org.gradle.daemon=false
+antique_atlas_version=4.6.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

gradlew

@@ -1,232 +1,172 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+#!/usr/bin/env sh
 
 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
         fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
 
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
 
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
 
-exec "$JAVACMD" "$@"
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -29,18 +13,15 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +35,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +45,28 @@ echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
-
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell
@@ -86,4 +81,4 @@ exit /b 1
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

src/main/java/electroblob/wizardry/CommonProxy.java

@@ -43,10 +43,6 @@ public class CommonProxy {
 
 	public void registerRenderers(){}
 
-	public void registerItemColorHandlers(){}
-
-	public void registerModelProperties(){}
-
 	public void initialiseLayers(){}
 
 	public void initialiseAnimations(){}
@@ -179,10 +175,6 @@ public class CommonProxy {
 
 	public void handleConquerShrinePacket(PacketConquerShrine.Message message){}
 
-	public void handleBombExplosionPacket(PacketBombExplosion.Message message){}
-
-	public void handleArcaneLockSyncPacket(PacketSyncArcaneLock.Message message){}
-
 	// SECTION Misc
 	// ===============================================================================================================
 

src/main/java/electroblob/wizardry/Settings.java

@@ -13,9 +13,6 @@ import net.minecraft.entity.EntityList;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.JsonToNBT;
-import net.minecraft.nbt.NBTException;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.config.ConfigCategory;
 import net.minecraftforge.common.config.Configuration;
@@ -141,12 +138,6 @@ public final class Settings {
 			new ResourceLocation(Wizardry.MODID, "shrine_5"),
 			new ResourceLocation(Wizardry.MODID, "shrine_6"),
 			new ResourceLocation(Wizardry.MODID, "shrine_7")};
-	/** <b>[Server-only]</b> Whether conquered shrines should regenerate after a period of time. */
-	public boolean shrineRegenerationEnabled = true;
-	/** <b>[Server-only]</b> Time in minutes for a conquered shrine to regenerate. */
-	public int shrineRegenerationTime = 1;
-	/** <b>[Server-only]</b> Whether players can loot shrines multiple times. If false, each player can only loot each shrine once. */
-	public boolean shrineAllowMultipleLoot = false;
 	/** <b>[Server-only]</b> List of dimension ids in which to generate library ruins. */
 	public int[] libraryDimensions = {0};
 	/** <b>[Server-only]</b> The rarity of library ruins, used by the world generator. Larger numbers are rarer. */
@@ -165,12 +156,6 @@ public final class Settings {
 	public Pair<ResourceLocation, Short>[] treeBlocks = parseItemMetaStrings(DEFAULT_TREE_BLOCKS);
 	/** <b>[Server-only]</b> The chance for wizard towers to generate with an evil wizard and chest inside. */
 	public double evilWizardChance = 0.2;
-	public double cooldownReductionPerLevel = 0.15;
-	public double potencyIncreasePerTier = 0.15;
-	public double durationIncreasePerLevel = 0.25;
-	public double rangeIncreasePerLevel = 0.25;
-	public double blastIncreasePerLevel = 0.25;
-	public double frostSlownessIncreasePerLevel = 0.5;
 	/** <b>[Server-only]</b> List of dimension ids in which to generate crystal ore. */
 	public int[] oreDimensions = {0};
 	/** <b>[Server-only]</b> List of dimension ids in which to generate crystal flowers. */
@@ -207,25 +192,14 @@ public final class Settings {
 	public boolean playerBlockDamage = true;
 	/** <b>[Server-only]</b> Whether spells cast by dispensers can destroy blocks in the world. */
 	public boolean dispenserBlockDamage = true;
-	/** <b>[Server-only]</b> Whether damage should be registered with the old system (wizardry_magic/indirect_wizardry_magic) prefixed damage with the elements like
-	 * necromancy_indirect_wizardry_magic, necromancy_wizardry_magic*/
-	public boolean damageTypePerElement = false;
-	/** <b>[Server-only]</b> Whether spell books are consumed when they are bound to a wand.*/
-	public boolean singleUseSpellBooks = false;
-	/** <b>[Server-only]</b> Whether to prevent binding the same spell to a wand multiple times*/
-	public boolean preventBindingSameSpellTwiceToWands = false;
 	/** <b>[Server-only]</b> Whether to revert to the old wand upgrade system, which only requires tomes of arcana. */
 	public boolean legacyWandLevelling = false;
 	/** <b>[Server-only]</b> Whether to tweak the blindness effect to reduce follow distance when used on non-players. */
 	public boolean blindnessTweak = true;
 	/** <b>[Server-only]</b> Whether using bonemeal on grass blocks has a chance to grow crystal flowers. */
 	public boolean bonemealGrowsCrystalFlowers = true;
-	/** <b>[Server-only]</b> Whether wands only decrement their cooldowns if a player holds them. */
-	public boolean wandsMustBeHeldToDecrementCooldown = false;
 	/** <b>[Server-only]</b> Whether to enable Wizardry mob loot injection. Allows an easier switch instead of blacklisting all entities. */
 	public boolean injectMobDrops = true;
-	/** <b>[Server-only]</b> The time in ticks after which recent spell casts expire and no longer count toward progression penalties. */
-	public int recentSpellExpiryTime = 1200;
 	/**
 	 * <b>[Server-only]</b> List of registry names of entities which summoned creatures are allowed to attack, in addition
 	 * to the defaults.
@@ -254,8 +228,6 @@ public final class Settings {
 	public Pair<ResourceLocation, Short>[] bowItemWhitelist = parseItemMetaStrings();
 	/** <b>[Server-only]</b> Map of items to values which wizard trades may use as currency. */
 	public Map<Pair<ResourceLocation, Short>, Integer> currencyItems = new HashMap<>();
-	/** <b>[Server-only]</b> Map of optional NBT tags for currency items, keyed the same as {@link #currencyItems}. */
-	public Map<Pair<ResourceLocation, Short>, NBTTagCompound> currencyItemNbt = new HashMap<>();
 	/** <b>[Server-only]</b> Global damage scaling factor for all player magic damage. */
 	public double playerDamageScale = 1.0;
 	/** <b>[Server-only]</b> Global damage scaling factor for all npc magic damage. */
@@ -271,26 +243,6 @@ public final class Settings {
 	/** <b>[Server-only]</b> List of registry names of biomes in which wizardry's hostile mobs cannot spawn. */
 	public ResourceLocation[] mobSpawnBiomeBlacklist = toResourceLocations("mushroom_island", "mushroom_island_shore");
 
-	// Mana and upgrade constants
-	/** <b>[Server-only]</b> The amount of mana a crystal shard is worth */
-	public int manaPerShard = 10;
-	/** <b>[Server-only]</b> The amount of mana each magic crystal is worth */
-	public int manaPerCrystal = 100;
-	/** <b>[Server-only]</b> The amount of mana a grand magic crystal is worth */
-	public int grandCrystalMana = 400;
-	/** <b>[Server-only]</b> The maximum number of one type of wand upgrade which can be applied to a wand. */
-	public int upgradeStackLimit = 3;
-	/** <b>[Server-only]</b> The bonus amount of wand upgrades that can be applied to a non-elemental wand. */
-	public int nonElementalUpgradeBonus = 3;
-	/** <b>[Server-only]</b> The fraction by which maximum charge is increased for each level of storage upgrade. */
-	public float storageIncreasePerLevel = 0.15f;
-	/** <b>[Server-only]</b> The amount of mana given for a kill for each level of siphon upgrade. */
-	public int siphonManaPerLevel = 5;
-	/** <b>[Server-only]</b> The number of ticks between each mana increase for wands with the condenser upgrade. */
-	public int condenserTickInterval = 50;
-	/** <b>[Server-only]</b> The number of spell slots a wand has with no attunement upgrades applied. */
-	public int baseSpellSlots = 5;
-
 	// Commands (these don't need synchronising since typing a command always queries the server).
 	/**
 	 * <b>[Server-only]</b> The maximum allowed multiplier for the /cast command. This limit is here to stop people from
@@ -360,40 +312,10 @@ public final class Settings {
 	 * velocity-based one.
 	 */
 	public boolean replaceVanillaFallDamage = true;
-	/** <b>[Synchronised]</b> Whether spell book colors are only shown when the player has the Archivist's Eyeglass equipped. */
-	public boolean spellBookColorsRequireArchivistsEyeglass = false;
 	/** <b>[Synchronised]</b> Chance of 'misreading' an undiscovered spell and triggering a forfeit instead. */
 	public double forfeitChance = 0.2;
 	/** <b>[Synchronised]</b> Progression requirements for upgrading a wand to each tier. */
 	public int[] progressionRequirements = {1500, 3500, 6000};
-
-	// Integer wrappers for tier values
-	public Integer noviceMaxCharge = 700;
-	public Integer apprenticeMaxCharge = 1000;
-	public Integer advancedMaxCharge = 1500;
-	public Integer masterMaxCharge = 2500;
-	
-	public Integer noviceUpgradeLimit = 3;
-	public Integer apprenticeUpgradeLimit = 5;
-	public Integer advancedUpgradeLimit = 7;
-	public Integer masterUpgradeLimit = 9;
-	
-	/** <b>[Synchronised]</b> Multiplier for condenser upgrade mana regeneration amount */
-	public double condenserAmountMultiplier = 1.0;
-	/** <b>[Synchronised]</b> Whether flesh spells (DiamondFlesh, IronFlesh, OakFlesh) apply slowness */
-	public boolean fleshSpellsCauseSlowness = true;
-
-	/** <b>[Synchronised]</b> Armor bonus for DiamondFlesh spell */
-	public double diamondFleshArmorBonus = 4.0;
-	/** <b>[Synchronised]</b> Armor toughness bonus for DiamondFlesh spell */
-	public double diamondFleshArmorToughnessBonus = 3.0;
-	/** <b>[Synchronised]</b> Armor bonus for IronFlesh spell */
-	public double ironFleshArmorBonus = 4.0;
-	/** <b>[Synchronised]</b> Armor bonus for OakFlesh spell */
-	public double oakFleshArmorBonus = 3.0;
-	/** <b>[Synchronised]</b> Health bonus for OakFlesh spell */
-	public double oakFleshHealthBonus = 0.2;
-
 	/**
 	 * <b>[Synchronised]</b> The maximum number of blocks a bookshelf can be from an arcane workbench or lectern to be
 	 * able to link to it.
@@ -460,16 +382,12 @@ public final class Settings {
 	/** <b>[Client-only]</b> Whether to initialise the handbook's data. Setting this to false will break the in-game handbook, but might help with some
 	 * startup crashes */
 	public boolean loadHandbook = true;
-	/** <b>[Client-only]</b> Whether to allow the Arcane Workbench and lectern search field to lose focus and start unfocused. */
-	public boolean unfocusedSearchBars = false;
 	/** <b>[Client-only]</b> The position of the spell HUD. */
 	public GuiPosition spellHUDPosition = GuiPosition.BOTTOM_LEFT;
 
 	public static final String DEFAULT_HUD_SKIN_KEY = "default"; // Defined here so it's not in a client-only class.
 	/** <b>[Client-only]</b> The string identifier of the skin used for the spell HUD. */
 	public String spellHUDSkin = DEFAULT_HUD_SKIN_KEY;
-	/** <b>[Client-only]</b> Whether to show elemental colors on spell books for discovered spells. */
-	public boolean spellBookColors = true;
 
 	/** Set of constants for each of the eight positions that the spell HUD can be in. */
 	public enum GuiPosition {
@@ -590,32 +508,9 @@ public final class Settings {
 		setupArtefactsConfig();
 		setupResistancesConfig();
 
-		// Update the constants with new values
-		updateConstantsFromSettings();
-
 		config.save();
 	}
 
-	/** Updates the Constants class with the current settings values */
-	public void updateConstantsFromSettings(){
-		electroblob.wizardry.constants.Constants.MANA_PER_SHARD = this.manaPerShard;
-		electroblob.wizardry.constants.Constants.MANA_PER_CRYSTAL = this.manaPerCrystal;
-		electroblob.wizardry.constants.Constants.GRAND_CRYSTAL_MANA = this.grandCrystalMana;
-		electroblob.wizardry.constants.Constants.UPGRADE_STACK_LIMIT = this.upgradeStackLimit;
-		electroblob.wizardry.constants.Constants.NON_ELEMENTAL_UPGRADE_BONUS = this.nonElementalUpgradeBonus;
-		electroblob.wizardry.constants.Constants.COOLDOWN_REDUCTION_PER_LEVEL = (float) this.cooldownReductionPerLevel;
-		electroblob.wizardry.constants.Constants.STORAGE_INCREASE_PER_LEVEL = this.storageIncreasePerLevel;
-		electroblob.wizardry.constants.Constants.POTENCY_INCREASE_PER_TIER = (float) this.potencyIncreasePerTier;
-		electroblob.wizardry.constants.Constants.DURATION_INCREASE_PER_LEVEL = (float) this.durationIncreasePerLevel;
-		electroblob.wizardry.constants.Constants.RANGE_INCREASE_PER_LEVEL = (float) this.rangeIncreasePerLevel;
-		electroblob.wizardry.constants.Constants.BLAST_RADIUS_INCREASE_PER_LEVEL = (float) this.blastIncreasePerLevel;
-		electroblob.wizardry.constants.Constants.FROST_SLOWNESS_PER_LEVEL = (float) this.frostSlownessIncreasePerLevel;
-		electroblob.wizardry.constants.Constants.SIPHON_MANA_PER_LEVEL = this.siphonManaPerLevel;
-		electroblob.wizardry.constants.Constants.CONDENSER_TICK_INTERVAL = this.condenserTickInterval;
-		electroblob.wizardry.item.ItemWand.BASE_SPELL_SLOTS = this.baseSpellSlots;
-		electroblob.wizardry.data.WizardData.MAX_RECENT_SPELLS = this.baseSpellSlots;
-	}
-
 	void checkForRedundantOptions(String categoryName, Collection<String> validKeys){
 
 		ConfigCategory category = config.getCategory(categoryName);
@@ -722,85 +617,6 @@ public final class Settings {
 		dispenserBlockDamage = property.getBoolean();
 		propOrder.add(property.getName());
 
-		property = config.get(GAMEPLAY_CATEGORY, "damageTypePerElement", false,
-				"Whether damage should be registered with the old system (wizardry_magic/indirect_wizardry_magic) prefixed damage with the elements like "
-						+ "necromancy_indirect_wizardry_magic, necromancy_wizardry_magic. This is disabled by default to not break existing modpacks." 
-						+ "The intention of this setting is to allow differentiating various damage types for e.g. the Distinct Damage Descriptions mod");
-		property.setLanguageKey("config." + Wizardry.MODID + ".damage_type_per_element");
-		Wizardry.proxy.setToNamedBooleanEntry(property);
-		damageTypePerElement = property.getBoolean();
-		propOrder.add(property.getName());
-
-		property = config.get(GAMEPLAY_CATEGORY, "singleUseSpellBooks", false,
-				"Whether spell books are consumed when they are bound to a wand.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".single_use_spell_books");
-		Wizardry.proxy.setToNamedBooleanEntry(property);
-		singleUseSpellBooks = property.getBoolean();
-		propOrder.add(property.getName());
-
-		property = config.get(GAMEPLAY_CATEGORY, "preventBindingSameSpellTwiceToWands", false,
-				"Whether to prevent binding the same spell to a wand multiple times");
-		property.setLanguageKey("config." + Wizardry.MODID + ".prevent_binding_same_spell_twice_to_wands");
-		Wizardry.proxy.setToNamedBooleanEntry(property);
-		preventBindingSameSpellTwiceToWands = property.getBoolean();
-		propOrder.add(property.getName());
-
-		property = config.get(GAMEPLAY_CATEGORY, "manaPerShard", 10,
-				"The amount of mana a crystal shard is worth.", 1, 1000);
-		property.setLanguageKey("config." + Wizardry.MODID + ".mana_per_shard");
-		Wizardry.proxy.setToNumberSliderEntry(property);
-		manaPerShard = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(GAMEPLAY_CATEGORY, "manaPerCrystal", 100,
-				"The amount of mana each magic crystal is worth.", 1, 10000);
-		property.setLanguageKey("config." + Wizardry.MODID + ".mana_per_crystal");
-		Wizardry.proxy.setToNumberSliderEntry(property);
-		manaPerCrystal = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(GAMEPLAY_CATEGORY, "grandCrystalMana", 400,
-				"The amount of mana a grand magic crystal is worth.", 1, 10000);
-		property.setLanguageKey("config." + Wizardry.MODID + ".grand_crystal_mana");
-		Wizardry.proxy.setToNumberSliderEntry(property);
-		grandCrystalMana = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(GAMEPLAY_CATEGORY, "upgradeStackLimit", 3,
-				"The maximum number of one type of wand upgrade which can be applied to a wand.", 1, 10);
-		property.setLanguageKey("config." + Wizardry.MODID + ".upgrade_stack_limit");
-		Wizardry.proxy.setToNumberSliderEntry(property);
-		upgradeStackLimit = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(GAMEPLAY_CATEGORY, "nonElementalUpgradeBonus", 3,
-				"The bonus amount of wand upgrades that can be applied to a non-elemental wand.", 0, 10);
-		property.setLanguageKey("config." + Wizardry.MODID + ".non_elemental_upgrade_bonus");
-		Wizardry.proxy.setToNumberSliderEntry(property);
-		nonElementalUpgradeBonus = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(GAMEPLAY_CATEGORY, "siphonManaPerLevel", 5,
-				"The amount of mana given for a kill for each level of siphon upgrade.", 0, 100);
-		property.setLanguageKey("config." + Wizardry.MODID + ".siphon_mana_per_level");
-		Wizardry.proxy.setToNumberSliderEntry(property);
-		siphonManaPerLevel = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(GAMEPLAY_CATEGORY, "condenserTickInterval", 50,
-				"The number of ticks between each mana increase for wands with the condenser upgrade.", 1, 1000);
-		property.setLanguageKey("config." + Wizardry.MODID + ".condenser_tick_interval");
-		Wizardry.proxy.setToNumberSliderEntry(property);
-		condenserTickInterval = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(GAMEPLAY_CATEGORY, "baseSpellSlots", 5,
-				"The number of spell slots a wand has with no attunement upgrades applied.", 1, 5);
-		property.setLanguageKey("config." + Wizardry.MODID + ".base_spell_slots");
-		Wizardry.proxy.setToNumberSliderEntry(property);
-		baseSpellSlots = property.getInt();
-		propOrder.add(property.getName());
-
 		property = config.get(GAMEPLAY_CATEGORY, "playersMoveEachOther", true,
 				"Whether to allow players to move other players around using magic.");
 		property.setLanguageKey("config." + Wizardry.MODID + ".players_move_each_other");
@@ -852,13 +668,6 @@ public final class Settings {
 		bonemealGrowsCrystalFlowers = property.getBoolean();
 		propOrder.add(property.getName());
 
-		property = config.get(GAMEPLAY_CATEGORY, "wandsMustBeHeldToDecrementCooldown", false,
-				"Whether wands only decrement their cooldowns if a player holds them.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".wands_must_be_held_to_decrement_cooldown");
-		Wizardry.proxy.setToNamedBooleanEntry(property);
-		wandsMustBeHeldToDecrementCooldown = property.getBoolean();
-		propOrder.add(property.getName());
-
 		checkForRedundantOptions(GAMEPLAY_CATEGORY, propOrder); // Must be before the order is set!
 		config.setCategoryPropertyOrder(GAMEPLAY_CATEGORY, propOrder);
 
@@ -925,122 +734,6 @@ public final class Settings {
 		progressionRequirements = property.getIntList();
 		propOrder.add(property.getName());
 
-		property = config.get(DIFFICULTY_CATEGORY, "tierMaxCharges", new int[]{700, 1000, 1500, 2500},
-				"Maximum mana each tier can store (novice, apprentice, advanced, master respectively).");
-		property.setLanguageKey("config." + Wizardry.MODID + ".tier_max_charges");
-		property.setRequiresWorldRestart(true);
-		//tierMaxCharges = property.getIntList();
-		propOrder.add(property.getName());
-
-		// Individual tier configuration
-		property = config.get(DIFFICULTY_CATEGORY, "noviceMaxCharge", 700,
-				"Maximum mana a novice wand can store.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".novice_max_charge");
-		property.setRequiresWorldRestart(true);
-		noviceMaxCharge = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "apprenticeMaxCharge", 1000,
-				"Maximum mana an apprentice wand can store.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".apprentice_max_charge");
-		property.setRequiresWorldRestart(true);
-		apprenticeMaxCharge = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "advancedMaxCharge", 1500,
-				"Maximum mana an advanced wand can store.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".advanced_max_charge");
-		property.setRequiresWorldRestart(true);
-		advancedMaxCharge = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "masterMaxCharge", 2500,
-				"Maximum mana a master wand can store.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".master_max_charge");
-		property.setRequiresWorldRestart(true);
-		masterMaxCharge = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "noviceUpgradeLimit", 3,
-				"Maximum number of upgrades a novice wand can have.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".novice_upgrade_limit");
-		property.setRequiresWorldRestart(true);
-		noviceUpgradeLimit = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "apprenticeUpgradeLimit", 5,
-				"Maximum number of upgrades an apprentice wand can have.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".apprentice_upgrade_limit");
-		property.setRequiresWorldRestart(true);
-		apprenticeUpgradeLimit = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "advancedUpgradeLimit", 7,
-				"Maximum number of upgrades an advanced wand can have.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".advanced_upgrade_limit");
-		property.setRequiresWorldRestart(true);
-		advancedUpgradeLimit = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "masterUpgradeLimit", 9,
-				"Maximum number of upgrades a master wand can have.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".master_upgrade_limit");
-		property.setRequiresWorldRestart(true);
-		masterUpgradeLimit = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "condenserAmountMultiplier", 1.0,
-				"Multiplier for condenser upgrade mana regeneration amount. Higher values make condensers more effective.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".condenser_amount_multiplier");
-		property.setRequiresWorldRestart(true);
-		condenserAmountMultiplier = property.getDouble();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "fleshSpellsCauseSlowness", true,
-				"Whether flesh spells (DiamondFlesh, IronFlesh, OakFlesh) apply slowness. When disabled, these spells only provide their defensive benefits without movement penalty.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".flesh_spells_cause_slowness");
-		Wizardry.proxy.setToNamedBooleanEntry(property);
-		property.requiresMcRestart();
-		fleshSpellsCauseSlowness = property.getBoolean();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "diamondFleshArmorBonus", 4.0,
-				"Armor bonus provided by the DiamondFlesh spell.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".diamond_flesh_armor_bonus");
-		property.setRequiresWorldRestart(true);
-		diamondFleshArmorBonus = property.getDouble();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "diamondFleshArmorToughnessBonus", 3.0,
-				"Armor toughness bonus provided by the DiamondFlesh spell.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".diamond_flesh_armor_toughness_bonus");
-		property.setRequiresWorldRestart(true);
-		diamondFleshArmorToughnessBonus = property.getDouble();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "ironFleshArmorBonus", 4.0,
-				"Armor bonus provided by the IronFlesh spell.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".iron_flesh_armor_bonus");
-		property.setRequiresWorldRestart(true);
-		ironFleshArmorBonus = property.getDouble();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "oakFleshArmorBonus", 3.0,
-				"Armor bonus provided by the OakFlesh spell.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".oak_flesh_armor_bonus");
-		property.setRequiresWorldRestart(true);
-		oakFleshArmorBonus = property.getDouble();
-		propOrder.add(property.getName());
-
-		property = config.get(DIFFICULTY_CATEGORY, "oakFleshHealthBonus", 0.2,
-				"Health bonus provided by the OakFlesh spell (as a multiplier, e.g., 0.2 = 20% increase).");
-		property.setLanguageKey("config." + Wizardry.MODID + ".oak_flesh_health_bonus");
-		property.setRequiresWorldRestart(true);
-		oakFleshHealthBonus = property.getDouble();
-		propOrder.add(property.getName());
-
-
-
 		// These two aren't sliders because using a slider makes it difficult to fine-tune the numbers; the nature of a
 		// scaling factor means that 0.5 is as big a change as 2.0, so whilst a slider is fine for increasing the
 		// damage, it doesn't give fine enough control for values less than 1.
@@ -1112,13 +805,6 @@ public final class Settings {
 		replaceVanillaFallDamage = property.getBoolean();
 		propOrder.add(property.getName());
 
-		property = config.get(TWEAKS_CATEGORY, "spellBookColorsRequireArchivistsEyeglass", false,
-				"If true, spell book colors are only shown when the player has the charm of spell discovery equipped.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".spell_book_colors_require_charm");
-		Wizardry.proxy.setToNamedBooleanEntry(property);
-		spellBookColorsRequireArchivistsEyeglass = property.getBoolean();
-		propOrder.add(property.getName());
-
 		property = config.get(TWEAKS_CATEGORY, "blindnessTweak", true,
 				"Whether to tweak the blindness effect to reduce follow distance when used on non-players. This automatically disables itself in favour of Potion Core's implementation if installed.");
 		property.setLanguageKey("config." + Wizardry.MODID + ".blindness_tweak");
@@ -1133,14 +819,6 @@ public final class Settings {
 		injectMobDrops = property.getBoolean();
 		propOrder.add(property.getName());
 
-		property = config.get(TWEAKS_CATEGORY, "recentSpellExpiryTime", 1200,
-				"The time in ticks after which recent spell casts expire and no longer count toward progression penalties. Default is 1200 ticks (1 minute). Lower values make progression penalties shorter-lived, higher values make them last longer.",
-				60, 72000); // Between 3 seconds and 1 hour
-		property.setLanguageKey("config." + Wizardry.MODID + ".recent_spell_expiry_time");
-		Wizardry.proxy.setToNumberSliderEntry(property);
-		recentSpellExpiryTime = property.getInt();
-		propOrder.add(property.getName());
-
 		property = config.get(TWEAKS_CATEGORY, "mobLootTableWhitelist", new String[0], "Whitelist for loot tables to inject additional mob drops (as specified in loot_tables/entities/mob_additions.json) into. Wizardry makes a best guess as to which loot tables belong to hostile mobs, but this may not always be correct or appropriate; add loot table locations (not entity IDs) to this list to manually include them.");
 		property.setLanguageKey("config." + Wizardry.MODID + ".mob_loot_table_whitelist");
 		property.setRequiresMcRestart(true);
@@ -1229,97 +907,25 @@ public final class Settings {
 		bookshelfSearchRadius = property.getInt();
 		propOrder.add(property.getName());
 
-		property = config.get(TWEAKS_CATEGORY, "currencyItems", new String[]{"gold_ingot 3", "emerald 6"}, "List of registry names of items which wizard trades can use as currency (in the first slot; the second slot is unaffected). Each entry in this list should consist of an item registry name, followed by a single space, then an integer which defines the 'value' of the item. Higher values mean fewer of that currency item are required for a given trade. To specify metadata, use the format 'modid:item:meta value'. For example, 'minecraft:wool:1 5'. If no metadata is given, any metadata will be accepted. NBT tags may optionally be specified in SNBT format immediately after the item/metadata, e.g. 'minecraft:potion{Potion:\"minecraft:strength\"} 3'.",
-				Pattern.compile(".+ [0-9]+"));
+		property = config.get(TWEAKS_CATEGORY, "currencyItems", new String[]{"gold_ingot 3", "emerald 6"}, "List of registry names of items which wizard trades can use as currency (in the first slot; the second slot is unaffected). Each entry in this list should consist of an item registry name, followed by a single space, then an integer which defines the 'value' of the item. Higher values mean fewer of that currency item are required for a given trade.",
+				Pattern.compile("[A-Za-z0-9:_]+ [0-9]+"));
 		property.setLanguageKey("config." + Wizardry.MODID + ".currency_items");
 		propOrder.add(property.getName());
 		currencyItems = new HashMap<>();
-		currencyItemNbt = new HashMap<>();
 		for(String string : property.getStringList()){
-			string = string.trim();
-			// Split on the last space to separate the item spec from the integer value; this correctly
-			// handles NBT strings that contain spaces inside quoted values.
-			int lastSpace = string.lastIndexOf(' ');
-			if(lastSpace < 0){
+			string = string.toLowerCase(Locale.ROOT).trim();
+			String[] args = string.split(" ");
+			if(args.length != 2){
 				Wizardry.logger.warn("Invalid entry in currency items: {}", string);
-				continue;
-			}
-			String itemSpec = string.substring(0, lastSpace).toLowerCase(Locale.ROOT);
-			String valueStr = string.substring(lastSpace + 1);
-			// Check for an optional NBT tag (do NOT lowercase the raw NBT string - it is case-sensitive)
-			int nbtStart = itemSpec.indexOf('{');
-			NBTTagCompound nbt = null;
-			if(nbtStart >= 0){
-				// Re-extract the NBT portion from the original (non-lowercased) string to preserve case
-				String rawNbt = string.substring(nbtStart, lastSpace);
-				itemSpec = itemSpec.substring(0, nbtStart);
-				try{
-					nbt = JsonToNBT.getTagFromJson(rawNbt);
-				}catch(NBTException e){
-					Wizardry.logger.warn("Invalid NBT in currency items '{}': {}", string, e.getMessage());
-					continue;
-				}
+				continue; // Ignore invalid entries, the pattern above should ensure this never happens
 			}
 			try{
-				Pair<ResourceLocation, Short> key = parseItemMetaString(itemSpec);
-				currencyItems.put(key, Integer.parseInt(valueStr));
-				if(nbt != null) currencyItemNbt.put(key, nbt);
+				currencyItems.put(parseItemMetaString(args[0]), Integer.parseInt(args[1]));
 			}catch(NumberFormatException e){
-				Wizardry.logger.warn("Invalid integer in currency items: {}", valueStr);
+				Wizardry.logger.warn("Invalid integer in currency items: {}", args[1]);
 			}
 		}
 
-		property = config.get(TWEAKS_CATEGORY, "cooldown_reduction_per_level", 0.15,
-				"The fraction by which cooldowns are reduced for each level of cooldown upgrade.",
-				0.05, Integer.MAX_VALUE); // Sure, I mean you COULD set it to 2^31-1... what could possibly go wrong?
-		property.setLanguageKey("config." + Wizardry.MODID + ".cooldown_reduction_per_level");
-		cooldownReductionPerLevel = property.getDouble();
-		propOrder.add(property.getName());
-
-		property = config.get(TWEAKS_CATEGORY, "storage_increase_per_level", 0.15,
-				"The fraction by which maximum charge is increased for each level of storage upgrade.",
-				0.05, Integer.MAX_VALUE);
-		property.setLanguageKey("config." + Wizardry.MODID + ".storage_increase_per_level");
-		storageIncreasePerLevel = (float) property.getDouble();
-		propOrder.add(property.getName());
-
-		property = config.get(TWEAKS_CATEGORY, "potency_increase_per_tier", 0.15,
-				"The fraction by which potency is increased for each tier of matching wand. May cause extreme lag with high values!",
-				0.05, Integer.MAX_VALUE);
-		property.setLanguageKey("config." + Wizardry.MODID + ".potency_increase_per_tier");
-		potencyIncreasePerTier = property.getDouble();
-		propOrder.add(property.getName());
-
-		property = config.get(TWEAKS_CATEGORY, "duration_increase_per_level", 0.25,
-				"The fraction by which spell duration is increased for each level of duration upgrade.",
-				0.05, Integer.MAX_VALUE);
-		property.setLanguageKey("config." + Wizardry.MODID + ".duration_increase_per_level");
-		durationIncreasePerLevel = property.getDouble();
-		propOrder.add(property.getName());
-
-		property = config.get(TWEAKS_CATEGORY, "range_increase_per_level", 0.25,
-				"The fraction by which spell range is increased for each level of range upgrade. May cause extreme lag with high values!",
-				0.05, Integer.MAX_VALUE);
-		property.setLanguageKey("config." + Wizardry.MODID + ".range_increase_per_level");
-		rangeIncreasePerLevel = property.getDouble();
-		propOrder.add(property.getName());
-
-		property = config.get(TWEAKS_CATEGORY, "blast_increase_per_level", 0.25,
-				"The fraction by which spell blast is increased for each level of blast upgrade. May cause extreme lag with high values!",
-				0.05, Integer.MAX_VALUE);
-		property.setLanguageKey("config." + Wizardry.MODID + ".blast_increase_per_level");
-		blastIncreasePerLevel = property.getDouble();
-		propOrder.add(property.getName());
-
-
-		property = config.get(TWEAKS_CATEGORY, "frost_slowness_increase_per_level", 0.5,
-				"The fraction by which movement speed is reduced per level of frost effect.",
-				0.05, Integer.MAX_VALUE);
-		property.setLanguageKey("config." + Wizardry.MODID + ".frost_slowness_increase_per_level");
-		frostSlownessIncreasePerLevel = property.getDouble();
-		propOrder.add(property.getName());
-
-
 		checkForRedundantOptions(TWEAKS_CATEGORY, propOrder); // Must be before the order is set!
 		config.setCategoryPropertyOrder(TWEAKS_CATEGORY, propOrder);
 
@@ -1417,22 +1023,6 @@ public final class Settings {
 		shrineFiles = getResourceLocationList(property);
 		propOrder.add(property.getName());
 
-		property = config.get(WORLDGEN_CATEGORY, "shrineRegenerationEnabled", false, "Whether conquered shrines should regenerate after a period of time. When disabled, shrines remain conquered permanently.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".shrine_regeneration_enabled");
-		shrineRegenerationEnabled = property.getBoolean();
-		propOrder.add(property.getName());
-
-		property = config.get(WORLDGEN_CATEGORY, "shrineRegenerationTime", 20, "Time in minutes for a conquered shrine to regenerate. Minimum 1 minute, maximum 1440 minutes (24 hours).", 1, 1440);
-		property.setLanguageKey("config." + Wizardry.MODID + ".shrine_regeneration_time");
-		Wizardry.proxy.setToNumberSliderEntry(property);
-		shrineRegenerationTime = property.getInt();
-		propOrder.add(property.getName());
-
-		property = config.get(WORLDGEN_CATEGORY, "shrineAllowMultipleLoot", false, "Whether players can loot shrines multiple times. If false, each player can only loot each shrine once until it regenerates.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".shrine_allow_multiple_loot");
-		shrineAllowMultipleLoot = property.getBoolean();
-		propOrder.add(property.getName());
-
 		property = config.get(WORLDGEN_CATEGORY, "libraryDimensions", new int[]{0}, "List of dimension ids in which library ruins will generate. Remove all dimensions to disable library ruins completely.");
 		property.setLanguageKey("config." + Wizardry.MODID + ".library_dimensions");
 		property.setRequiresWorldRestart(true);
@@ -1525,26 +1115,12 @@ public final class Settings {
 		showChargeMeter = property.getBoolean();
 		propOrder.add(property.getName());
 
-		property = config.get(CLIENT_CATEGORY, "spellBookColors", true, "Whether to show elemental colors on spell books for discovered spells.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".spell_book_colors");
-		property.setRequiresWorldRestart(false);
-		Wizardry.proxy.setToNamedBooleanEntry(property);
-		spellBookColors = property.getBoolean();
-		propOrder.add(property.getName());
-
 		property = config.get(CLIENT_CATEGORY, "loadHandbook", true, "Whether to initialise the in-game handbook. Setting this to false will brick the in-game handbook, but it might help if you have startup crashes.");
 		property.setLanguageKey("config." + Wizardry.MODID + ".load_handbook");
 		property.setRequiresWorldRestart(false);
 		Wizardry.proxy.setToNamedBooleanEntry(property);
 		loadHandbook = property.getBoolean();
 		propOrder.add(property.getName());
-		
-		property = config.get(CLIENT_CATEGORY, "unfocusedSearchBars", false, "Whether to allow the Arcane Workbench and lectern search field to lose focus and start unfocused. If true, the search field won't automatically capture keyboard input.");
-		property.setLanguageKey("config." + Wizardry.MODID + ".unfocused_search_bars");
-		property.setRequiresWorldRestart(false);
-		Wizardry.proxy.setToNamedBooleanEntry(property);
-		unfocusedSearchBars = property.getBoolean();
-		propOrder.add(property.getName());
 
 		property = config.get(CLIENT_CATEGORY, "spellHUDPosition", GuiPosition.BOTTOM_LEFT.name, "The position of the spell HUD.", GuiPosition.names);
 		property.setLanguageKey("config." + Wizardry.MODID + ".spell_hud_position");
@@ -1706,18 +1282,6 @@ public final class Settings {
 		}
 		propOrder.add(property.getName());
 
-		property = config.get(RESISTANCES_CATEGORY, "mobsImmuneToMagic", new String[]{},
-				"List of names of entities that are immune to magic, in addition to the defaults. Add mod creatures to this list if you want them to be immune to magic damage and they aren't already. SoundLoopSpellEntity names are not case sensitive. For mod entities, prefix with the mod ID (e.g. " + Wizardry.MODID + ":wizard).");
-		property.setLanguageKey("config." + Wizardry.MODID + ".mobs_immune_to_magic");
-		property.setRequiresMcRestart(true);
-		// Wizardry.proxy.setToEntityNameEntry(property);
-		// Converts all strings in the list to lower case, to ignore case sensitivity, and trims them.
-		for(int i = 0; i < property.getStringList().length; i++){
-			property.getStringList()[i] = property.getStringList()[i].toLowerCase(Locale.ROOT).trim();
-			MagicDamage.addEntityImmunity(EntityList.getClass(new ResourceLocation(property.getStringList()[i])),
-					DamageType.MAGIC);
-		}
-		propOrder.add(property.getName());
 		property = config.get(RESISTANCES_CATEGORY, "mobsImmuneToWither", new String[]{},
 				"List of names of entities that are immune to wither effects, in addition to the defaults. Add mod creatures to this list if you want them to be immune to withering magic and they aren't already. SoundLoopSpellEntity names are not case sensitive. For mod entities, prefix with the mod ID (e.g. " + Wizardry.MODID + ":wizard).");
 		property.setLanguageKey("config." + Wizardry.MODID + ".mobs_immune_to_wither");
@@ -1862,46 +1426,16 @@ public final class Settings {
 
 		string = string.toLowerCase(Locale.ROOT).trim();
 
+		String[] itemArgs = string.split(":");
 		String item;
 		short meta;
 
-		int lastColon = string.lastIndexOf(':');
-
-		if (lastColon > -1 && lastColon < string.length() - 1) { // if there is a colon and it's not the last char
-			String metaString = string.substring(lastColon + 1);
-			try {
-				short parsedMeta = Short.parseShort(metaString);
-				String itemString = string.substring(0, lastColon);
-
-				// If itemString has no colon, it could be 'item:meta' or 'namespace:numeric_path'.
-				// e.g., 'wool:1' vs 'mod:123'. We want to support 'wool:1' as item 'wool' with meta 1.
-				// We can't reliably distinguish the two cases without knowing all namespaces, so we have to use
-				// a heuristic. The original code favoured the 'item:meta' interpretation, let's stick with that.
-				// The issue was with 'namespace:numeric_path' which this logic now handles.
-				if (itemString.indexOf(':') == -1) {
-					item = itemString;
-					meta = parsedMeta;
-				} else {
-					// Disambiguate things like 'mod:123:4' (item 'mod:123' with meta 4) vs 'mod:item:123' (item 'mod:item' with meta 123)
-					// If the bit before the last colon is a valid resource location, it's probably item:meta
-					try {
-						new ResourceLocation(itemString);
-						item = itemString;
-						meta = parsedMeta;
-					} catch (Exception e) {
-						item = string;
-						meta = OreDictionary.WILDCARD_VALUE;
-					}
-				}
-
-			} catch (NumberFormatException e) {
-				// The part after colon is not a number, so it's part of the name
-				item = string;
-				meta = OreDictionary.WILDCARD_VALUE;
-			}
-		} else {
-			item = string;
+		try {
+			meta = Short.parseShort(itemArgs[itemArgs.length-1]);
+			item = String.join(":", Arrays.copyOfRange(itemArgs, 0, itemArgs.length-1));
+		}catch(NumberFormatException e){ // If no metadata is specified
 			meta = OreDictionary.WILDCARD_VALUE;
+			item = string;
 		}
 
 		return Pair.of(new ResourceLocation(item), meta);

src/main/java/electroblob/wizardry/Wizardry.java

@@ -82,7 +82,7 @@ public class Wizardry {
 	 * 1.x.x represents Minecraft 1.7.x versions, 2.x.x represents Minecraft 1.10.x versions, 3.x.x represents Minecraft
 	 * 1.11.x versions, and so on.
 	 */
-	public static final String VERSION = "4.3.18";
+	public static final String VERSION = "4.3.7";
 
 	/**
 	 * Json file used by Forge's built-in <a href="https://mcforge.readthedocs.io/en/1.12.x/gettingstarted/autoupdate/">update checker</a>.
@@ -130,6 +130,7 @@ public class Wizardry {
 
 		configDirectory = new File(event.getModConfigurationDirectory(), Wizardry.MODID);
 		settings.initConfig(event);
+		proxy.registerResourceReloadListeners();
 
 		Calendar calendar = Calendar.getInstance();
 		tisTheSeason = calendar.get(Calendar.MONTH) + 1 == 12 && calendar.get(Calendar.DAY_OF_MONTH) >= 24
@@ -160,13 +161,9 @@ public class Wizardry {
 
 	@EventHandler
 	public void init(FMLInitializationEvent event){
-		proxy.registerResourceReloadListeners();
 
 		settings.initConfigExtras();
 
-		// Update constants with configured values
-		settings.updateConstantsFromSettings();
-
 		// World generators
 		// Weight is a misnomer, it's actually the priority (where lower numbers get generated first)
 		// Literally nothing on typical 'weight' values here, there isn't even an upper limit
@@ -198,8 +195,6 @@ public class Wizardry {
 		// Client-side stuff (via proxies)
 		proxy.initGuiBits();
 		proxy.registerParticles();
-		proxy.registerItemColorHandlers();
-		proxy.registerModelProperties();
 		proxy.registerSoundEventListener();
 	}
 

src/main/java/electroblob/wizardry/WizardryEventHandler.java

@@ -203,6 +203,7 @@ public final class WizardryEventHandler {
 				// Find the angle between the direction the mob is looking and the direction the player is in
 				// Angle between a and b = acos((a.b) / (|a|*|b|))
 				double angle = Math.acos(vec.dotProduct(event.getEntity().getLookVec()) / vec.length());
+				System.out.println(angle);
 				// If the player is not within the 144-degree arc in front of the mob, it won't detect them
 				if(angle > 0.4 * Math.PI){
 					((EntityLiving)event.getEntityLiving()).setAttackTarget(null);
@@ -268,13 +269,13 @@ public final class WizardryEventHandler {
 				// Fireskin
 				if(event.getEntityLiving().isPotionActive(WizardryPotions.fireskin)
 						&& !MagicDamage.isEntityImmune(DamageType.FIRE, event.getEntityLiving()))
-					attacker.setFire(Spells.fire_breath.getProperty(Spell.BURN_DURATION).intValue() * 20);
+					attacker.setFire(Spells.fire_breath.getProperty(Spell.BURN_DURATION).intValue());
 
 				// Ice Shroud
 				if(event.getEntityLiving().isPotionActive(WizardryPotions.ice_shroud)
 						&& !MagicDamage.isEntityImmune(DamageType.FROST, event.getEntityLiving())
 						&& !(attacker instanceof FakePlayer)) // Fake players cause problems
-					if(!world.isRemote) attacker.addPotionEffect(new PotionEffect(WizardryPotions.frost,
+					attacker.addPotionEffect(new PotionEffect(WizardryPotions.frost,
 							Spells.ice_shroud.getProperty(Spell.EFFECT_DURATION).intValue(),
 							Spells.ice_shroud.getProperty(Spell.EFFECT_STRENGTH).intValue()));
 
@@ -326,7 +327,7 @@ public final class WizardryEventHandler {
 				level = EnchantmentHelper.getEnchantmentLevel(WizardryEnchantments.freezing_weapon,
 						attacker.getHeldItemMainhand());
 				// Frost lasts for longer because it doesn't do any actual damage
-				if(!event.getEntityLiving().world.isRemote && level > 0 && !MagicDamage.isEntityImmune(DamageType.FROST, event.getEntityLiving()))
+				if(level > 0 && !MagicDamage.isEntityImmune(DamageType.FROST, event.getEntityLiving()))
 					event.getEntityLiving().addPotionEffect(new PotionEffect(WizardryPotions.frost, level * 200, 0));
 			}
 		}
@@ -338,7 +339,7 @@ public final class WizardryEventHandler {
 			int level = event.getSource().getImmediateSource().getEntityData()
 					.getInteger(FreezingWeapon.FREEZING_ARROW_NBT_KEY);
 
-			if(!event.getEntityLiving().world.isRemote && level > 0 && !MagicDamage.isEntityImmune(DamageType.FROST, event.getEntityLiving()))
+			if(level > 0 && !MagicDamage.isEntityImmune(DamageType.FROST, event.getEntityLiving()))
 				event.getEntityLiving().addPotionEffect(new PotionEffect(WizardryPotions.frost, level * 150, 0));
 		}
 
@@ -490,4 +491,4 @@ public final class WizardryEventHandler {
 		}
 	}
 
-}
+}

src/main/java/electroblob/wizardry/api/IElemental.java

@@ -0,0 +1,8 @@
+package electroblob.wizardry.api;
+
+import electroblob.wizardry.constants.Element;
+
+public interface IElemental {
+
+	Element getElement();
+}

src/main/java/electroblob/wizardry/api/WizardryEnumHelper.java

@@ -18,7 +18,7 @@ public final class WizardryEnumHelper {
 	// Make sure these are updated if the relevant constructors are updated!
 	// Can't we do some kind of reflection to access them and generate these arrays?
 	private static final Class[] TIER_ARGUMENTS = new Class[]{Integer.class, Integer.class, Integer.class, Style.class, String.class};
-	private static final Class[] ELEMENT_ARGUMENTS = new Class[]{Style.class, String.class, String.class};
+	private static final Class[] ELEMENT_ARGUMENTS = new Class[]{Style.class, String.class, String.class, boolean.class, boolean.class};
 	private static final Class[] SPELL_TYPE_ARGUMENTS = new Class[]{String.class};
 	private static final Class[] SPELL_CONTEXT_ARGUMENTS = new Class[]{String.class};
 
@@ -55,12 +55,14 @@ public final class WizardryEnumHelper {
 	 * @param colour The colour of text associated with this element, as a style object.
 	 * @param name The unlocalised name of this element, as used in translation keys.
 	 * @param modID The mod ID of the mod that added this element, for icon rendering purposes.
+	 * @param worldgen Whether this element should have obelisks and shrines.
+	 * @param wizards Whether this element should have naturally occurring evil and good wizards.
 	 * @return The resulting {@code Element} enum constant.
 	 */
 	// This is the only one that needs the mod ID argument because elements are the only ones that have icons
 	// For some reason Minecraft doesn't seem to care about the resource domain for lang files, it just pools them
-	public static Element addElement(String codeName, Style colour, String name, String modID){
-		return EnumHelper.addEnum(Element.class, codeName, ELEMENT_ARGUMENTS, colour, name, modID);
+	public static Element addElement(String codeName, Style colour, String name, String modID, boolean worldgen, boolean wizards){
+		return EnumHelper.addEnum(Element.class, codeName, ELEMENT_ARGUMENTS, colour, name, modID, worldgen, wizards);
 	}
 
 	/**

src/main/java/electroblob/wizardry/block/BlockBookshelf.java

@@ -4,7 +4,6 @@ import com.google.common.collect.ImmutableList;
 import electroblob.wizardry.Settings;
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.WizardryGuiHandler;
-import electroblob.wizardry.inventory.ContainerBookshelf;
 import electroblob.wizardry.registry.WizardryItems;
 import electroblob.wizardry.registry.WizardryTabs;
 import electroblob.wizardry.tileentity.TileEntityBookshelf;
@@ -23,7 +22,6 @@ import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.InventoryHelper;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.*;
 import net.minecraft.util.math.BlockPos;
@@ -164,37 +162,7 @@ public class BlockBookshelf extends BlockHorizontal implements ITileEntityProvid
 
 		TileEntity tileEntity = world.getTileEntity(pos);
 
-		if(tileEntity == null){
-			return false;
-		}
-
-		if(player.isSneaking()){
-			ItemStack heldItem = player.getHeldItem(hand);
-			if(heldItem.isEmpty() && tileEntity instanceof TileEntityBookshelf){
-				if(!world.isRemote){
-					TileEntityBookshelf bookshelf = (TileEntityBookshelf)tileEntity;
-					for(int i = 0; i < bookshelf.getSizeInventory(); i++){
-						ItemStack stack = bookshelf.getStackInSlot(i);
-						if(!stack.isEmpty()){
-							player.addItemStackToInventory(stack.copy());
-							bookshelf.setInventorySlotContents(i, ItemStack.EMPTY);
-							break;
-						}
-					}
-				}
-				return true;
-			}else if(!heldItem.isEmpty() && ContainerBookshelf.isBook(heldItem) && tileEntity instanceof TileEntityBookshelf){
-				if(!world.isRemote){
-					TileEntityBookshelf bookshelf = (TileEntityBookshelf)tileEntity;
-					for(int i = 0; i < bookshelf.getSizeInventory(); i++){
-						if(bookshelf.getStackInSlot(i).isEmpty()){
-							bookshelf.setInventorySlotContents(i, heldItem.splitStack(1));
-							break;
-						}
-					}
-				}
-				return true;
-			}
+		if(tileEntity == null || player.isSneaking()){
 			return false;
 		}
 
@@ -288,7 +256,9 @@ public class BlockBookshelf extends BlockHorizontal implements ITileEntityProvid
 		// Wizardry books
 		registerBookModelTexture(() -> WizardryItems.spell_book, 			new ResourceLocation(Wizardry.MODID, "blocks/books_red"));
 		registerBookModelTexture(() -> WizardryItems.wizard_handbook, 		new ResourceLocation(Wizardry.MODID, "blocks/books_blue"));
-		registerBookModelTexture(() -> WizardryItems.arcane_tome, 			new ResourceLocation(Wizardry.MODID, "blocks/books_purple"));
+		registerBookModelTexture(() -> WizardryItems.arcane_tome_apprentice,new ResourceLocation(Wizardry.MODID, "blocks/books_purple"));
+		registerBookModelTexture(() -> WizardryItems.arcane_tome_advanced,	new ResourceLocation(Wizardry.MODID, "blocks/books_purple"));
+		registerBookModelTexture(() -> WizardryItems.arcane_tome_master,	new ResourceLocation(Wizardry.MODID, "blocks/books_purple"));
 		registerBookModelTexture(() -> WizardryItems.ruined_spell_book, 	new ResourceLocation(Wizardry.MODID, "blocks/books_brown"));
 		registerBookModelTexture(() -> WizardryItems.scroll, 				new ResourceLocation(Wizardry.MODID, "blocks/scrolls_blue"));
 		registerBookModelTexture(() -> WizardryItems.blank_scroll, 			new ResourceLocation(Wizardry.MODID, "blocks/scrolls_blue"));

src/main/java/electroblob/wizardry/block/BlockCrystal.java

@@ -1,29 +1,23 @@
 package electroblob.wizardry.block;
 
+import electroblob.wizardry.api.IElemental;
 import electroblob.wizardry.constants.Element;
 import electroblob.wizardry.registry.WizardryTabs;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 
 import java.util.EnumMap;
 
-public class BlockCrystal extends Block {
+public class BlockCrystal extends Block implements IElemental {
 
-    public static final PropertyEnum<Element> ELEMENT = PropertyEnum.create("element", Element.class);
+	private static final EnumMap<Element, MapColor> map_colours = new EnumMap<>(Element.class);
 
-    private static final EnumMap<Element, MapColor> map_colours = new EnumMap<>(Element.class);
-
-    static {
-    	map_colours.put(Element.MAGIC, MapColor.PINK);
+	static {
+		map_colours.put(Element.MAGIC, MapColor.PINK);
 		map_colours.put(Element.FIRE, MapColor.ORANGE_STAINED_HARDENED_CLAY);
 		map_colours.put(Element.ICE, MapColor.LIGHT_BLUE);
 		map_colours.put(Element.LIGHTNING, MapColor.CYAN);
@@ -32,45 +26,22 @@ public class BlockCrystal extends Block {
 		map_colours.put(Element.SORCERY, MapColor.LIME);
 		map_colours.put(Element.HEALING, MapColor.YELLOW);
 	}
-	
-	public BlockCrystal(Material material){
-		super(material);
-        this.setDefaultState(this.blockState.getBaseState().withProperty(ELEMENT, Element.MAGIC));
-        this.setCreativeTab(WizardryTabs.WIZARDRY);
+
+	@Override
+	public Element getElement() { return element; }
+
+	private final Element element;
+
+	public BlockCrystal(Element element) {
+		super(Material.IRON);
+		this.setCreativeTab(WizardryTabs.WIZARDRY);
 		this.setHarvestLevel("pickaxe", 2);
-	}
-	
-	@Override
-	public int damageDropped(IBlockState state){
-        return (state.getValue(ELEMENT)).ordinal();
-    }
-
-	@Override
-	public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos){
-		return map_colours.get(state.getProperties().get(ELEMENT));
+		this.element = element;
 	}
 
 	@Override
-	public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> items){
-		if(this.getCreativeTab() == tab){
-        	for(Element element : Element.values()){
-        		items.add(new ItemStack(this, 1, element.ordinal()));
-        	}
-        }
+	public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos) {
+		return map_colours.get(state.getProperties().get(element));
 	}
-	
-	@Override
-    public IBlockState getStateFromMeta(int metadata){
-        return this.getDefaultState().withProperty(ELEMENT, Element.values()[metadata]);
-    }
 
-    @Override
-    public int getMetaFromState(IBlockState state){
-        return (state.getValue(ELEMENT)).ordinal();
-    }
-
-    @Override
-    protected BlockStateContainer createBlockState(){
-        return new BlockStateContainer(this, ELEMENT);
-    }
 }

src/main/java/electroblob/wizardry/block/BlockCrystalFlower.java

@@ -57,7 +57,7 @@ public class BlockCrystalFlower extends BlockBush {
 	@SubscribeEvent
 	public static void onBonemealEvent(BonemealEvent event){
 		// Grows crystal flowers when bonemeal is used on grass
-		if(!event.getWorld().isRemote && Wizardry.settings.bonemealGrowsCrystalFlowers && event.getBlock().getBlock() == Blocks.GRASS){
+		if(Wizardry.settings.bonemealGrowsCrystalFlowers && event.getBlock().getBlock() == Blocks.GRASS){
 
 			BlockPos pos = event.getPos().add(event.getWorld().rand.nextInt(8) - event.getWorld().rand.nextInt(8),
 					event.getWorld().rand.nextInt(4) - event.getWorld().rand.nextInt(4),

src/main/java/electroblob/wizardry/block/BlockGildedWood.java

@@ -1,17 +1,30 @@
 package electroblob.wizardry.block;
 
 import electroblob.wizardry.registry.WizardryTabs;
+import net.minecraft.block.Block;
 import net.minecraft.block.BlockPlanks;
 import net.minecraft.block.SoundType;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockStateContainer;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
 
-public class BlockGildedWood extends BlockPlanks {
+public class BlockGildedWood extends Block {
 
-	public BlockGildedWood(){
-		super();
+	public BlockGildedWood()
+	{
+		super(Material.WOOD);
 		this.setCreativeTab(WizardryTabs.WIZARDRY);
 		this.setHardness(2.0F);
 		this.setResistance(5.0F);
 		this.setSoundType(SoundType.WOOD); // Why is this protected?!
 	}
-
-}
+}

src/main/java/electroblob/wizardry/block/BlockPedestal.java

@@ -1,140 +0,0 @@
-package electroblob.wizardry.block;
-
-import electroblob.wizardry.Wizardry;
-import electroblob.wizardry.constants.Element;
-import electroblob.wizardry.registry.WizardryTabs;
-import electroblob.wizardry.tileentity.TileEntityShrineCore;
-import net.minecraft.block.Block;
-import net.minecraft.block.ITileEntityProvider;
-import net.minecraft.block.material.MapColor;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.Explosion;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import javax.annotation.Nullable;
-import java.util.Arrays;
-import java.util.EnumMap;
-
-public class BlockPedestal extends Block implements ITileEntityProvider {
-
-	public static final PropertyEnum<Element> ELEMENT = PropertyEnum.create("element", Element.class,
-			Arrays.copyOfRange(Element.values(), 1, Element.values().length)); // Everything except MAGIC
-
-	// A 'natural' pedestal is one that was generated as part of a structure, is unbreakable and has a tileentity
-	public static final PropertyBool NATURAL = PropertyBool.create("natural");
-
-	private static final EnumMap<Element, MapColor> map_colours = new EnumMap<>(Element.class);
-
-	static {
-		map_colours.put(Element.FIRE, MapColor.RED_STAINED_HARDENED_CLAY);
-		map_colours.put(Element.ICE, MapColor.LIGHT_BLUE_STAINED_HARDENED_CLAY);
-		map_colours.put(Element.LIGHTNING, MapColor.CYAN_STAINED_HARDENED_CLAY);
-		map_colours.put(Element.NECROMANCY, MapColor.PURPLE_STAINED_HARDENED_CLAY);
-		map_colours.put(Element.EARTH, MapColor.BROWN_STAINED_HARDENED_CLAY);
-		map_colours.put(Element.SORCERY, MapColor.GRAY);
-		map_colours.put(Element.HEALING, MapColor.YELLOW_STAINED_HARDENED_CLAY);
-	}
-
-	public BlockPedestal(Material material){
-		super(material);
-		this.setDefaultState(this.blockState.getBaseState().withProperty(ELEMENT, Element.FIRE).withProperty(NATURAL, false));
-		this.setCreativeTab(WizardryTabs.WIZARDRY);
-		this.setHardness(1.5F);
-		this.setResistance(10.0F);
-	}
-
-	@Override
-	public int damageDropped(IBlockState state){
-		return state.getValue(ELEMENT).ordinal(); // Ignore the NATURAL state here, it's unobtainable
-	}
-
-	@Override
-	public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos){
-		return map_colours.get(state.getProperties().get(ELEMENT));
-	}
-
-	@Override
-	public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> items){
-		// Ignore the NATURAL state here, it's unobtainable
-		if(this.getCreativeTab() == tab){
-			for(Element element : Arrays.copyOfRange(Element.values(), 1, Element.values().length)){
-				items.add(new ItemStack(this, 1, element.ordinal()));
-			}
-		}
-	}
-
-	@Override
-	public BlockRenderLayer getRenderLayer(){
-		return BlockRenderLayer.CUTOUT; // Required to shade parts of the block faces differently to others
-	}
-
-	@Override
-	public float getBlockHardness(IBlockState state, World world, BlockPos pos){
-		// If shrine regeneration is enabled, make pedestal blocks with shrine cores unbreakable to prevent exploitation
-		if(!world.isRemote && Wizardry.settings != null && Wizardry.settings.shrineRegenerationEnabled){
-			TileEntity tileEntity = world.getTileEntity(pos);
-			if(tileEntity instanceof TileEntityShrineCore){
-				return -1; // Unbreakable if it has a shrine core
-			}
-		}
-		return state.getValue(NATURAL) ? -1 : super.getBlockHardness(state, world, pos);
-	}
-
-	@Override
-	public float getExplosionResistance(World world, BlockPos pos, @Nullable Entity exploder, Explosion explosion){
-		// If shrine regeneration is enabled, make pedestal blocks with shrine cores unbreakable to prevent exploitation
-		if(!world.isRemote && Wizardry.settings != null && Wizardry.settings.shrineRegenerationEnabled){
-			TileEntity tileEntity = world.getTileEntity(pos);
-			if(tileEntity instanceof TileEntityShrineCore){
-				return 6000000.0F; // Unbreakable if it has a shrine core
-			}
-		}
-		return world.getBlockState(pos).getValue(NATURAL) ? 6000000.0F : super.getExplosionResistance(world, pos, exploder, explosion);
-	}
-
-	@Override
-	public boolean hasTileEntity(IBlockState state){
-		return state.getValue(NATURAL); // Only naturally-generated pedestals have a (shrine core) tile entity
-	}
-
-	@Nullable
-	@Override
-	public TileEntity createNewTileEntity(World world, int meta){
-		return new TileEntityShrineCore();
-	}
-
-	@Override
-	public IBlockState getStateFromMeta(int metadata){
-		boolean natural = false;
-		if(metadata > ELEMENT.getAllowedValues().size()){
-			natural = true;
-			metadata -= ELEMENT.getAllowedValues().size();
-		}
-		Element element = Element.values()[metadata];
-		if(!ELEMENT.getAllowedValues().contains(element)) return this.getDefaultState().withProperty(NATURAL, natural);
-		return this.getDefaultState().withProperty(ELEMENT, element).withProperty(NATURAL, natural);
-	}
-
-	@Override
-	public int getMetaFromState(IBlockState state){
-		return state.getValue(ELEMENT).ordinal() + (state.getValue(NATURAL) ? ELEMENT.getAllowedValues().size() : 0);
-	}
-
-	@Override
-	protected BlockStateContainer createBlockState(){
-		return new BlockStateContainer(this, ELEMENT, NATURAL);
-	}
-
-}

src/main/java/electroblob/wizardry/block/BlockPermafrost.java

@@ -62,7 +62,7 @@ public class BlockPermafrost extends BlockDryFrostedIce {
 			entity.attackEntityFrom(DamageSource.MAGIC, Spells.permafrost.getProperty(Spell.DAMAGE).floatValue());
 			int duration = Spells.permafrost.getProperty(Spell.EFFECT_DURATION).intValue();
 			int amplifier = Spells.permafrost.getProperty(Spell.EFFECT_STRENGTH).intValue();
-			if(!world.isRemote) ((EntityLivingBase)entity).addPotionEffect(new PotionEffect(WizardryPotions.frost, duration, amplifier));
+			((EntityLivingBase)entity).addPotionEffect(new PotionEffect(WizardryPotions.frost, duration, amplifier));
 		}
 
 		// EntityLivingBase's slipperiness code doesn't get the block below it properly so slipperiness only works for

src/main/java/electroblob/wizardry/block/BlockReceptacle.java

@@ -1,6 +1,7 @@
 package electroblob.wizardry.block;
 
 import com.google.common.collect.Maps;
+import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.constants.Element;
 import electroblob.wizardry.item.ItemSpectralDust;
 import electroblob.wizardry.registry.*;
@@ -20,12 +21,14 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.NonNullList;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
 
 import javax.annotation.Nullable;
 import java.util.Arrays;
@@ -110,7 +113,7 @@ public class BlockReceptacle extends BlockTorch implements ITileEntityProvider {
 
 		if(tileEntity instanceof TileEntityReceptacle){
 			Element element = ((TileEntityReceptacle)tileEntity).getElement();
-			if(element != null) drops.add(new ItemStack(WizardryItems.spectral_dust, 1, element.ordinal()));
+			if(element != null) drops.add(new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID, "spectral_dust_" + element.name().toLowerCase())), 1));
 		}
 	}
 
@@ -219,7 +222,7 @@ public class BlockReceptacle extends BlockTorch implements ITileEntityProvider {
 
 				((TileEntityReceptacle)tileEntity).setElement(null);
 
-				ItemStack dust = new ItemStack(WizardryItems.spectral_dust, 1, currentElement.ordinal());
+				ItemStack dust = new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID, "spectral_dust_" + currentElement.name().toLowerCase())));
 
 				if(stack.isEmpty()){
 					player.setHeldItem(hand, dust);

src/main/java/electroblob/wizardry/block/BlockRunestone.java

@@ -5,24 +5,15 @@ import electroblob.wizardry.registry.WizardryTabs;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 
-import java.util.Arrays;
 import java.util.EnumMap;
 
 public class BlockRunestone extends Block {
 
-    public static final PropertyEnum<Element> ELEMENT = PropertyEnum.create("element", Element.class,
-			Arrays.copyOfRange(Element.values(), 1, Element.values().length)); // Everything except MAGIC
-
 	private static final EnumMap<Element, MapColor> map_colours = new EnumMap<>(Element.class);
 
 	static {
@@ -34,54 +25,24 @@ public class BlockRunestone extends Block {
 		map_colours.put(Element.SORCERY, MapColor.GRAY);
 		map_colours.put(Element.HEALING, MapColor.YELLOW_STAINED_HARDENED_CLAY);
 	}
-	
-	public BlockRunestone(Material material){
+
+	private final Element element;
+
+	public BlockRunestone(Material material, Element element) {
 		super(material);
-        this.setDefaultState(this.blockState.getBaseState().withProperty(ELEMENT, Element.FIRE));
-        this.setCreativeTab(WizardryTabs.WIZARDRY);
+		this.setCreativeTab(WizardryTabs.WIZARDRY);
 		this.setHardness(1.5F);
 		this.setResistance(10.0F);
-	}
-	
-	@Override
-	public int damageDropped(IBlockState state){
-        return state.getValue(ELEMENT).ordinal();
-    }
-
-	@Override
-	public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos){
-		return map_colours.get(state.getProperties().get(ELEMENT));
-	}
-	
-	@Override
-	public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> items){
-		if(this.getCreativeTab() == tab){
-        	for(Element element : Arrays.copyOfRange(Element.values(), 1, Element.values().length)){
-        		items.add(new ItemStack(this, 1, element.ordinal()));
-        	}
-        }
+		this.element = element;
 	}
 
+	public Element getElement() { return element; }
+
 	@Override
-	public BlockRenderLayer getRenderLayer(){
+	public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos) { return map_colours.get(element); }
+
+	@Override
+	public BlockRenderLayer getRenderLayer() {
 		return BlockRenderLayer.CUTOUT; // Required to shade parts of the block faces differently to others
 	}
-
-	@Override
-    public IBlockState getStateFromMeta(int metadata){
-		Element element = Element.values()[metadata];
-		if(!ELEMENT.getAllowedValues().contains(element)) return this.getDefaultState();
-        return this.getDefaultState().withProperty(ELEMENT, element);
-    }
-
-    @Override
-    public int getMetaFromState(IBlockState state){
-        return state.getValue(ELEMENT).ordinal();
-    }
-
-    @Override
-    protected BlockStateContainer createBlockState(){
-        return new BlockStateContainer(this, ELEMENT);
-    }
-
 }

src/main/java/electroblob/wizardry/block/BlockRunestonePedestal.java

@@ -0,0 +1,104 @@
+package electroblob.wizardry.block;
+
+import electroblob.wizardry.api.IElemental;
+import electroblob.wizardry.constants.Element;
+import electroblob.wizardry.registry.WizardryTabs;
+import electroblob.wizardry.tileentity.TileEntityShrineCore;
+import net.minecraft.block.Block;
+import net.minecraft.block.ITileEntityProvider;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockStateContainer;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockRenderLayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+import javax.annotation.Nullable;
+import java.util.EnumMap;
+
+public class BlockRunestonePedestal extends Block implements ITileEntityProvider, IElemental {
+
+	// A 'natural' pedestal is one that was generated as part of a structure, is unbreakable and has a tileentity
+	public static final PropertyBool NATURAL = PropertyBool.create("natural");
+
+	private static final EnumMap<Element, MapColor> map_colours = new EnumMap<>(Element.class);
+
+	static {
+		map_colours.put(Element.FIRE, MapColor.RED_STAINED_HARDENED_CLAY);
+		map_colours.put(Element.ICE, MapColor.LIGHT_BLUE_STAINED_HARDENED_CLAY);
+		map_colours.put(Element.LIGHTNING, MapColor.CYAN_STAINED_HARDENED_CLAY);
+		map_colours.put(Element.NECROMANCY, MapColor.PURPLE_STAINED_HARDENED_CLAY);
+		map_colours.put(Element.EARTH, MapColor.BROWN_STAINED_HARDENED_CLAY);
+		map_colours.put(Element.SORCERY, MapColor.GRAY);
+		map_colours.put(Element.HEALING, MapColor.YELLOW_STAINED_HARDENED_CLAY);
+	}
+
+	private final Element element;
+
+	public BlockRunestonePedestal(Material material, Element element) {
+		super(material);
+		this.setDefaultState(this.blockState.getBaseState().withProperty(NATURAL, false));
+		this.setCreativeTab(WizardryTabs.WIZARDRY);
+		this.setHardness(1.5F);
+		this.setResistance(10.0F);
+		this.element = element;
+	}
+
+	@Override
+	public Element getElement() {
+		return element;
+	}
+
+	@Override
+	public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos) {
+		return map_colours.get(element);
+	}
+
+	@Override
+	public BlockRenderLayer getRenderLayer() {
+		return BlockRenderLayer.CUTOUT; // Required to shade parts of the block faces differently to others
+	}
+
+	@Override
+	public float getBlockHardness(IBlockState state, World world, BlockPos pos) {
+		return state.getValue(NATURAL) ? -1 : super.getBlockHardness(state, world, pos);
+	}
+
+	@Override
+	public float getExplosionResistance(World world, BlockPos pos, @Nullable Entity exploder, Explosion explosion) {
+		return world.getBlockState(pos).getValue(NATURAL) ? 6000000.0F : super.getExplosionResistance(world, pos, exploder, explosion);
+	}
+
+	@Override
+	public boolean hasTileEntity(IBlockState state) {
+		return state.getValue(NATURAL); // Only naturally-generated pedestals have a (shrine core) tile entity
+	}
+
+	@Nullable
+	@Override
+	public TileEntity createNewTileEntity(World world, int meta) {
+		return new TileEntityShrineCore();
+	}
+
+	@Override
+	public IBlockState getStateFromMeta(int meta) {
+		return this.getDefaultState().withProperty(NATURAL, meta == 1);
+	}
+
+	@Override
+	public int getMetaFromState(IBlockState state) {
+		return state.getValue(NATURAL) ? 1 : 0;
+	}
+
+	@Override
+	protected BlockStateContainer createBlockState() {
+		return new BlockStateContainer(this, NATURAL);
+	}
+
+}

src/main/java/electroblob/wizardry/block/BlockSnare.java

@@ -68,11 +68,9 @@ public class BlockSnare extends Block implements ITileEntityProvider {
 
 					entity.attackEntityFrom(source, Spells.snare.getProperty(Spell.DAMAGE).floatValue());
 
-					if(!world.isRemote){
-						((EntityLivingBase)entity).addPotionEffect(new PotionEffect(MobEffects.SLOWNESS,
-								Spells.snare.getProperty(Spell.EFFECT_DURATION).intValue(),
-								Spells.snare.getProperty(Spell.EFFECT_STRENGTH).intValue()));
-					}
+					((EntityLivingBase)entity).addPotionEffect(new PotionEffect(MobEffects.SLOWNESS,
+							Spells.snare.getProperty(Spell.EFFECT_DURATION).intValue(),
+							Spells.snare.getProperty(Spell.EFFECT_STRENGTH).intValue()));
 
 					if(!world.isRemote) world.destroyBlock(pos, false);
 				}

src/main/java/electroblob/wizardry/block/BlockStatue.java

@@ -191,7 +191,7 @@ public class BlockStatue extends Block implements ITileEntityProvider {
 	// Making this an instance method means it works equally well for both types of statue
 	public boolean convertToStatue(EntityLiving target, @Nullable EntityLivingBase caster, int duration){
 		
-		if(target.deathTime > 0 || target.world.isRemote) return false;
+		if(target.deathTime > 0) return false;
 
 		BlockPos pos = new BlockPos(target);
 		World world = target.world;

src/main/java/electroblob/wizardry/client/ClientProxy.java

@@ -1,6 +1,7 @@
 package electroblob.wizardry.client;
 
 import electroblob.wizardry.CommonProxy;
+import electroblob.wizardry.Settings;
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.block.BlockBookshelf;
 import electroblob.wizardry.client.animation.ActionAnimation;
@@ -18,8 +19,6 @@ import electroblob.wizardry.client.model.ModelRobeArmour;
 import electroblob.wizardry.client.model.ModelSageArmour;
 import electroblob.wizardry.client.model.ModelWizardArmour;
 import electroblob.wizardry.client.particle.*;
-import electroblob.wizardry.constants.Element;
-import electroblob.wizardry.registry.WizardryItems;
 import electroblob.wizardry.client.particle.ParticleWizardry.IWizardryParticleFactory;
 import electroblob.wizardry.client.renderer.RenderSpectralGolem;
 import electroblob.wizardry.client.renderer.entity.*;
@@ -39,7 +38,6 @@ import electroblob.wizardry.entity.projectile.*;
 import electroblob.wizardry.event.SpellCastEvent;
 import electroblob.wizardry.event.SpellCastEvent.Source;
 import electroblob.wizardry.integration.antiqueatlas.WizardryAntiqueAtlasIntegration;
-import electroblob.wizardry.item.ItemArtefact;
 import electroblob.wizardry.item.ItemScroll;
 import electroblob.wizardry.item.ItemSpellBook;
 import electroblob.wizardry.item.ItemWand;
@@ -717,79 +715,6 @@ public class ClientProxy extends CommonProxy {
 		}else Wizardry.logger.warn("Received a PacketConquerShrine, but there was no shrine core at the position sent");
 	}
 
-	@Override
-	public void handleArcaneLockSyncPacket(PacketSyncArcaneLock.Message message){
-		if(Minecraft.getMinecraft().world != null){
-			TileEntity tileentity = Minecraft.getMinecraft().world.getTileEntity(message.pos);
-			if(tileentity != null){
-				if(message.locked){
-					tileentity.getTileData().setUniqueId(electroblob.wizardry.spell.ArcaneLock.NBT_KEY, message.owner);
-				}else{
-					electroblob.wizardry.util.NBTExtras.removeUniqueId(tileentity.getTileData(), electroblob.wizardry.spell.ArcaneLock.NBT_KEY);
-				}
-			}
-		}
-	}
-
-	@Override
-	public void handleBombExplosionPacket(PacketBombExplosion.Message message){
-
-		net.minecraft.world.World world = Minecraft.getMinecraft().world;
-		double x = message.x, y = message.y, z = message.z;
-		float blastMultiplier = message.blastMultiplier;
-
-		switch(message.bombType){
-
-			case PacketBombExplosion.FIREBOMB:
-				ParticleBuilder.create(Type.FLASH).pos(x, y, z).scale(5 * blastMultiplier).clr(1, 0.6f, 0).spawn(world);
-				for(int i = 0; i < 60 * blastMultiplier; i++){
-					ParticleBuilder.create(Type.MAGIC_FIRE, world.rand, x, y, z, 2 * blastMultiplier, false)
-							.time(10 + world.rand.nextInt(4)).scale(2 + world.rand.nextFloat()).spawn(world);
-					ParticleBuilder.create(Type.DARK_MAGIC, world.rand, x, y, z, 2 * blastMultiplier, false)
-							.clr(1.0f, 0.2f + world.rand.nextFloat() * 0.4f, 0.0f).spawn(world);
-				}
-				world.spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, x, y, z, 0, 0, 0);
-				break;
-
-			case PacketBombExplosion.POISON_BOMB:
-				ParticleBuilder.create(Type.FLASH).pos(x, y, z).scale(5 * blastMultiplier)
-						.clr(0.2f + world.rand.nextFloat() * 0.3f, 0.6f, 0.0f).spawn(world);
-				for(int i = 0; i < 60 * blastMultiplier; i++){
-					ParticleBuilder.create(Type.SPARKLE, world.rand, x, y, z, 2 * blastMultiplier, false).time(35)
-							.scale(2).clr(0.2f + world.rand.nextFloat() * 0.3f, 0.6f, 0.0f).spawn(world);
-					ParticleBuilder.create(Type.DARK_MAGIC, world.rand, x, y, z, 2 * blastMultiplier, false)
-							.clr(0.2f + world.rand.nextFloat() * 0.2f, 0.8f, 0.0f).spawn(world);
-				}
-				world.spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, x, y, z, 0, 0, 0);
-				break;
-
-			case PacketBombExplosion.SMOKE_BOMB:
-				ParticleBuilder.create(Type.FLASH).pos(x, y, z).scale(5 * blastMultiplier).clr(0, 0, 0).spawn(world);
-				world.spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, x, y, z, 0, 0, 0);
-				for(int i = 0; i < 60 * blastMultiplier; i++){
-					float brightness = world.rand.nextFloat() * 0.1f + 0.1f;
-					ParticleBuilder.create(Type.CLOUD, world.rand, x, y, z, 2 * blastMultiplier, false)
-							.clr(brightness, brightness, brightness).time(80 + world.rand.nextInt(12)).shaded(true).spawn(world);
-					brightness = world.rand.nextFloat() * 0.3f;
-					ParticleBuilder.create(Type.DARK_MAGIC, world.rand, x, y, z, 2 * blastMultiplier, false)
-							.clr(brightness, brightness, brightness).spawn(world);
-				}
-				break;
-
-			case PacketBombExplosion.SPARK_BOMB:
-				ParticleBuilder.spawnShockParticles(world, x, y, z);
-				for(int id : message.secondaryTargetIDs){
-					net.minecraft.entity.Entity target = world.getEntityByID(id);
-					if(target instanceof net.minecraft.entity.EntityLivingBase){
-						ParticleBuilder.create(Type.LIGHTNING).pos(x, y, z).target(target).spawn(world);
-						ParticleBuilder.spawnShockParticles(world, target.posX,
-								target.posY + target.height / 2, target.posZ);
-					}
-				}
-				break;
-		}
-	}
-
 	// Rendering
 	// ===============================================================================================================
 
@@ -952,51 +877,4 @@ public class ClientProxy extends CommonProxy {
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityImbuementAltar.class, new RenderImbuementAltar());
 
 	}
-
-	public void registerItemColorHandlers() {
-		// Spell book overlay textures are now per-element, so no runtime tinting is needed.
-	}
-
-	public void registerModelProperties() {
-		Item spellBook = WizardryItems.spell_book;
-
-		spellBook.addPropertyOverride(new ResourceLocation(Wizardry.MODID, "discovered"), (stack, world, entity) -> {
-			if (!Wizardry.settings.spellBookColors) return 0.0f;
-
-			boolean discovered = shouldDisplayDiscovered(Spell.byMetadata(stack.getMetadata()), stack);
-
-			if(discovered && Wizardry.settings.spellBookColorsRequireArchivistsEyeglass){
-				// Entity can be null so we have to check
-				if(entity instanceof EntityPlayer){
-					return ItemArtefact.isArtefactActive((EntityPlayer)entity, WizardryItems.charm_spell_discovery) ? 1.0f : 0.0f;
-				}
-				// If there's no entity, there's no charm, so no colour
-				return 0.0f;
-			}
-
-			return discovered ? 1.0f : 0.0f;
-		});
-
-		// Returns ordinal+1 for each element (1=MAGIC through 8=HEALING), or 0 if not yet discovered.
-		// Drives per-element bookmark texture selection via model overrides in spell_book.json.
-		spellBook.addPropertyOverride(new ResourceLocation(Wizardry.MODID, "element"), (stack, world, entity) -> {
-			if (!Wizardry.settings.spellBookColors) return 0.0f;
-
-			Spell spell = Spell.byMetadata(stack.getMetadata());
-			boolean discovered = shouldDisplayDiscovered(spell, stack);
-
-			if(!discovered) return 0.0f;
-
-			if(Wizardry.settings.spellBookColorsRequireArchivistsEyeglass){
-				if(entity instanceof EntityPlayer){
-					if(!ItemArtefact.isArtefactActive((EntityPlayer)entity, WizardryItems.charm_spell_discovery)) return 0.0f;
-				} else {
-					return 0.0f;
-				}
-			}
-
-			Element element = spell.getElement();
-			return element == null ? 0.0f : (float)(element.ordinal() + 1);
-		});
-	}
 }

src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java

@@ -1,11 +1,12 @@
 package electroblob.wizardry.client;
 
-import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.client.renderer.overlay.RenderBlinkEffect;
 import electroblob.wizardry.data.DispenserCastingData;
 import electroblob.wizardry.data.SpellEmitterData;
-import electroblob.wizardry.data.WizardData;
-import electroblob.wizardry.item.*;
+import electroblob.wizardry.item.ItemArtefact;
+import electroblob.wizardry.item.ItemFlamecatcher;
+import electroblob.wizardry.item.ItemSpectralBow;
+import electroblob.wizardry.item.ItemWand;
 import electroblob.wizardry.potion.PotionSlowTime;
 import electroblob.wizardry.registry.WizardryItems;
 import electroblob.wizardry.registry.WizardryPotions;
@@ -15,7 +16,6 @@ import electroblob.wizardry.spell.SlowTime;
 import electroblob.wizardry.spell.Transience;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
@@ -26,14 +26,14 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityDispenser;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
-import net.minecraftforge.client.event.*;
+import net.minecraftforge.client.event.FOVUpdateEvent;
+import net.minecraftforge.client.event.InputUpdateEvent;
+import net.minecraftforge.client.event.MouseEvent;
+import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.relauncher.Side;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import org.lwjgl.opengl.GL11;
 
 import java.util.ArrayList;
@@ -120,7 +120,6 @@ public final class WizardryClientEventHandler {
 			Minecraft.getMinecraft().player.prevRotationPitch = 0;
 			Minecraft.getMinecraft().player.rotationYaw = 0;
 			Minecraft.getMinecraft().player.rotationPitch = 0;
-
 		}
 	}
 
@@ -134,10 +133,10 @@ public final class WizardryClientEventHandler {
 			event.getMovementInput().jump = false;
 			event.getMovementInput().sneak = false;
 		}
-		
+
 		if(ItemArtefact.isArtefactActive(event.getEntityPlayer(), WizardryItems.charm_move_speed)
 				&& event.getEntityPlayer().isHandActive()
-				&& event.getEntityPlayer().getActiveItemStack().getItem() instanceof ISpellCastingItem){
+				&& event.getEntityPlayer().getActiveItemStack().getItem() instanceof ItemWand){
 			// Normally speed is set to 20% when using items, this makes it 80%
 			event.getMovementInput().moveStrafe *= 4;
 			event.getMovementInput().moveForward *= 4;
@@ -188,26 +187,6 @@ public final class WizardryClientEventHandler {
 		}
 	}
 
-	@SubscribeEvent
-	public static void onGuiOpenEvent(GuiOpenEvent event){
-
-		if(Minecraft.getMinecraft().player != null && event.getGui() instanceof GuiContainer) {
-			WizardData data = WizardData.get(Minecraft.getMinecraft().player);
-			if (data != null && data.getVariable(Possession.POSSESSEE_KEY) != null) {
-				event.setCanceled(true);
-			}
-		}
-	}
-
-	@SubscribeEvent
-	public static void onItemTooltip(ItemTooltipEvent event) {
-		if (event.getItemStack().getItem() == WizardryItems.charm_spell_discovery) {
-			if (Wizardry.settings.spellBookColorsRequireArchivistsEyeglass) {
-				event.getToolTip().add(TextFormatting.GRAY + I18n.format("item.ebwizardry:charm_spell_discovery.desc.color"));
-			}
-		}
-	}
-
 	/**
 	 * Renders an overlay across the entire screen.
 	 * @param resolution The screen resolution

src/main/java/electroblob/wizardry/client/gui/GuiArcaneWorkbench.java

@@ -93,7 +93,6 @@ public class GuiArcaneWorkbench extends GuiContainer {
 	private ContainerArcaneWorkbench arcaneWorkbenchContainer;
 
 	private GuiButton applyBtn;
-	private GuiButton clearBtn;
 	private GuiButton[] sortButtons = new GuiButton[3];
 
 	private GuiTextField searchField;
@@ -127,7 +126,6 @@ public class GuiArcaneWorkbench extends GuiContainer {
 
 		this.buttonList.clear();
 		this.buttonList.add(this.applyBtn = new GuiButtonApply(0, this.width / 2 + 64, this.height / 2 + 3));
-		this.buttonList.add(this.clearBtn = new GuiButtonClear(0, this.width / 2 + 64, this.height / 2 - 16));
 		this.buttonList.add(sortButtons[0] = new GuiButtonSpellSort(1, this.guiLeft - 44, this.guiTop + 8, ISpellSortable.SortType.TIER, arcaneWorkbenchContainer, this));
 		this.buttonList.add(sortButtons[1] = new GuiButtonSpellSort(2, this.guiLeft - 31, this.guiTop + 8, ISpellSortable.SortType.ELEMENT, arcaneWorkbenchContainer, this));
 		this.buttonList.add(sortButtons[2] = new GuiButtonSpellSort(3, this.guiLeft - 18, this.guiTop + 8, ISpellSortable.SortType.ALPHABETICAL, arcaneWorkbenchContainer, this));
@@ -137,8 +135,8 @@ public class GuiArcaneWorkbench extends GuiContainer {
 		this.searchField.setEnableBackgroundDrawing(false);
 		this.searchField.setVisible(true);
 		this.searchField.setTextColor(16777215);
-		this.searchField.setCanLoseFocus(Wizardry.settings.unfocusedSearchBars); // false by default
-		this.searchField.setFocused(!Wizardry.settings.unfocusedSearchBars); // true by default
+		this.searchField.setCanLoseFocus(false);
+		this.searchField.setFocused(true);
 
 		this.tooltipElements.clear();
 		this.tooltipElements.add(new TooltipElementItemName(new Style().setColor(TextFormatting.WHITE), LINE_SPACING_WIDE));
@@ -207,7 +205,6 @@ public class GuiArcaneWorkbench extends GuiContainer {
 
 		// Show/hide the relevant gui elements
 		this.applyBtn.enabled = centreSlot.getHasStack();
-		this.clearBtn.enabled = centreSlot.getHasStack() && centreSlot.getStack().getItem() instanceof IWorkbenchItem && ((IWorkbenchItem) centreSlot.getStack().getItem()).isClearable();
 		for(GuiButton button : this.sortButtons) button.visible = arcaneWorkbenchContainer.hasBookshelves();
 		this.searchField.setVisible(arcaneWorkbenchContainer.hasBookshelves());
 
@@ -431,16 +428,6 @@ public class GuiArcaneWorkbench extends GuiContainer {
 
 	// Controls
 
-	@Override
-	protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
-		super.mouseClicked(mouseX, mouseY, mouseButton);
-		if (this.searchField != null) {
-			this.searchField.mouseClicked(mouseX, mouseY, mouseButton);
-			// Set focus depending on whether the click was inside the search field
-			this.searchField.setFocused(this.searchField.isFocused());
-		}
-	}
-
 	@Override
 	protected void actionPerformed(GuiButton button){
 
@@ -457,17 +444,6 @@ public class GuiArcaneWorkbench extends GuiContainer {
 				animationTimer = 20;
 			}
 
-			if(button == clearBtn){
-				// Packet building
-				IMessage msg = new PacketControlInput.Message(PacketControlInput.ControlType.CLEAR_BUTTON);
-				WizardryPacketHandler.net.sendToServer(msg);
-				// Sound
-				Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(
-						WizardrySounds.BLOCK_ARCANE_WORKBENCH_SPELLBIND, 0.8f));
-				// Animation
-				animationTimer = 20;
-			}
-
 			if(button instanceof GuiButtonSpellSort) this.arcaneWorkbenchContainer.setSortType(((GuiButtonSpellSort)button).sortType);
 		}
 	}
@@ -515,13 +491,12 @@ public class GuiArcaneWorkbench extends GuiContainer {
 	@Override
 	protected void keyTyped(char typedChar, int keyCode) throws IOException {
 
-        if(this.searchNeedsClearing){
-            this.searchNeedsClearing = false;
+		if(this.searchNeedsClearing){
+			this.searchNeedsClearing = false;
 			this.searchField.setText("");
 		}
 
-        // Allow exiting the GUI by pressing the inventory button. Does not work if bookshelves are present by default
-		if(this.searchField.getVisible() && this.searchField.textboxKeyTyped(typedChar, keyCode)){
+		if(this.searchField.textboxKeyTyped(typedChar, keyCode)){
 			arcaneWorkbenchContainer.setSearchText(searchField.getText().toLowerCase(Locale.ROOT));
 		}else{
 			super.keyTyped(typedChar, keyCode);
@@ -1031,36 +1006,4 @@ public class GuiArcaneWorkbench extends GuiContainer {
 		}
 	}
 
-	private static class GuiButtonClear extends GuiButton {
-
-		public GuiButtonClear(int id, int x, int y){
-			super(id, x, y, 16, 16, I18n.format("container." + Wizardry.MODID + ":arcane_workbench.clear"));
-		}
-
-		@Override
-		public void drawButton(Minecraft minecraft, int mouseX, int mouseY, float partialTicks){
-
-			// Whether the button is highlighted
-			this.hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height;
-
-			int k = 72;
-			int l = 236;
-			//int colour = 14737632;
-
-			if(this.enabled){
-				if(this.hovered){
-					k += this.width * 2;
-					//colour = 16777120;
-				}
-			}else{
-				k += this.width;
-				//colour = 10526880;
-			}
-
-			DrawingUtils.drawTexturedRect(this.x, this.y, k, l, this.width, this.height, TEXTURE_WIDTH, TEXTURE_HEIGHT);
-			//this.drawCenteredString(minecraft.fontRenderer, this.displayString, this.x + this.width / 2,
-			//		this.y + (this.height - 8) / 2, colour);
-		}
-	}
-
-}
+}

src/main/java/electroblob/wizardry/client/gui/GuiLectern.java

@@ -184,8 +184,9 @@ public class GuiLectern extends GuiSpellInfo implements ISpellSortable {
 		this.searchField.setEnableBackgroundDrawing(false);
 		this.searchField.setVisible(true);
 		this.searchField.setTextColor(16777215);
-		this.searchField.setCanLoseFocus(Wizardry.settings.unfocusedSearchBars); // false by default
-		this.searchField.setFocused(!Wizardry.settings.unfocusedSearchBars); // true by default
+		this.searchField.setCanLoseFocus(false);
+		this.searchField.setFocused(true);
+
 		refreshAvailableSpells(); // Must be done last
 
 	}
@@ -268,13 +269,8 @@ public class GuiLectern extends GuiSpellInfo implements ISpellSortable {
 
 	@Override
 	protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
-	   super.mouseClicked(mouseX, mouseY, mouseButton);
-	   if (this.searchField != null) {
-		   this.searchField.mouseClicked(mouseX, mouseY, mouseButton);
-		   // Set focus depending on whether the click was inside the search field
-		   this.searchField.setFocused(this.searchField.isFocused());
-	   }
-	   searchNeedsClearing = true;
+		super.mouseClicked(mouseX, mouseY, mouseButton);
+		searchNeedsClearing = true;
 	}
 
 	@Override

src/main/java/electroblob/wizardry/client/gui/handbook/GuiWizardHandbook.java

@@ -33,13 +33,9 @@ import java.awt.*;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.nio.charset.StandardCharsets;
 
 /**
  * GUI class for the wizard's handbook. Like any GUI class, this is instantiated each time the book is opened. As of
@@ -59,8 +55,6 @@ public class GuiWizardHandbook extends GuiScreen {
 
 	private static final ResourceLocation DEFAULT = new ResourceLocation(Wizardry.MODID, "texts/handbook_en_us.json");
 
-	private static List<String> ADDONS = new ArrayList<>();
-
 	static final ResourceLocation texture = new ResourceLocation(Wizardry.MODID, "textures/gui/handbook/handbook.png");
 
 	/** Global Gson instance for the handbook. */
@@ -412,10 +406,9 @@ public class GuiWizardHandbook extends GuiScreen {
 			return;
 		}
 
-	//	IResource handbookFile = getHandbookResource(manager);
-		List<IResource> handbookFiles = getHandbookResource(manager);
+		IResource handbookFile = getHandbookResource(manager);
 
-		if(!handbookFiles.isEmpty()){
+		if(handbookFile != null){
 
 			// Wipes all the maps before repopulating them
 			images.clear();
@@ -425,31 +418,28 @@ public class GuiWizardHandbook extends GuiScreen {
 
 			bookmarkSection = null; // Also need to wipe the reference to the old bookmarked section
 
-			for (IResource handbookFile : handbookFiles) {
+			BufferedReader reader = new BufferedReader(new InputStreamReader(handbookFile.getInputStream(), StandardCharsets.UTF_8));
 
-				BufferedReader reader = new BufferedReader(new InputStreamReader(handbookFile.getInputStream(), StandardCharsets.UTF_8));
+			JsonElement je = gson.fromJson(reader, JsonElement.class);
+			JsonObject json = je.getAsJsonObject();
 
-				JsonElement je = gson.fromJson(reader, JsonElement.class);
-				JsonObject json = je.getAsJsonObject();
+			JsonUtils.getJsonObject(json, "colours").entrySet().forEach(e -> colours.put(e.getKey(),
+					Color.decode(e.getValue().getAsString()).getRGB()));
 
-				JsonUtils.getJsonObject(json, "colours").entrySet().forEach(e -> colours.put(e.getKey(),
-						Color.decode(e.getValue().getAsString()).getRGB()));
+			// Repopulates the remaining maps
+			Image.populate(images, json);
+			CraftingRecipe.populate(recipes, json);
+			Section.populate(sections, json);
 
-				// Repopulates the remaining maps
-				Image.populate(images, json);
-				CraftingRecipe.populate(recipes, json);
-				Section.populate(sections, json);
+			sectionList = Collections.unmodifiableList(new ArrayList<>(sections.values()));
 
-				sectionList = Collections.unmodifiableList(new ArrayList<>(sections.values()));
-
-				if(sections.isEmpty()){
-					Wizardry.logger.warn("Handbook has no sections! Aborting loading...");
-					return;
-				}
-
-				bookmarkSection = JsonUtils.getString(json, "bookmark_start_section");
-				if(!sections.containsKey(bookmarkSection)) throw new JsonSyntaxException("Section with id " + bookmarkSection + " is undefined");
+			if(sections.isEmpty()){
+				Wizardry.logger.warn("Handbook has no sections! Aborting loading...");
+				return;
 			}
+
+			bookmarkSection = JsonUtils.getString(json, "bookmark_start_section");
+			if(!sections.containsKey(bookmarkSection)) throw new JsonSyntaxException("Section with id " + bookmarkSection + " is undefined");
 		}
 
 		// The first resource load on startup is done before the packet handler is loaded
@@ -465,17 +455,16 @@ public class GuiWizardHandbook extends GuiScreen {
 	 * @param manager The resource manager instance to use.
 	 * @return The handbook JSON file, as an IResource, or null if it was not found.
 	 */
-	private static List<IResource> getHandbookResource(IResourceManager manager){
+	private static IResource getHandbookResource(IResourceManager manager){
 
 		// TODO: Implement resource pack stacking to allow addon mods and texture packs to add/overwrite content
 
 		IResource handbookFile = null;
-		List<IResource> handbookFiles = new ArrayList<>();
 
 		try{
 			handbookFile = manager.getResource(new ResourceLocation(Wizardry.MODID, "texts/handbook_"
 					+ Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode() + ".json"));
-		}catch(Exception e){
+		}catch(IOException e){
 
 			Wizardry.logger.info("Wizard handbook JSON file missing for the current language (" + Minecraft.getMinecraft()
 					.getLanguageManager().getCurrentLanguage() + "). Using default (English-US) instead.");
@@ -487,29 +476,7 @@ public class GuiWizardHandbook extends GuiScreen {
 			}
 		}
 
-		handbookFiles.add(handbookFile);
-
-		for (String modid : ADDONS) {
-			// Addons
-			Wizardry.logger.info("Registering addon Wizard's Handbook contents for " + modid);
-			try{
-				handbookFile = manager.getResource(new ResourceLocation(modid, "texts/handbook_"
-						+ Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode() + ".json"));
-			}catch(Exception e){
-
-				Wizardry.logger.info("Wizard handbook JSON file missing for the current language (" + Minecraft.getMinecraft()
-						.getLanguageManager().getCurrentLanguage() + "). Using default (English-US) instead.");
-
-				try{
-					handbookFile = manager.getResource(new ResourceLocation(modid, "texts/handbook_en_us.json"));
-				}catch(IOException x){
-					Wizardry.logger.error("Couldn't find file: " + DEFAULT + ". The file may be missing; please try re-downloading and reinstalling Wizardry.", x);
-				}
-			}
-			handbookFiles.add(handbookFile);
-		}
-
-		return handbookFiles;
+		return handbookFile;
 	}
 
 	// Controls
@@ -609,9 +576,4 @@ public class GuiWizardHandbook extends GuiScreen {
 		sections.values().forEach(s -> s.updateUnlockStatus(showToasts, completedAdvancements));
 	}
 
-	public static void registerAddonHandbookContent(String modid) {
-		if (!ADDONS.contains(modid)) {
-			ADDONS.add(modid);
-		}
-	}
 }

src/main/java/electroblob/wizardry/client/gui/handbook/Section.java

@@ -299,7 +299,7 @@ class Section {
 						String suffix = "";
 
 						// Account for trailing punctuation, except in languages that don't use spaces such as Chinese
-						boolean spaceless = SPACELESS_LANGUAGES.contains(Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage() == null ? "en_us" : Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode());
+						boolean spaceless = SPACELESS_LANGUAGES.contains(Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode());
 						if(!spaceless) paragraph.substring(linkEnd).split("\\s", 2)[0].substring(1); // substring(1) to remove the @
 
 						// The index of the single page currently being formatted, relative to the section

src/main/java/electroblob/wizardry/client/model/WizardryModels.java

@@ -1,13 +1,9 @@
 package electroblob.wizardry.client.model;
 
 import electroblob.wizardry.Wizardry;
-import electroblob.wizardry.block.BlockCrystal;
-import electroblob.wizardry.block.BlockPedestal;
-import electroblob.wizardry.block.BlockRunestone;
+import electroblob.wizardry.block.BlockRunestonePedestal;
 import electroblob.wizardry.item.IMultiTexturedItem;
 import electroblob.wizardry.item.ItemBlockMultiTextured;
-import electroblob.wizardry.item.ItemCrystal;
-import electroblob.wizardry.item.ItemSpectralDust;
 import electroblob.wizardry.registry.WizardryBlocks;
 import electroblob.wizardry.registry.WizardryItems;
 import net.minecraft.block.BlockPlanks;
@@ -50,35 +46,12 @@ public final class WizardryModels {
 	@SubscribeEvent
 	public static void register(ModelRegistryEvent event){
 
-		// ItemBlocks
-
-		ModelLoader.setCustomStateMapper(WizardryBlocks.crystal_block, new StateMap.Builder()
-				.withName(BlockCrystal.ELEMENT).withSuffix("_crystal_block").build());
-		// Yay unchecked casting! But we know it's always ok here, and it makes everything much neater.
-		ItemBlockMultiTextured crystalBlockItem = (ItemBlockMultiTextured)Item.getItemFromBlock(WizardryBlocks.crystal_block);
-		registerMultiTexturedModel(crystalBlockItem);
-
-		ModelLoader.setCustomStateMapper(WizardryBlocks.runestone, new StateMap.Builder()
-				.withName(BlockRunestone.ELEMENT).withSuffix("_runestone").build());
-		ItemBlockMultiTextured runestoneItem = (ItemBlockMultiTextured)Item.getItemFromBlock(WizardryBlocks.runestone);
-		registerMultiTexturedModel(runestoneItem);
-
-		ModelLoader.setCustomStateMapper(WizardryBlocks.runestone_pedestal, new StateMap.Builder()
-				.withName(BlockPedestal.ELEMENT).ignore(BlockPedestal.NATURAL).withSuffix("_runestone_pedestal").build()); // Don't care about NATURAL property
-		ItemBlockMultiTextured pedestalItem = (ItemBlockMultiTextured)Item.getItemFromBlock(WizardryBlocks.runestone_pedestal);
-		registerMultiTexturedModel(pedestalItem);
-
-		ModelLoader.setCustomStateMapper(WizardryBlocks.gilded_wood, new StateMap.Builder()
-				.withName(BlockPlanks.VARIANT).withSuffix("_gilded_wood").build());
-		ItemBlockMultiTextured gildedWoodItem = (ItemBlockMultiTextured)Item.getItemFromBlock(WizardryBlocks.gilded_wood);
-		registerMultiTexturedModel(gildedWoodItem);
-
 		// Explanation for all this here -> https://github.com/TheGreyGhost/MinecraftByExample/tree/master/src/main/java/minecraftbyexample/mbe05_block_dynamic_block_model2
 		ModelLoaderRegistry.registerLoader(new ModelLoaderBookshelf());
 
 		// Items
 
-		registerMultiTexturedModel((ItemCrystal)WizardryItems.magic_crystal);
+		//registerMultiTexturedModel((ItemCrystal)WizardryItems.magic_crystal);
 
 		registerWandModel(WizardryItems.magic_wand);
 		registerWandModel(WizardryItems.apprentice_wand);
@@ -121,8 +94,6 @@ public final class WizardryModels {
 		registerWandModel(WizardryItems.master_sorcery_wand);
 		registerWandModel(WizardryItems.master_healing_wand);
 
-		registerMultiTexturedModel((ItemSpectralDust)WizardryItems.spectral_dust);
-
 		// Automatic item model registry
 		for(Item item : Item.REGISTRY){
 			if(!registeredItems.contains(item) && item.getRegistryName().getNamespace().equals(Wizardry.MODID)){

src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerDiamond.java

@@ -42,8 +42,8 @@ public class LayerDiamond extends LayerTiledOverlay<EntityLivingBase> {
 
 		int j = entity.getBrightnessForRender();
         	int k = j % 65536;
-			int l = j / 65536;
-			OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) k, (float) l);
+        	int l = j / 65536;
+        	OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) k, (float) l);
 
 		super.doRenderLayer(entity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale);
 

src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerOak.java

@@ -43,7 +43,7 @@ public class LayerOak extends LayerTiledOverlay<EntityLivingBase> {
 		int j = entity.getBrightnessForRender();
         	int k = j % 65536;
         	int l = j / 65536;
-			OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) k, (float) l);
+        	OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) k, (float) l);
 
 		super.doRenderLayer(entity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale);
 

src/main/java/electroblob/wizardry/client/renderer/overlay/RenderSixthSense.java

@@ -60,12 +60,10 @@ public class RenderSixthSense {
 
 		Minecraft mc = Minecraft.getMinecraft();
 		RenderManager renderManager = event.getRenderer().getRenderManager();
-		float effectRadius = Spells.sixth_sense.getProperty(Spell.EFFECT_RADIUS).floatValue();
-		float distance = event.getEntity().getDistance(mc.player);
 
 		if(mc.player.isPotionActive(WizardryPotions.sixth_sense) && !(event.getEntity() instanceof EntityArmorStand)
 				&& event.getEntity() != mc.player && mc.player.getActivePotionEffect(WizardryPotions.sixth_sense) != null
-				&& distance < effectRadius
+				&& event.getEntity().getDistance(mc.player) < Spells.sixth_sense.getProperty(Spell.EFFECT_RADIUS).floatValue()
 				* (1 + mc.player.getActivePotionEffect(WizardryPotions.sixth_sense).getAmplifier() * Constants.RANGE_INCREASE_PER_LEVEL)){
 
 			Tessellator tessellator = Tessellator.getInstance();
@@ -89,13 +87,7 @@ public class RenderSixthSense {
 			GlStateManager.rotate(180 - renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
 			GlStateManager.rotate(yaw, 1.0F, 0.0F, 0.0F);
 
-			//Decreases the opacity of the marker after 80% of the effect distance
-			float alpha = 1f;
-			float f = 5 * (1f - distance / effectRadius);
-			if (f <= 1) {
-				alpha = f;
-			}
-			GlStateManager.color(1, 1, 1, alpha);
+			GlStateManager.color(1, 1, 1, 1);
 
 			ResourceLocation texture = PASSIVE_MOB_MARKER_TEXTURE;
 

src/main/java/electroblob/wizardry/client/renderer/tileentity/RenderArcaneLock.java

@@ -60,12 +60,8 @@ public class RenderArcaneLock {
 
 					GlStateManager.pushMatrix();
 					GlStateManager.enableBlend();
-					GlStateManager.enableDepth();
-					GlStateManager.depthMask(true);
-					GlStateManager.disableCull();
 					lighting = GL11.glIsEnabled(GL11.GL_LIGHTING);
 					GlStateManager.disableLighting();
-					GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
 					OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240);
 					GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 
@@ -94,7 +90,6 @@ public class RenderArcaneLock {
 
 			tessellator.draw();
 
-			GlStateManager.enableCull();
 			GlStateManager.disableBlend();
 			GlStateManager.enableTexture2D();
 			if(lighting){

src/main/java/electroblob/wizardry/constants/Constants.java

@@ -1,6 +1,5 @@
 package electroblob.wizardry.constants;
 
-import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.WizardryEventHandler;
 
 /** Stores various global constants used in Wizardry. */
@@ -8,62 +7,44 @@ public final class Constants {
 
 	/** The amount of mana a crystal shard is worth */
 	// 100 doesn't divide nicely by 9 so we're calling this 10. I guess you lose a little bit by smashing a crystal.
-	public static int MANA_PER_SHARD;
+	public static final int MANA_PER_SHARD = 10;
 	/** The amount of mana each magic crystal is worth */
-	public static int MANA_PER_CRYSTAL;
+	public static final int MANA_PER_CRYSTAL = 100;
 	/** The amount of mana a grand magic crystal is worth */
-	public static int GRAND_CRYSTAL_MANA;
+	public static final int GRAND_CRYSTAL_MANA = 400;
 	/** The maximum number of one type of wand upgrade which can be applied to a wand. */
-	public static int UPGRADE_STACK_LIMIT;
+	public static final int UPGRADE_STACK_LIMIT = 3;
 	/** The bonus amount of wand upgrades that can be applied to a non-elemental wand. */
-	public static int NON_ELEMENTAL_UPGRADE_BONUS;
+	public static final int NON_ELEMENTAL_UPGRADE_BONUS = 3;
 	/** The fraction by which cooldowns are reduced for each level of cooldown upgrade. */
-	public static float COOLDOWN_REDUCTION_PER_LEVEL;
+	public static final float COOLDOWN_REDUCTION_PER_LEVEL = 0.15f;
 	/** The fraction by which maximum charge is increased for each level of storage upgrade. */
-	public static float STORAGE_INCREASE_PER_LEVEL;
+	public static final float STORAGE_INCREASE_PER_LEVEL = 0.15f;
 	/** The fraction by which potency is increased for each tier of matching wand. */
-	public static float POTENCY_INCREASE_PER_TIER;
+	public static final float POTENCY_INCREASE_PER_TIER = 0.15f;
 	/** The fraction by which spell duration is increased for each level of duration upgrade. */
-	public static float DURATION_INCREASE_PER_LEVEL;
+	public static final float DURATION_INCREASE_PER_LEVEL = 0.25f;
 	/** The fraction by which spell range is increased for each level of range upgrade. */
-	public static float RANGE_INCREASE_PER_LEVEL;
+	public static final float RANGE_INCREASE_PER_LEVEL = 0.25f;
 	/** The fraction by which spell blast radius is increased for each level of range upgrade. */
-	public static float BLAST_RADIUS_INCREASE_PER_LEVEL;
+	public static final float BLAST_RADIUS_INCREASE_PER_LEVEL = 0.25f;
 	/** The fraction by which movement speed is reduced per level of frost effect. */
-	public static double FROST_SLOWNESS_PER_LEVEL;
+	public static final double FROST_SLOWNESS_PER_LEVEL = 0.5;
 	/** The fraction by which movement speed is reduced per level of decay effect. */
 	public static final double DECAY_SLOWNESS_PER_LEVEL = 0.2;
 	/** The fraction by which dig speed is reduced per level of frostbite effect. */
 	public static final float FROST_FATIGUE_PER_LEVEL = 0.45f;
 	/** The number of ticks between each mana increase for wands with the condenser upgrade. */
-	public static int CONDENSER_TICK_INTERVAL;
+	public static final int CONDENSER_TICK_INTERVAL = 50;
 	/**
 	 * The amount of mana given for a kill for each level of siphon upgrade. A random amount from 0 to this number - 1
 	 * is also added. See {@link WizardryEventHandler#onLivingDeathEvent} for more details.
 	 */
-	public static int SIPHON_MANA_PER_LEVEL;
+	public static final int SIPHON_MANA_PER_LEVEL = 5;
 	/**
 	 * The number of ticks between the spawning of patches of decay when an entity has the decay effect. Note that decay
 	 * won't spawn again if something is already standing in it.
 	 */
 	public static final int DECAY_SPREAD_INTERVAL = 8;
 
-
-	// making this as an update to the existing values to not break addons directly relying on the fields
-	static {
-		MANA_PER_SHARD = Wizardry.settings.manaPerShard;
-		MANA_PER_CRYSTAL = Wizardry.settings.manaPerCrystal;
-		GRAND_CRYSTAL_MANA = Wizardry.settings.grandCrystalMana;
-		UPGRADE_STACK_LIMIT = Wizardry.settings.upgradeStackLimit;
-		NON_ELEMENTAL_UPGRADE_BONUS = Wizardry.settings.nonElementalUpgradeBonus;
-		COOLDOWN_REDUCTION_PER_LEVEL = (float) Wizardry.settings.cooldownReductionPerLevel;
-		STORAGE_INCREASE_PER_LEVEL = Wizardry.settings.storageIncreasePerLevel;
-		POTENCY_INCREASE_PER_TIER = (float) Wizardry.settings.potencyIncreasePerTier;
-		DURATION_INCREASE_PER_LEVEL = (float) Wizardry.settings.durationIncreasePerLevel;
-		RANGE_INCREASE_PER_LEVEL = (float) Wizardry.settings.rangeIncreasePerLevel;
-		BLAST_RADIUS_INCREASE_PER_LEVEL = (float) Wizardry.settings.blastIncreasePerLevel;
-		FROST_SLOWNESS_PER_LEVEL = (float) Wizardry.settings.frostSlownessIncreasePerLevel;
-		SIPHON_MANA_PER_LEVEL = Wizardry.settings.siphonManaPerLevel;
-		CONDENSER_TICK_INTERVAL = Wizardry.settings.condenserTickInterval;
-	}
 }

src/main/java/electroblob/wizardry/constants/Element.java

@@ -30,14 +30,23 @@ public enum Element implements IStringSerializable {
 	/** The {@link ResourceLocation} for this element's 8x8 icon (displayed in the arcane workbench GUI) */
 	private final ResourceLocation icon;
 
+	private String modid;
+	/** true if this element should have worldgen structures generated (Obelisk, Shrine) */
+	private final boolean worldgen;
+	/** true if evil/good wizards of this element should naturally spawn */
+	private final boolean wizards;
+
 	Element(Style colour, String name){
-		this(colour, name, Wizardry.MODID);
+		this(colour, name, Wizardry.MODID, true, true);
 	}
 
-	Element(Style colour, String name, String modid){
+	Element(Style colour, String name, String modid, boolean worldgen, boolean wizards){
 		this.colour = colour;
 		this.unlocalisedName = name;
 		this.icon = new ResourceLocation(modid, "textures/gui/container/element_icon_" + unlocalisedName + ".png");
+		this.modid = modid;
+		this.worldgen = worldgen;
+		this.wizards = wizards;
 	}
 
 	/** Returns the element with the given name, or throws an {@link java.lang.IllegalArgumentException} if no such
@@ -93,4 +102,10 @@ public enum Element implements IStringSerializable {
 	public ResourceLocation getIcon(){
 		return icon;
 	}
+
+	public boolean hasWorldgen() { return worldgen; }
+
+	public boolean hasWizards() { return wizards; }
+
+	public String getModid() { return modid; }
 }

src/main/java/electroblob/wizardry/constants/Tier.java

@@ -10,10 +10,10 @@ import java.util.Random;
 
 public enum Tier {
 
-	NOVICE(Wizardry.settings.noviceMaxCharge, Wizardry.settings.noviceUpgradeLimit, 12, new Style().setColor(TextFormatting.WHITE), "novice"),
-	APPRENTICE(Wizardry.settings.apprenticeMaxCharge, Wizardry.settings.apprenticeUpgradeLimit, 5, new Style().setColor(TextFormatting.AQUA), "apprentice"),
-	ADVANCED(Wizardry.settings.advancedMaxCharge, Wizardry.settings.advancedUpgradeLimit, 2, new Style().setColor(TextFormatting.DARK_BLUE), "advanced"),
-	MASTER(Wizardry.settings.masterMaxCharge, Wizardry.settings.masterUpgradeLimit, 1, new Style().setColor(TextFormatting.DARK_PURPLE), "master");
+	NOVICE(700, 3, 12, new Style().setColor(TextFormatting.WHITE), "novice"),
+	APPRENTICE(1000, 5, 5, new Style().setColor(TextFormatting.AQUA), "apprentice"),
+	ADVANCED(1500, 7, 2, new Style().setColor(TextFormatting.DARK_BLUE), "advanced"),
+	MASTER(2500, 9, 1, new Style().setColor(TextFormatting.DARK_PURPLE), "master");
 
 	/** Maximum mana a wand of this tier can store. */
 	public final int maxCharge;

src/main/java/electroblob/wizardry/data/IStoredVariable.java

@@ -64,11 +64,6 @@ public interface IStoredVariable<T> extends IVariable<T> {
 			this.ticker = (p, t) -> t; // Initialise this with a do-nothing function, can be overwritten later
 		}
 
-		@Override
-		public String getKey() {
-			return key;
-		}
-
 		/**
 		 * Replaces this variable's update method with the given update function. <i>Beware of auto-unboxing of
 		 * primitive types! For lambda expressions, check the second parameter isn't null before operating on it.

src/main/java/electroblob/wizardry/data/IVariable.java

@@ -47,10 +47,7 @@ public interface IVariable<T> {
 	 */
 	void write(ByteBuf buf, T value);
 
-	String getKey();
-
 	/**
-	 *
 	 * Reads this variable's value from the given {@link ByteBuf}.
 	 */
 	T read(ByteBuf buf);
@@ -113,11 +110,6 @@ public interface IVariable<T> {
 			// NYI
 		}
 
-		@Override
-		public String getKey() {
-			return "none"; // we don't mind as these are never synced (electroblob.wizardry.data.IVariable.Variable.isSynced)
-		}
-
 		@Override
 		public T read(ByteBuf buf){
 			return null; // NYI

src/main/java/electroblob/wizardry/data/WizardData.java

@@ -7,6 +7,7 @@ import electroblob.wizardry.enchantment.Imbuement;
 import electroblob.wizardry.entity.living.ISummonedCreature;
 import electroblob.wizardry.event.SpellCastEvent;
 import electroblob.wizardry.event.SpellCastEvent.Source;
+import electroblob.wizardry.item.ItemWand;
 import electroblob.wizardry.packet.PacketCastContinuousSpell;
 import electroblob.wizardry.packet.PacketPlayerSync;
 import electroblob.wizardry.packet.WizardryPacketHandler;
@@ -46,7 +47,6 @@ import javax.annotation.Nullable;
 import java.lang.ref.WeakReference;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.AbstractMap.SimpleEntry;
 
 /**
  * Capability-based replacement for the old ExtendedPlayer class from 1.7.10. This has been reworked to leave minimum
@@ -73,7 +73,7 @@ public class WizardData implements INBTSerializable<NBTTagCompound> {
 	private static final Set<IStoredVariable> storedVariables = new HashSet<>();
 
 	/** The maximum number of recent spells to track. */
-	public static int MAX_RECENT_SPELLS;
+	public static final int MAX_RECENT_SPELLS = ItemWand.BASE_SPELL_SLOTS;
 
 	private static final int IMBUEMENT_UPDATE_INTERVAL = 20;
 
@@ -126,7 +126,7 @@ public class WizardData implements INBTSerializable<NBTTagCompound> {
 	 * be modified via {@link WizardData#setVariable(IVariable, Object)}, which (as a method) is able to enforce it. */
 	private final Map<IVariable, Object> spellData;
 
-	private Queue<SimpleEntry<Spell, Long>> recentSpells;
+	private Queue<Spell> recentSpells;
 
 	// This one is still necessary, because I can't override the equip animation for items that aren't from Wizardry.
 	// Leaving this for now because merging it into the spell data system will be more tricky
@@ -199,14 +199,9 @@ public class WizardData implements INBTSerializable<NBTTagCompound> {
 	}
 
 	/** Returns a set containing the registered {@link IStoredVariable} objects for which {@link IVariable#isSynced()}
-	 * returns true, ordered by their keys obtained from {@link IVariable#getKey()}. Used internally for packets. */
-	public static Set<IVariable> getSyncedVariablesOrderedByKey(){
-		Comparator<IVariable> keyComparator = Comparator.comparing(IVariable::getKey);
-
-		return storedVariables.stream()
-				.filter(IVariable::isSynced)
-				.sorted(keyComparator)
-				.collect(Collectors.toCollection(LinkedHashSet::new));
+	 * returns true. Used internally for packet reading. */
+	public static Set<IVariable> getSyncedVariables(){
+		return storedVariables.stream().filter(IVariable::isSynced).collect(Collectors.toSet());
 	}
 
 	/**
@@ -294,19 +289,15 @@ public class WizardData implements INBTSerializable<NBTTagCompound> {
 	 * @param spell The spell to be tracked.
 	 */
 	public void trackRecentSpell(Spell spell){
-		this.recentSpells.add(new SimpleEntry<>(spell, player.world.getTotalWorldTime()));
+		this.recentSpells.add(spell);
 	}
 
 	/**
 	 * Returns the number of times the given spell is tracked in this player's recently-cast spells.
-	 * Only counts spells cast within the configured expiry time.
 	 * @param spell The spell to count casts for.
 	 */
 	public int countRecentCasts(Spell spell){
-		long currentTime = player.world.getTotalWorldTime();
-		return (int)this.recentSpells.stream()
-				.filter(entry -> entry.getKey() == spell && (currentTime - entry.getValue()) < Wizardry.settings.recentSpellExpiryTime)
-				.count(); // We know this can't be more than 5
+		return (int)this.recentSpells.stream().filter(s -> s == spell).count(); // We know this can't be more than 5
 	}
 
 	// Imbuements
@@ -355,20 +346,20 @@ public class WizardData implements INBTSerializable<NBTTagCompound> {
 
 		// For each item in the player's inventory
 		for(ItemStack stack : player.inventory.mainInventory){
-			updateImbuedItem(stack, activeImbuements);
+			updateImbutedItem(stack, activeImbuements);
 		}
 		for(ItemStack stack : player.inventory.armorInventory){
-			updateImbuedItem(stack, activeImbuements);
+			updateImbutedItem(stack, activeImbuements);
 		}
 		for(ItemStack stack : player.inventory.offHandInventory){
-			updateImbuedItem(stack, activeImbuements);
+			updateImbutedItem(stack, activeImbuements);
 		}
 
 		// Removes all imbuements from the map that are no longer active
 		this.imbuementDurations.keySet().retainAll(activeImbuements);
 	}
 
-	private void updateImbuedItem(ItemStack stack, Set<Imbuement> activeImbuements){
+	private void updateImbutedItem(ItemStack stack, Set<Imbuement> activeImbuements){
 
 		if(stack.isItemEnchanted()){
 
@@ -391,7 +382,6 @@ public class WizardData implements INBTSerializable<NBTTagCompound> {
 						activeImbuements.add((Imbuement)enchantment);
 					}else{
 						// Otherwise, removes the enchantment from the item
-						((Imbuement) enchantment).onImbuementRemoval(stack);
 						iterator.remove(); // FIXME: Apparently this can cause a CME
 					}
 				}
@@ -465,7 +455,7 @@ public class WizardData implements INBTSerializable<NBTTagCompound> {
 
 		if(this.castCommandSpell != null && this.castCommandSpell.isContinuous){
 
-			if(castCommandTick > castCommandDuration){
+			if(castCommandTick >= castCommandDuration){
 				this.stopCastingContinuousSpell();
 				return;
 			}
@@ -517,12 +507,6 @@ public class WizardData implements INBTSerializable<NBTTagCompound> {
 		if(player.ticksExisted % IMBUEMENT_UPDATE_INTERVAL == 0) updateImbuedItems();
 		updateContinuousSpellCasting();
 
-		// Clean up expired recent spells every 60 ticks (1 second)
-		if(player.ticksExisted % 60 == 0) {
-			long currentTime = player.world.getTotalWorldTime();
-			this.recentSpells.removeIf(entry -> (currentTime - entry.getValue()) >= Wizardry.settings.recentSpellExpiryTime);
-		}
-
 		this.spellData.forEach((k, v) -> this.spellData.put(k, k.update(player, v)));
 		this.spellData.keySet().removeIf(k -> k.canPurge(player, this.spellData.get(k)));
 	}
@@ -589,15 +573,7 @@ public class WizardData implements INBTSerializable<NBTTagCompound> {
 
 		properties.setInteger("maxTierReached", maxTierReached.ordinal());
 
-		// Serialize recent spells with timestamps as compound tags
-		NBTTagList recentSpellsList = new NBTTagList();
-		for(SimpleEntry<Spell, Long> entry : recentSpells) {
-			NBTTagCompound spellTag = new NBTTagCompound();
-			spellTag.setInteger("spellId", entry.getKey().metadata());
-			spellTag.setLong("timestamp", entry.getValue());
-			recentSpellsList.appendTag(spellTag);
-		}
-		NBTExtras.storeTagSafely(properties, "recentSpells", recentSpellsList);
+		NBTExtras.storeTagSafely(properties, "recentSpells", NBTExtras.listToNBT(recentSpells, s -> new NBTTagInt(s.metadata())));
 
 		storedVariables.forEach(k -> k.write(properties, this.spellData.get(k)));
 
@@ -624,14 +600,8 @@ public class WizardData implements INBTSerializable<NBTTagCompound> {
 
 			// Probably won't be null but we may as well just reinitialise it instead of clearing it
 			this.recentSpells = EvictingQueue.create(MAX_RECENT_SPELLS);
-			// Deserialize recent spells with timestamps
-			NBTTagList recentSpellsList = nbt.getTagList("recentSpells", NBT.TAG_COMPOUND);
-			for(int i = 0; i < recentSpellsList.tagCount(); i++) {
-				NBTTagCompound spellTag = recentSpellsList.getCompoundTagAt(i);
-				Spell spell = Spell.byMetadata(spellTag.getInteger("spellId"));
-				long timestamp = spellTag.getLong("timestamp");
-				this.recentSpells.add(new SimpleEntry<>(spell, timestamp));
-			}
+			this.recentSpells.addAll(NBTExtras.NBTToList(nbt.getTagList("recentSpells", NBT.TAG_INT),
+					(NBTTagInt tag) -> Spell.byMetadata(tag.getInt())));
 
 			try{
 				storedVariables.forEach(k -> this.spellData.put(k, k.read(nbt)));

src/main/java/electroblob/wizardry/entity/construct/EntityBlizzard.java

@@ -62,7 +62,7 @@ public class EntityBlizzard extends EntityScaledConstruct {
 				}
 
 				// All entities are slowed, even the caster (except those immune to frost effects)
-				if(!world.isRemote && !MagicDamage.isEntityImmune(DamageType.FROST, target))
+				if(!MagicDamage.isEntityImmune(DamageType.FROST, target))
 					target.addPotionEffect(new PotionEffect(WizardryPotions.frost, 20, 0));
 			}
 			

src/main/java/electroblob/wizardry/entity/construct/EntityDecay.java

@@ -35,8 +35,8 @@ public class EntityDecay extends EntityMagicConstruct {
 					0.6F + rand.nextFloat() * 0.15F);
 
 		if(!this.world.isRemote){
-			List<EntityLivingBase> targets = EntityUtils.getLivingWithinCylinder(this.width/2f, this.posX, this.posY,
-					this.posZ, this.height, this.world);
+			List<EntityLivingBase> targets = EntityUtils.getLivingWithinRadius(1.0d, this.posX, this.posY,
+					this.posZ, this.world);
 			for(EntityLivingBase target : targets){
 				if(target != this.getCaster()){
 					// If this check wasn't here the potion would be reapplied every tick and hence the entity would be

src/main/java/electroblob/wizardry/entity/construct/EntityEarthquake.java

@@ -81,7 +81,7 @@ public class EntityEarthquake extends EntityMagicConstruct { // NOT a scaled con
 					target.attackEntityFrom(
 							MagicDamage.causeIndirectMagicDamage(this, this.getCaster(), DamageType.BLAST),
 							10 * this.damageMultiplier);
-					if(!world.isRemote) target.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, 400, 1));
+					target.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, 400, 1));
 				}
 
 				// All targets are thrown, even those immune to the damage, so they don't fall into the ground.

src/main/java/electroblob/wizardry/entity/construct/EntityFireRing.java

@@ -34,7 +34,7 @@ public class EntityFireRing extends EntityScaledConstruct {
 
 		if(this.ticksExisted % 5 == 0 && !this.world.isRemote){
 
-			List<EntityLivingBase> targets = EntityUtils.getLivingWithinCylinder(this.width/2, this.posX, this.posY, this.posZ, this.height, this.world);
+			List<EntityLivingBase> targets = EntityUtils.getLivingWithinRadius(width/2, this.posX, this.posY, this.posZ, this.world);
 
 			for(EntityLivingBase target : targets){
 

src/main/java/electroblob/wizardry/entity/construct/EntityFireSigil.java

@@ -34,7 +34,7 @@ public class EntityFireSigil extends EntityScaledConstruct {
 
 		if(!this.world.isRemote){
 
-			List<EntityLivingBase> targets = EntityUtils.getLivingWithinCylinder(this.width/2, this.posX, this.posY, this.posZ, this.height, this.world);
+			List<EntityLivingBase> targets = EntityUtils.getLivingWithinRadius(width/2, posX, posY, posZ, world);
 
 			for(EntityLivingBase target : targets){
 

src/main/java/electroblob/wizardry/entity/construct/EntityForcefield.java

@@ -146,28 +146,23 @@ public class EntityForcefield extends EntityMagicConstruct implements ICustomHit
 					if(EntityUtils.isLiving(target)) nudgeVelocity = 0.25;
 					Vec3d extraVelocity = targetRelativePos.normalize().scale(nudgeVelocity);
 
-					//Moved up the check by "19" so that way allied players aren't being moved out of the forcefield because
-					//allied players aren't synced to client like minions. Minions are only synced because it's saved to their
-					//entity data which is synced in their serialize/deserialize methods
+					// ...make it bounce off!
+					target.motionX = target.motionX * -BOUNCINESS + extraVelocity.x;
+					target.motionY = target.motionY * -BOUNCINESS + extraVelocity.y;
+					target.motionZ = target.motionZ * -BOUNCINESS + extraVelocity.z;
+
+					// Prevents the forcefield bouncing things into the floor
+					if(target.onGround && target.motionY < 0) target.motionY = 0.1;
+
+					// How far the target needs to move towards the centre (negative means away from the centre)
+					double distanceTowardsCentre = -(targetRelativePos.length() - radius) - (radius - nextTickDistance);
+					Vec3d targetNewPos = target.getPositionVector().add(targetRelativePos.normalize().scale(distanceTowardsCentre));
+					target.setPosition(targetNewPos.x, targetNewPos.y, targetNewPos.z);
+
+					world.playSound(target.posX, target.posY, target.posZ, WizardrySounds.ENTITY_FORCEFIELD_DEFLECT,
+							WizardrySounds.SPELLS, 0.3f, 1.3f, false);
+
 					if(!world.isRemote){
-						// ...make it bounce off!
-
-						target.motionX = target.motionX * -BOUNCINESS + extraVelocity.x;
-						target.motionY = target.motionY * -BOUNCINESS + extraVelocity.y;
-						target.motionZ = target.motionZ * -BOUNCINESS + extraVelocity.z;
-
-						// Prevents the forcefield bouncing things into the floor
-						if(target.onGround && target.motionY < 0) target.motionY = 0.1;
-
-						// How far the target needs to move towards the centre (negative means away from the centre)
-						double distanceTowardsCentre = -(targetRelativePos.length() - radius) - (radius - nextTickDistance);
-						Vec3d targetNewPos = target.getPositionVector().add(targetRelativePos.normalize().scale(distanceTowardsCentre));
-						target.setPosition(targetNewPos.x, targetNewPos.y, targetNewPos.z);
-
-						world.playSound(target.posX, target.posY, target.posZ, WizardrySounds.ENTITY_FORCEFIELD_DEFLECT,
-								WizardrySounds.SPELLS, 0.3f, 1.3f, false);
-
-
 						// Player motion is handled on that player's client so needs packets
 						if(target instanceof EntityPlayerMP){
 							((EntityPlayerMP)target).connection.sendPacket(new SPacketEntityVelocity(target));
@@ -179,11 +174,6 @@ public class EntityForcefield extends EntityMagicConstruct implements ICustomHit
 
 					}else{
 
-						//This is a super lazy way to make sure the visual isn't playing for players and probably won't display the visual
-						//for players if their velocity towards the forcefield is high. But it prevents the visual being spammed when ally player
-						//is in forcefield so it's fine #19
-						if(target instanceof EntityPlayer && target.getPositionVector().distanceTo(this.getPositionVector()) < this.getRadius()) return;
-
 						Vec3d relativeImpactPos = targetRelativePos.normalize().scale(radius);
 
 						float yaw = (float)Math.atan2(relativeImpactPos.x, -relativeImpactPos.z);

src/main/java/electroblob/wizardry/entity/construct/EntityFrostSigil.java

@@ -36,8 +36,8 @@ public class EntityFrostSigil extends EntityScaledConstruct {
 
 		if(!this.world.isRemote){
 
-			List<EntityLivingBase> targets = EntityUtils.getLivingWithinCylinder(width/2, this.posX, this.posY,
-					this.posZ, this.height, this.world);
+			List<EntityLivingBase> targets = EntityUtils.getLivingWithinRadius(width/2, this.posX, this.posY,
+					this.posZ, this.world);
 
 			for(EntityLivingBase target : targets){
 

src/main/java/electroblob/wizardry/entity/construct/EntityHealAura.java

@@ -33,32 +33,30 @@ public class EntityHealAura extends EntityScaledConstruct {
 
 		if(!this.world.isRemote){
 
-			List<EntityLivingBase> targets = EntityUtils.getLivingWithinCylinder(width/2, posX, posY, posZ, this.height, world);
+			List<EntityLivingBase> targets = EntityUtils.getLivingWithinRadius(width/2, posX, posY, posZ, world);
 
 			for(EntityLivingBase target : targets){
 
 				if(this.isValidTarget(target)){
 
-					if(target.isEntityUndead()) {
+					if(target.isEntityUndead()){
 
 						double velX = target.motionX;
 						double velY = target.motionY;
 						double velZ = target.motionZ;
 
-						if (this.ticksExisted % 10 == 1) {
-							if (this.getCaster() != null) {
-								target.attackEntityFrom(
-										MagicDamage.causeIndirectMagicDamage(this, getCaster(), DamageType.RADIANT),
-										Spells.healing_aura.getProperty(Spell.DAMAGE).floatValue() * damageMultiplier);
-							} else {
-								target.attackEntityFrom(DamageSource.MAGIC, Spells.healing_aura.getProperty(Spell.DAMAGE).floatValue() * damageMultiplier);
-							}
-
-							// Removes knockback
-							target.motionX = velX;
-							target.motionY = velY;
-							target.motionZ = velZ;
+						if(this.getCaster() != null){
+							target.attackEntityFrom(
+									MagicDamage.causeIndirectMagicDamage(this, getCaster(), DamageType.RADIANT),
+									Spells.healing_aura.getProperty(Spell.DAMAGE).floatValue() * damageMultiplier);
+						}else{
+							target.attackEntityFrom(DamageSource.MAGIC, Spells.healing_aura.getProperty(Spell.DAMAGE).floatValue() * damageMultiplier);
 						}
+
+						// Removes knockback
+						target.motionX = velX;
+						target.motionY = velY;
+						target.motionZ = velZ;
 					}
 
 				}else if(target.getHealth() < target.getMaxHealth() && target.ticksExisted % 5 == 0){

src/main/java/electroblob/wizardry/entity/construct/EntityLightningSigil.java

@@ -39,8 +39,8 @@ public class EntityLightningSigil extends EntityScaledConstruct {
 			this.setDead();
 		}
 
-		List<EntityLivingBase> targets = EntityUtils.getLivingWithinCylinder(this.width/2, this.posX, this.posY,
-				this.posZ, this.height, this.world);
+		List<EntityLivingBase> targets = EntityUtils.getLivingWithinRadius(width/2, this.posX, this.posY,
+				this.posZ, this.world);
 
 		for(EntityLivingBase target : targets){
 

src/main/java/electroblob/wizardry/entity/construct/EntityWitheringTotem.java

@@ -145,7 +145,7 @@ public class EntityWitheringTotem extends EntityScaledConstruct {
 
 		for(EntityLivingBase target : nearby){
 
-			if(!world.isRemote && EntityUtils.attackEntityWithoutKnockback(target, MagicDamage.causeIndirectMagicDamage(this,
+			if(EntityUtils.attackEntityWithoutKnockback(target, MagicDamage.causeIndirectMagicDamage(this,
 					getCaster(), DamageType.MAGIC), damage)){
 				target.addPotionEffect(new PotionEffect(MobEffects.WITHER, Spells.withering_totem.getProperty(Spell.EFFECT_DURATION).intValue(),
 						Spells.withering_totem.getProperty(Spell.EFFECT_STRENGTH).intValue()));

src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java

@@ -365,7 +365,8 @@ public class EntityEvilWizard extends EntityMob implements ISpellCaster, IEntity
 
 		if(getElement() == null){
 			if(rand.nextBoolean()){
-				this.setElement(Element.values()[rand.nextInt(Element.values().length - 1) + 1]);
+				Element[] elements = (Element[]) Arrays.stream(Element.values()).filter(Element::hasWizards).toArray();
+				this.setElement(elements[rand.nextInt(elements.length - 1) + 1]);
 			}else{
 				this.setElement(Element.MAGIC);
 			}

src/main/java/electroblob/wizardry/entity/living/EntityHuskMinion.java

@@ -32,11 +32,11 @@ public class EntityHuskMinion extends EntityZombieMinion {
 
 		boolean flag = super.attackEntityAsMob(target);
 
-		if(flag && !this.world.isRemote && this.getHeldItemMainhand().isEmpty() && target instanceof EntityLivingBase){
+		if(flag && this.getHeldItemMainhand().isEmpty() && target instanceof EntityLivingBase){
 			float f = this.world.getDifficultyForLocation(new BlockPos(this)).getAdditionalDifficulty();
 			((EntityLivingBase)target).addPotionEffect(new PotionEffect(MobEffects.HUNGER, 140 * (int)f));
 		}
 
 		return flag;
 	}
-}
+}

src/main/java/electroblob/wizardry/entity/living/EntityIceGiant.java

@@ -119,7 +119,7 @@ public class EntityIceGiant extends EntityIronGolem implements ISummonedCreature
 		target.motionX += this.getLookVec().x * 0.2;
 		target.motionZ += this.getLookVec().z * 0.2;
 
-		if(!target.world.isRemote) target.addPotionEffect(new PotionEffect(WizardryPotions.frost, 300, 0));
+		target.addPotionEffect(new PotionEffect(WizardryPotions.frost, 300, 0));
 
 		this.applyEnchantments(this, target);
 

src/main/java/electroblob/wizardry/entity/living/EntityMagicSlime.java

@@ -120,7 +120,7 @@ public class EntityMagicSlime extends EntitySlime implements ISummonedCreature {
 				&& ((EntityLivingBase)this.getRidingEntity()).getHealth() > 0){
 			if(this.ticksExisted % 16 == 1){
 				this.getRidingEntity().attackEntityFrom(DamageSource.MAGIC, 1);
-				if(this.getRidingEntity() != null && !this.world.isRemote){ // Some mobs force-dismount when attacked (normally when dying)
+				if(this.getRidingEntity() != null){ // Some mobs force-dismount when attacked (normally when dying)
 					((EntityLivingBase)this.getRidingEntity())
 							.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 20, 2));
 				}

src/main/java/electroblob/wizardry/entity/living/EntitySpiderMinion.java

@@ -129,7 +129,7 @@ public class EntitySpiderMinion extends EntityCaveSpider implements ISummonedCre
 			seconds = 15;
 		}
 
-		if(seconds > 0 && !target.world.isRemote){
+		if(seconds > 0){
 			target.addPotionEffect(new PotionEffect(MobEffects.POISON, seconds * 20, 0));
 		}
 	}

src/main/java/electroblob/wizardry/entity/living/EntityWitherSkeletonMinion.java

@@ -139,7 +139,7 @@ public class EntityWitherSkeletonMinion extends EntityWitherSkeleton implements
 
 	@Override
 	public void onSuccessfulAttack(EntityLivingBase target){
-		if(!target.world.isRemote) target.addPotionEffect(new PotionEffect(MobEffects.WITHER, 200));
+		target.addPotionEffect(new PotionEffect(MobEffects.WITHER, 200));
 	}
 
 	@Override

src/main/java/electroblob/wizardry/entity/living/EntityWizard.java

@@ -68,11 +68,11 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 	protected Predicate<Entity> targetSelector;
 
 	/** The wizard's trades. */
-	public MerchantRecipeList trades;
+	private MerchantRecipeList trades;
     /** The wizard's current customer. */
     @Nullable
     private EntityPlayer customer;
-    
+
 	private int timeUntilReset;
 
 	/** addDefaultEquipmentAndRecipies is called if this is true */
@@ -130,12 +130,8 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 			if(entity != null && !entity.isInvisible()
 					&& AllyDesignationSystem.isValidTarget(EntityWizard.this, entity)){
 
-				// ... and is a non summoned creature mob ...
-				if((entity instanceof IMob && !(entity instanceof ISummonedCreature)
-
-						// or is a summoned creature with a mob owner or an owner who has attacked the wizard ...
-						|| entity instanceof ISummonedCreature && (((ISummonedCreature)entity).getOwner() instanceof IMob || ((ISummonedCreature)entity).getOwner() == this.getRevengeTarget() || ((ISummonedCreature) entity).getOwner() == this.getAttackTarget())
-
+				// ... and is a mob, a summoned creature ...
+				if((entity instanceof IMob || entity instanceof ISummonedCreature
 						// ... or in the whitelist ...
 						|| Arrays.asList(Wizardry.settings.summonedCreatureTargetsWhitelist)
 								.contains(EntityList.getKey(entity.getClass())))
@@ -262,11 +258,11 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 
 	@Override
 	public ITextComponent getDisplayName(){
-		
+
 		if(this.hasCustomName()){
             return super.getDisplayName();
         }
-		
+
 		return this.getElement().getWizardName();
 	}
 
@@ -274,7 +270,7 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 	protected boolean canDespawn(){
 		return false;
 	}
-	
+
 	@Override
 	protected SoundEvent getAmbientSound(){
 		if(Wizardry.tisTheSeason) return WizardrySounds.ENTITY_WIZARD_HOHOHO;
@@ -359,7 +355,7 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 					this.updateRecipes = false;
 				}
 
-				if(!this.world.isRemote) this.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, 200, 0));
+				this.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, 200, 0));
 			}
 		}
 
@@ -617,10 +613,7 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 		// ((tier.ordinal() + 1) * 16 + rand.nextInt(6)) gives a 'value' for the item being bought
 		// This is then divided by the value of the currency item to give a price
 		// The absolute maximum stack size that can result from this calculation (with value = 1) is 64.
-		ItemStack result = new ItemStack(item, MathHelper.clamp((8 + tier.ordinal() * 16 + rand.nextInt(9)) / value, 1, 64), meta);
-		NBTTagCompound nbt = Wizardry.settings.currencyItemNbt.get(itemName);
-		if(nbt != null) result.setTagCompound(nbt.copy());
-		return result;
+		return new ItemStack(item, MathHelper.clamp((8 + tier.ordinal() * 16 + rand.nextInt(9)) / value, 1, 64), meta);
 	}
 
 	private ItemStack getRandomItemOfTier(Tier tier){
@@ -680,7 +673,7 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 							WizardryItems.getWand(tier, Element.values()[rand.nextInt(Element.values().length)]));
 				}
 			}else if(randomiser < 8){
-				return new ItemStack(WizardryItems.arcane_tome, 1, 1);
+				return new ItemStack(WizardryItems.arcane_tome_apprentice, 1);
 			}else if(randomiser < 10){
 				EntityEquipmentSlot slot = InventoryUtils.ARMOUR_SLOTS[rand.nextInt(InventoryUtils.ARMOUR_SLOTS.length)];
 				if(this.getElement() != Element.MAGIC && rand.nextInt(4) > 0){
@@ -716,7 +709,7 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 							WizardryItems.getWand(tier, Element.values()[rand.nextInt(Element.values().length)]));
 				}
 			}else if(randomiser < 8){
-				return new ItemStack(WizardryItems.arcane_tome, 1, 2);
+				return new ItemStack(WizardryItems.arcane_tome_advanced, 1);
 			}else{
 				List<Item> upgrades = new ArrayList<Item>(WandHelper.getSpecialUpgrades());
 				randomiser = rand.nextInt(upgrades.size());
@@ -739,7 +732,7 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 					return new ItemStack(WizardryItems.master_wand);
 				}
 			}else{
-				return new ItemStack(WizardryItems.arcane_tome, 1, 3);
+				return new ItemStack(WizardryItems.arcane_tome_master, 1);
 			}
 		}
 
@@ -754,7 +747,8 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 		textureIndex = this.rand.nextInt(6);
 
 		if(rand.nextBoolean()){
-			this.setElement(Element.values()[rand.nextInt(Element.values().length - 1) + 1]);
+			Element[] elements = (Element[]) Arrays.stream(Element.values()).filter(Element::hasWizards).toArray();
+			this.setElement(elements[rand.nextInt(elements.length - 1) + 1]);
 		}else{
 			this.setElement(Element.MAGIC);
 		}
@@ -891,7 +885,7 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 	/**
 	 * Sets the list of blocks that are part of this wizard's tower. If a player breaks any of these blocks, the wizard
 	 * will get angry and attack them.
-	 * 
+	 *
 	 * @param blocks A Set of BlockPos objects representing the blocks in the tower.
 	 */
 	public void setTowerBlocks(Set<BlockPos> blocks){
@@ -923,11 +917,11 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 			}
 		}
 	}
-	
+
 	// Copied from their respective AI classes
-	
+
 	public static class EntityAILookAtTradePlayer extends EntityAIWatchClosest {
-		
+
 	    private final EntityWizard wizard;
 
 	    public EntityAILookAtTradePlayer(EntityWizard wizard){
@@ -945,9 +939,9 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 	        }
 	    }
 	}
-	
+
 	public static class EntityAITradePlayer extends EntityAIBase {
-		
+
 		private final EntityWizard wizard;
 
 	    public EntityAITradePlayer(EntityWizard wizard){
@@ -957,7 +951,7 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 
 	    @Override
 	    public boolean shouldExecute(){
-	    	
+
 	        if(!this.wizard.isEntityAlive()){
 	            return false;
 	        }else if(this.wizard.isInWater()){
@@ -967,7 +961,7 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 	        }else if(this.wizard.velocityChanged){
 	            return false;
 	        }else{
-	        	
+
 	            EntityPlayer entityplayer = this.wizard.getCustomer();
 
 	            if(entityplayer == null){

src/main/java/electroblob/wizardry/entity/projectile/EntityDarknessOrb.java

@@ -33,7 +33,7 @@ public class EntityDarknessOrb extends EntityMagicProjectile {
 					MagicDamage.causeIndirectMagicDamage(this, this.getThrower(), DamageType.WITHER).setProjectile(),
 					damage);
 
-			if(!this.world.isRemote && target instanceof EntityLivingBase && !MagicDamage.isEntityImmune(DamageType.WITHER, target))
+			if(target instanceof EntityLivingBase && !MagicDamage.isEntityImmune(DamageType.WITHER, target))
 				((EntityLivingBase)target).addPotionEffect(new PotionEffect(MobEffects.WITHER,
 						Spells.darkness_orb.getProperty(Spell.EFFECT_DURATION).intValue(),
 						Spells.darkness_orb.getProperty(Spell.EFFECT_STRENGTH).intValue()));

src/main/java/electroblob/wizardry/entity/projectile/EntityDart.java

@@ -27,7 +27,7 @@ public class EntityDart extends EntityMagicArrow {
 	@Override
 	public void onEntityHit(EntityLivingBase entityHit){
 		// Adds a weakness effect to the target.
-		if(!entityHit.world.isRemote) entityHit.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, Spells.dart.getProperty(Spell.EFFECT_DURATION).intValue(),
+		entityHit.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, Spells.dart.getProperty(Spell.EFFECT_DURATION).intValue(),
 				Spells.dart.getProperty(Spell.EFFECT_STRENGTH).intValue(), false, false));
 		this.playSound(WizardrySounds.ENTITY_DART_HIT, 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F));
 	}
@@ -59,4 +59,4 @@ public class EntityDart extends EntityMagicArrow {
 	public int getLifetime(){
 		return -1;
 	}
-}
+}

src/main/java/electroblob/wizardry/entity/projectile/EntityFirebomb.java

@@ -1,18 +1,18 @@
 package electroblob.wizardry.entity.projectile;
 
-import electroblob.wizardry.packet.PacketBombExplosion;
-import electroblob.wizardry.packet.WizardryPacketHandler;
 import electroblob.wizardry.registry.Spells;
 import electroblob.wizardry.registry.WizardrySounds;
 import electroblob.wizardry.spell.Spell;
 import electroblob.wizardry.util.EntityUtils;
 import electroblob.wizardry.util.MagicDamage;
 import electroblob.wizardry.util.MagicDamage.DamageType;
+import electroblob.wizardry.util.ParticleBuilder;
+import electroblob.wizardry.util.ParticleBuilder.Type;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.common.network.NetworkRegistry;
 
 import java.util.List;
 
@@ -29,27 +29,40 @@ public class EntityFirebomb extends EntityBomb {
 
 	@Override
 	protected void onImpact(RayTraceResult rayTrace){
+		
+		Entity entityHit = rayTrace.entityHit;
 
-		if(!this.world.isRemote){
+		if(entityHit != null){
+			// This is if the firebomb gets a direct hit
+			float damage = Spells.firebomb.getProperty(Spell.DIRECT_DAMAGE).floatValue() * damageMultiplier;
 
-			Entity entityHit = rayTrace.entityHit;
+			entityHit.attackEntityFrom(
+					MagicDamage.causeIndirectMagicDamage(this, this.getThrower(), DamageType.FIRE).setProjectile(),
+					damage);
 
-			if(entityHit != null){
-				// This is if the firebomb gets a direct hit
-				float damage = Spells.firebomb.getProperty(Spell.DIRECT_DAMAGE).floatValue() * damageMultiplier;
+			if(!MagicDamage.isEntityImmune(DamageType.FIRE, entityHit))
+				entityHit.setFire(Spells.firebomb.getProperty(Spell.BURN_DURATION).intValue());
+		}
 
-				entityHit.attackEntityFrom(
-						MagicDamage.causeIndirectMagicDamage(this, this.getThrower(), DamageType.FIRE).setProjectile(),
-						damage);
+		// Particle effect
+		if(world.isRemote){
+			
+			ParticleBuilder.create(Type.FLASH).pos(this.getPositionVector()).scale(5 * blastMultiplier).clr(1, 0.6f, 0)
+			.spawn(world);
 
-				if(!MagicDamage.isEntityImmune(DamageType.FIRE, entityHit))
-					entityHit.setFire(Spells.firebomb.getProperty(Spell.BURN_DURATION).intValue());
+			for(int i = 0; i < 60 * blastMultiplier; i++){
+				
+				ParticleBuilder.create(Type.MAGIC_FIRE, rand, posX, posY, posZ, 2*blastMultiplier, false)
+				.time(10 + rand.nextInt(4)).scale(2 + rand.nextFloat()).spawn(world);
+				
+				ParticleBuilder.create(Type.DARK_MAGIC, rand, posX, posY, posZ, 2*blastMultiplier, false)
+				.clr(1.0f, 0.2f + rand.nextFloat() * 0.4f, 0.0f).spawn(world);
 			}
 
-			// Notify clients to play the explosion effect
-			WizardryPacketHandler.net.sendToAllAround(
-					new PacketBombExplosion.Message(PacketBombExplosion.FIREBOMB, posX, posY, posZ, blastMultiplier),
-					new NetworkRegistry.TargetPoint(world.provider.getDimension(), posX, posY, posZ, 64));
+			this.world.spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, this.posX, this.posY, this.posZ, 0, 0, 0);
+		}
+
+		if(!this.world.isRemote){
 
 			this.playSound(WizardrySounds.ENTITY_FIREBOMB_SMASH, 1.5F, rand.nextFloat() * 0.4F + 0.6F);
 			this.playSound(WizardrySounds.ENTITY_FIREBOMB_FIRE, 1, 1);
@@ -69,9 +82,9 @@ public class EntityFirebomb extends EntityBomb {
 					target.setFire(Spells.firebomb.getProperty(Spell.BURN_DURATION).intValue());
 				}
 			}
-		}
 
-		this.setDead();
+			this.setDead();
+		}
 	}
 
 }

src/main/java/electroblob/wizardry/entity/projectile/EntityIceCharge.java

@@ -48,7 +48,7 @@ public class EntityIceCharge extends EntityBomb {
 					MagicDamage.causeIndirectMagicDamage(this, this.getThrower(), DamageType.FROST).setProjectile(),
 					damage);
 
-			if(!this.world.isRemote && entityHit instanceof EntityLivingBase && !MagicDamage.isEntityImmune(DamageType.FROST, entityHit))
+			if(entityHit instanceof EntityLivingBase && !MagicDamage.isEntityImmune(DamageType.FROST, entityHit))
 				((EntityLivingBase)entityHit).addPotionEffect(new PotionEffect(WizardryPotions.frost,
 						Spells.ice_charge.getProperty(Spell.DIRECT_EFFECT_DURATION).intValue(),
 						Spells.ice_charge.getProperty(Spell.DIRECT_EFFECT_STRENGTH).intValue()));

src/main/java/electroblob/wizardry/entity/projectile/EntityIceLance.java

@@ -39,7 +39,7 @@ public class EntityIceLance extends EntityMagicArrow {
 	public void onEntityHit(EntityLivingBase entityHit){
 
 		// Adds a freeze effect to the target.
-		if(!entityHit.world.isRemote && !MagicDamage.isEntityImmune(DamageType.FROST, entityHit))
+		if(!MagicDamage.isEntityImmune(DamageType.FROST, entityHit))
 			entityHit.addPotionEffect(new PotionEffect(WizardryPotions.frost,
 					Spells.ice_lance.getProperty(Spell.EFFECT_DURATION).intValue(),
 					Spells.ice_lance.getProperty(Spell.EFFECT_STRENGTH).intValue()));
@@ -64,4 +64,4 @@ public class EntityIceLance extends EntityMagicArrow {
 	@Override
 	protected void entityInit(){}
 
-}
+}

src/main/java/electroblob/wizardry/entity/projectile/EntityIceShard.java

@@ -37,7 +37,7 @@ public class EntityIceShard extends EntityMagicArrow {
 	public void onEntityHit(EntityLivingBase entityHit){
 
 		// Adds a freeze effect to the target.
-		if(!entityHit.world.isRemote && !MagicDamage.isEntityImmune(DamageType.FROST, entityHit))
+		if(!MagicDamage.isEntityImmune(DamageType.FROST, entityHit))
 			entityHit.addPotionEffect(new PotionEffect(WizardryPotions.frost,
 					Spells.ice_shard.getProperty(Spell.EFFECT_DURATION).intValue(),
 					Spells.ice_shard.getProperty(Spell.EFFECT_STRENGTH).intValue()));
@@ -67,4 +67,4 @@ public class EntityIceShard extends EntityMagicArrow {
 	@Override
 	protected void entityInit(){}
 
-}
+}

src/main/java/electroblob/wizardry/entity/projectile/EntityPoisonBomb.java

@@ -1,20 +1,20 @@
 package electroblob.wizardry.entity.projectile;
 
-import electroblob.wizardry.packet.PacketBombExplosion;
-import electroblob.wizardry.packet.WizardryPacketHandler;
 import electroblob.wizardry.registry.Spells;
 import electroblob.wizardry.registry.WizardrySounds;
 import electroblob.wizardry.spell.Spell;
 import electroblob.wizardry.util.EntityUtils;
 import electroblob.wizardry.util.MagicDamage;
 import electroblob.wizardry.util.MagicDamage.DamageType;
+import electroblob.wizardry.util.ParticleBuilder;
+import electroblob.wizardry.util.ParticleBuilder.Type;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.init.MobEffects;
 import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.common.network.NetworkRegistry;
 
 import java.util.List;
 
@@ -31,30 +31,44 @@ public class EntityPoisonBomb extends EntityBomb {
 
 	@Override
 	protected void onImpact(RayTraceResult rayTrace){
+		
+		Entity entityHit = rayTrace.entityHit;
+
+		if(entityHit != null){
+			// This is if the poison bomb gets a direct hit
+			float damage = Spells.poison_bomb.getProperty(Spell.DIRECT_DAMAGE).floatValue() * damageMultiplier;
+
+			entityHit.attackEntityFrom(
+					MagicDamage.causeIndirectMagicDamage(this, this.getThrower(), DamageType.POISON).setProjectile(),
+					damage);
+
+			if(entityHit instanceof EntityLivingBase && !MagicDamage.isEntityImmune(DamageType.POISON, entityHit))
+				((EntityLivingBase)entityHit).addPotionEffect(new PotionEffect(MobEffects.POISON,
+						Spells.poison_bomb.getProperty(Spell.DIRECT_EFFECT_DURATION).intValue(),
+						Spells.poison_bomb.getProperty(Spell.DIRECT_EFFECT_STRENGTH).intValue()));
+		}
+
+		// Particle effect
+		if(world.isRemote){
+			
+			ParticleBuilder.create(Type.FLASH).pos(this.getPositionVector()).scale(5 * blastMultiplier)
+			.clr(0.2f + rand.nextFloat() * 0.3f, 0.6f, 0.0f).spawn(world);
+			
+			for(int i = 0; i < 60 * blastMultiplier; i++){
+				
+				ParticleBuilder.create(Type.SPARKLE, rand, posX, posY, posZ, 2*blastMultiplier, false).time(35)
+				.scale(2).clr(0.2f + rand.nextFloat() * 0.3f, 0.6f, 0.0f).spawn(world);
+				
+				ParticleBuilder.create(Type.DARK_MAGIC, rand, posX, posY, posZ, 2*blastMultiplier, false)
+				.clr(0.2f + rand.nextFloat() * 0.2f, 0.8f, 0.0f).spawn(world);
+			}
+			// Spawning this after the other particles fixes the rendering colour bug. It's a bit of a cheat, but it
+			// works pretty well.
+			this.world.spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, this.posX, this.posY, this.posZ, 0, 0, 0);
+		}
 
 		if(!this.world.isRemote){
 
-			Entity entityHit = rayTrace.entityHit;
-
-			if(entityHit != null){
-				// This is if the poison bomb gets a direct hit
-				float damage = Spells.poison_bomb.getProperty(Spell.DIRECT_DAMAGE).floatValue() * damageMultiplier;
-
-				entityHit.attackEntityFrom(
-						MagicDamage.causeIndirectMagicDamage(this, this.getThrower(), DamageType.POISON).setProjectile(),
-						damage);
-
-				if(!this.world.isRemote && entityHit instanceof EntityLivingBase && !MagicDamage.isEntityImmune(DamageType.POISON, entityHit))
-					((EntityLivingBase)entityHit).addPotionEffect(new PotionEffect(MobEffects.POISON,
-							Spells.poison_bomb.getProperty(Spell.DIRECT_EFFECT_DURATION).intValue(),
-							Spells.poison_bomb.getProperty(Spell.DIRECT_EFFECT_STRENGTH).intValue()));
-			}
-
-			// Notify clients to play the explosion effect
-			WizardryPacketHandler.net.sendToAllAround(
-					new PacketBombExplosion.Message(PacketBombExplosion.POISON_BOMB, posX, posY, posZ, blastMultiplier),
-					new NetworkRegistry.TargetPoint(world.provider.getDimension(), posX, posY, posZ, 64));
-
 			this.playSound(WizardrySounds.ENTITY_POISON_BOMB_SMASH, 1.5F, rand.nextFloat() * 0.4F + 0.6F);
 			this.playSound(WizardrySounds.ENTITY_POISON_BOMB_POISON, 1.2F, 1.0f);
 
@@ -69,15 +83,13 @@ public class EntityPoisonBomb extends EntityBomb {
 					target.attackEntityFrom(
 							MagicDamage.causeIndirectMagicDamage(this, this.getThrower(), DamageType.POISON),
 							Spells.poison_bomb.getProperty(Spell.SPLASH_DAMAGE).floatValue() * damageMultiplier);
-					if(!this.world.isRemote){
-						target.addPotionEffect(new PotionEffect(MobEffects.POISON,
-								Spells.poison_bomb.getProperty(Spell.SPLASH_EFFECT_DURATION).intValue(),
-								Spells.poison_bomb.getProperty(Spell.SPLASH_EFFECT_STRENGTH).intValue()));
-					}
+					target.addPotionEffect(new PotionEffect(MobEffects.POISON,
+							Spells.poison_bomb.getProperty(Spell.SPLASH_EFFECT_DURATION).intValue(),
+							Spells.poison_bomb.getProperty(Spell.SPLASH_EFFECT_STRENGTH).intValue()));
 				}
 			}
-		}
 
-		this.setDead();
+			this.setDead();
+		}
 	}
 }

src/main/java/electroblob/wizardry/entity/projectile/EntitySmokeBomb.java

@@ -1,17 +1,17 @@
 package electroblob.wizardry.entity.projectile;
 
-import electroblob.wizardry.packet.PacketBombExplosion;
-import electroblob.wizardry.packet.WizardryPacketHandler;
 import electroblob.wizardry.registry.Spells;
 import electroblob.wizardry.registry.WizardrySounds;
 import electroblob.wizardry.spell.Spell;
 import electroblob.wizardry.util.EntityUtils;
+import electroblob.wizardry.util.ParticleBuilder;
+import electroblob.wizardry.util.ParticleBuilder.Type;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.init.MobEffects;
 import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.common.network.NetworkRegistry;
 
 import java.util.List;
 
@@ -29,12 +29,26 @@ public class EntitySmokeBomb extends EntityBomb {
 	@Override
 	protected void onImpact(RayTraceResult rayTrace){
 
-		if(!this.world.isRemote){
+		// Particle effect
+		if(world.isRemote){
+			
+			ParticleBuilder.create(Type.FLASH).pos(this.getPositionVector()).scale(5 * blastMultiplier).clr(0, 0, 0).spawn(world);
+			
+			this.world.spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, this.posX, this.posY, this.posZ, 0, 0, 0);
+						
+			for(int i = 0; i < 60 * blastMultiplier; i++){
 
-			// Notify clients to play the explosion effect
-			WizardryPacketHandler.net.sendToAllAround(
-					new PacketBombExplosion.Message(PacketBombExplosion.SMOKE_BOMB, posX, posY, posZ, blastMultiplier),
-					new NetworkRegistry.TargetPoint(world.provider.getDimension(), posX, posY, posZ, 64));
+				float brightness = rand.nextFloat() * 0.1f + 0.1f;
+				ParticleBuilder.create(Type.CLOUD, rand, posX, posY, posZ, 2*blastMultiplier, false)
+						.clr(brightness, brightness, brightness).time(80 + this.rand.nextInt(12)).shaded(true).spawn(world);
+
+				brightness = rand.nextFloat() * 0.3f;
+				ParticleBuilder.create(Type.DARK_MAGIC, rand, posX, posY, posZ, 2*blastMultiplier, false)
+				.clr(brightness, brightness, brightness).spawn(world);
+			}
+		}
+
+		if(!this.world.isRemote){
 
 			this.playSound(WizardrySounds.ENTITY_SMOKE_BOMB_SMASH, 1.5F, rand.nextFloat() * 0.4F + 0.6F);
 			this.playSound(WizardrySounds.ENTITY_SMOKE_BOMB_SMOKE, 1.2F, 1.0f);
@@ -48,11 +62,11 @@ public class EntitySmokeBomb extends EntityBomb {
 
 			for(EntityLivingBase target : targets){
 				if(target != this.getThrower()){
-					if(!this.world.isRemote) target.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, duration, 0));
+					target.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, duration, 0));
 				}
 			}
-		}
 
-		this.setDead();
+			this.setDead();
+		}
 	}
 }

src/main/java/electroblob/wizardry/entity/projectile/EntitySparkBomb.java

@@ -1,7 +1,5 @@
 package electroblob.wizardry.entity.projectile;
 
-import electroblob.wizardry.packet.PacketBombExplosion;
-import electroblob.wizardry.packet.WizardryPacketHandler;
 import electroblob.wizardry.registry.Spells;
 import electroblob.wizardry.registry.WizardrySounds;
 import electroblob.wizardry.spell.Spell;
@@ -15,9 +13,7 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.common.network.NetworkRegistry;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class EntitySparkBomb extends EntityBomb {
@@ -35,37 +31,47 @@ public class EntitySparkBomb extends EntityBomb {
 
 	@Override
 	protected void onImpact(RayTraceResult rayTrace){
+		
+		this.playSound(WizardrySounds.ENTITY_SPARK_BOMB_HIT_BLOCK, 0.5f, 0.5f);
 
-		if(!this.world.isRemote){
+		Entity entityHit = rayTrace.entityHit;
 
-			Entity entityHit = rayTrace.entityHit;
+		if(entityHit != null){
+			// This is if the spark bomb gets a direct hit
+			float damage = Spells.spark_bomb.getProperty(Spell.DIRECT_DAMAGE).floatValue() * damageMultiplier;
 
-			if(entityHit != null){
-				// This is if the spark bomb gets a direct hit
-				float damage = Spells.spark_bomb.getProperty(Spell.DIRECT_DAMAGE).floatValue() * damageMultiplier;
+			this.playSound(WizardrySounds.ENTITY_SPARK_BOMB_HIT, 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F));
 
-				this.playSound(WizardrySounds.ENTITY_SPARK_BOMB_HIT, 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F));
+			entityHit.attackEntityFrom(
+					MagicDamage.causeIndirectMagicDamage(this, this.getThrower(), DamageType.SHOCK).setProjectile(),
+					damage);
 
-				entityHit.attackEntityFrom(
-						MagicDamage.causeIndirectMagicDamage(this, this.getThrower(), DamageType.SHOCK).setProjectile(),
-						damage);
-			}
+		}
 
-			double seekerRange = Spells.spark_bomb.getProperty(Spell.EFFECT_RADIUS).doubleValue() * blastMultiplier;
+		// Particle effect
+		if(world.isRemote){
+			ParticleBuilder.spawnShockParticles(world, posX, posY + height/2, posZ);
+		}
 
-			List<EntityLivingBase> targets = EntityUtils.getLivingWithinRadius(seekerRange, this.posX, this.posY,
-					this.posZ, this.world);
+		double seekerRange = Spells.spark_bomb.getProperty(Spell.EFFECT_RADIUS).doubleValue() * blastMultiplier;
 
-			List<Integer> secondaryTargetIDs = new ArrayList<>();
+		List<EntityLivingBase> targets = EntityUtils.getLivingWithinRadius(seekerRange, this.posX, this.posY,
+				this.posZ, this.world);
 
-			for(int i = 0; i < Math.min(targets.size(), Spells.spark_bomb.getProperty(SECONDARY_MAX_TARGETS).intValue()); i++){
+		for(int i = 0; i < Math.min(targets.size(), Spells.spark_bomb.getProperty(SECONDARY_MAX_TARGETS).intValue()); i++){
 
-				boolean flag = targets.get(i) != entityHit && targets.get(i) != this.getThrower()
-						&& !(targets.get(i) instanceof EntityPlayer
-								&& ((EntityPlayer)targets.get(i)).isCreative());
+			boolean flag = targets.get(i) != entityHit && targets.get(i) != this.getThrower()
+					&& !(targets.get(i) instanceof EntityPlayer
+							&& ((EntityPlayer)targets.get(i)).isCreative());
 
-				if(flag){
-					EntityLivingBase target = targets.get(i);
+			// Detects (client side) if target is the thrower, to stop particles being spawned around them.
+			//if(flag && world.isRemote && targets.get(i).getEntityId() == this.playerID) flag = false;
+
+			if(flag){
+
+				EntityLivingBase target = targets.get(i);
+
+				if(!this.world.isRemote){
 
 					target.playSound(WizardrySounds.ENTITY_SPARK_BOMB_CHAIN, 1.0F, rand.nextFloat() * 0.4F + 1.5F);
 
@@ -73,18 +79,11 @@ public class EntitySparkBomb extends EntityBomb {
 							MagicDamage.causeIndirectMagicDamage(this, this.getThrower(), DamageType.SHOCK),
 							Spells.spark_bomb.getProperty(Spell.SPLASH_DAMAGE).floatValue() * damageMultiplier);
 
-					secondaryTargetIDs.add(target.getEntityId());
+				}else{
+					ParticleBuilder.create(Type.LIGHTNING).pos(this.getPositionVector()).target(target).spawn(world);
+					ParticleBuilder.spawnShockParticles(world, target.posX, target.posY + target.height/2, target.posZ);
 				}
 			}
-
-			// Notify clients to play the explosion effect, including lightning arcs to secondary targets
-			int[] idArray = secondaryTargetIDs.stream().mapToInt(Integer::intValue).toArray();
-			WizardryPacketHandler.net.sendToAllAround(
-					new PacketBombExplosion.Message(PacketBombExplosion.SPARK_BOMB, posX, posY + height / 2, posZ,
-							blastMultiplier, idArray),
-					new NetworkRegistry.TargetPoint(world.provider.getDimension(), posX, posY, posZ, 64));
-
-			this.playSound(WizardrySounds.ENTITY_SPARK_BOMB_HIT_BLOCK, 0.5f, 0.5f);
 		}
 
 		this.setDead();

src/main/java/electroblob/wizardry/event/ArtefactCheckEvent.java

@@ -1,45 +0,0 @@
-package electroblob.wizardry.event;
-
-import electroblob.wizardry.item.ItemArtefact;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.fml.common.eventhandler.Cancelable;
-import net.minecraftforge.fml.common.eventhandler.Event;
-
-/**
- * ArtefactCheckEvent is fired when a check happens for an ItemArtefact using {@link electroblob.wizardry.item.ItemArtefact#isArtefactActive(net.minecraft.entity.player.EntityPlayer, net.minecraft.item.Item)}
- * <i>Fired on both sides.</i><br>
- * <br>
- * This event is {@link Cancelable}. <br>
- * <br>
- * This event has a result. {@link HasResult}. Set the result to Result.ALLOW to consider an artefact "active"<br>
- * <br>
- * This event is fired on the {@link MinecraftForge#EVENT_BUS}.
- *
- * @author WinDanesz
- * @since Wizardry 4.3.10
- */
-@Cancelable
-@Event.HasResult
-public class ArtefactCheckEvent extends PlayerEvent {
-
-	ItemArtefact artefact;
-	EntityPlayer player;
-
-	public ArtefactCheckEvent(EntityPlayer player, ItemArtefact artefact) {
-		super(player);
-		this.player = player;
-		this.artefact = artefact;
-		setResult(Result.DENY);
-	}
-
-	public ItemArtefact getArtefact() {
-		return artefact;
-	}
-
-	public EntityPlayer getPlayer() {
-		return player;
-	}
-
-}

src/main/java/electroblob/wizardry/integration/baubles/WizardryBaublesIntegration.java

@@ -46,9 +46,6 @@ public final class WizardryBaublesIntegration {
 		ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.RING, BaubleType.RING);
 		ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.AMULET, BaubleType.AMULET);
 		ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.CHARM, BaubleType.CHARM);
-		ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.BELT, BaubleType.BELT);
-		ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.BODY, BaubleType.BODY);
-		ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.HEAD, BaubleType.HEAD);
 	}
 
 	public static boolean enabled(){

src/main/java/electroblob/wizardry/integration/jei/ArcaneWorkbenchRecipe.java

@@ -1,5 +1,6 @@
 package electroblob.wizardry.integration.jei;
 
+import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.client.DrawingUtils;
 import electroblob.wizardry.constants.Constants;
 import electroblob.wizardry.constants.Element;
@@ -11,7 +12,9 @@ import mezz.jei.api.ingredients.VanillaTypes;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.MathHelper;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -95,8 +98,8 @@ public class ArcaneWorkbenchRecipe implements IRecipeWrapper {
 		// A stack of crystals will almost certainly be enough mana, but you never know!
 		// Using ItemStack.EMPTY to avoid deprecated method; crystals' stack size is not stack-sensitive so it doesn't matter
 		if(count <= WizardryItems.magic_crystal.getItemStackLimit(ItemStack.EMPTY)){
-			for(int meta = 0; meta < Element.values().length; meta++){
-				crystalStacks.add(new ItemStack(WizardryItems.magic_crystal, count, meta));
+			for (Element element : Element.values()) {
+				crystalStacks.add(new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID, element.name().toLowerCase() + "_crystal")), count));
 			}
 		}
 

src/main/java/electroblob/wizardry/integration/jei/ArcaneWorkbenchRecipeCategory.java

@@ -23,6 +23,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -214,7 +215,9 @@ public class ArcaneWorkbenchRecipeCategory implements IRecipeCategory<ArcaneWork
 		List<ArcaneWorkbenchRecipe> recipes = new ArrayList<>();
 
 		List<ItemStack> crystals = new ArrayList<>();
-		for(int meta = 0; meta < Element.values().length; meta++) crystals.add(new ItemStack(WizardryItems.magic_crystal, 1, meta));
+		for (Element element : Element.values()) {
+			crystals.add(new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID, "crystal_" + element.name().toLowerCase()))));
+		}
 		List<ItemStack> shard = Collections.singletonList(new ItemStack(WizardryItems.crystal_shard));
 		List<ItemStack> grandCrystal = Collections.singletonList(new ItemStack(WizardryItems.grand_crystal));
 

src/main/java/electroblob/wizardry/integration/jei/ImbuementAltarRecipeCategory.java

@@ -19,6 +19,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
 import net.minecraftforge.oredict.OreDictionary;
 
 import java.util.ArrayList;
@@ -118,7 +119,13 @@ public class ImbuementAltarRecipeCategory implements IRecipeCategory<ImbuementAl
 		List<ImbuementAltarRecipe> recipes = new ArrayList<>();
 
 		NonNullList<ItemStack> variants = NonNullList.create();
-		WizardryItems.spectral_dust.getSubItems(WizardryItems.spectral_dust.getCreativeTab(), variants);
+		variants.add(new ItemStack(WizardryItems.spectral_dust_earth));
+		variants.add(new ItemStack(WizardryItems.spectral_dust_fire));
+		variants.add(new ItemStack(WizardryItems.spectral_dust_healing));
+		variants.add(new ItemStack(WizardryItems.spectral_dust_ice));
+		variants.add(new ItemStack(WizardryItems.spectral_dust_lightning));
+		variants.add(new ItemStack(WizardryItems.spectral_dust_necromancy));
+		variants.add(new ItemStack(WizardryItems.spectral_dust_sorcery));
 
 		List<List<ItemStack>> dusts = new ArrayList<>();
 		// Generate 4 separate lists, each in a different order to make it obvious they can be any element
@@ -139,9 +146,10 @@ public class ImbuementAltarRecipeCategory implements IRecipeCategory<ImbuementAl
 
 		ItemStack input = new ItemStack(WizardryItems.magic_crystal);
 
-		for(int meta = 1; meta < Element.values().length; meta++){
-			List<List<ItemStack>> dusts = Collections.nCopies(4, Collections.singletonList(new ItemStack(WizardryItems.spectral_dust, 1, meta)));
-			ItemStack output = new ItemStack(WizardryItems.magic_crystal, 1, meta);
+		for(Element element : Element.values()){
+			List<List<ItemStack>> dusts = Collections.nCopies(4, Collections.singletonList(new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID,
+					"spectral_dust_" + element.name().toLowerCase())))));
+			ItemStack output = new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID, element.name().toLowerCase() + "_crystal")));
 			recipes.add(new ImbuementAltarRecipe(input, dusts, output));
 		}
 
@@ -153,11 +161,16 @@ public class ImbuementAltarRecipeCategory implements IRecipeCategory<ImbuementAl
 
 		List<ImbuementAltarRecipe> recipes = new ArrayList<>();
 
-		ItemStack input = new ItemStack(WizardryBlocks.crystal_block);
+		ItemStack input = new ItemStack(WizardryBlocks.magic_crystal_block);
 
-		for(int meta = 1; meta < Element.values().length; meta++){
-			List<List<ItemStack>> dusts = Collections.nCopies(4, Collections.singletonList(new ItemStack(WizardryItems.spectral_dust, 1, meta)));
-			ItemStack output = new ItemStack(WizardryBlocks.crystal_block, 1, meta);
+		for (Element element : Element.values()) {
+			if (element == Element.MAGIC) { continue; }
+
+			List<List<ItemStack>> dusts = Collections.nCopies(4, Collections.singletonList(new ItemStack(ForgeRegistries.ITEMS.getValue(
+					new ResourceLocation(Wizardry.MODID, "spectral_dust_" + element.name().toLowerCase())))));
+
+			ItemStack output = new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID, element.getName().toLowerCase()
+					+ "_crystal_block")));
 			recipes.add(new ImbuementAltarRecipe(input, dusts, output));
 		}
 
@@ -179,7 +192,8 @@ public class ImbuementAltarRecipeCategory implements IRecipeCategory<ImbuementAl
 
 					if(e == Element.MAGIC) continue;
 
-					List<List<ItemStack>> dusts = Collections.nCopies(4, Collections.singletonList(new ItemStack(WizardryItems.spectral_dust, 1, e.ordinal())));
+					List<List<ItemStack>> dusts = Collections.nCopies(4, Collections.singletonList(new ItemStack(
+							ForgeRegistries.ITEMS.getValue(new ResourceLocation(Wizardry.MODID, "spectral_dust_" + e.name().toLowerCase())))));
 					ItemStack output = TileEntityImbuementAltar.getImbuementResult(input, new Element[]{e, e, e, e}, false, null, null);
 
 					if(!output.isEmpty()) recipes.add(new ImbuementAltarRecipe(input, dusts, output));

src/main/java/electroblob/wizardry/inventory/ContainerArcaneWorkbench.java

@@ -98,7 +98,9 @@ public class ContainerArcaneWorkbench extends Container implements ISpellSortabl
 		this.addSlotToContainer(new SlotWorkbenchItem(tileentity, CENTRE_SLOT, 80, 64, this));
 
 		Set<Item> upgrades = new HashSet<>(WandHelper.getSpecialUpgrades()); // Can't be done statically.
-		upgrades.add(WizardryItems.arcane_tome);
+		upgrades.add(WizardryItems.arcane_tome_apprentice);
+		upgrades.add(WizardryItems.arcane_tome_advanced);
+		upgrades.add(WizardryItems.arcane_tome_master);
 		upgrades.add(WizardryItems.resplendent_thread);
 		upgrades.add(WizardryItems.crystal_silver_plating);
 		upgrades.add(WizardryItems.ethereal_crystalweave);
@@ -452,24 +454,6 @@ public class ContainerArcaneWorkbench extends Container implements ISpellSortabl
 		}
 	}
 
-	/**
-	 * Called (via {@link electroblob.wizardry.packet.PacketControlInput PacketControlInput}) when the clear button in
-	 * the arcane workbench GUI is pressed.
-	 */
-	// As of 2.1, for the sake of events and neatness of code, this was moved here from TileEntityArcaneWorkbench.
-	// As of 4.2, the spell binding/charging/upgrading code was delegated (via IWorkbenchItem) to the items themselves.
-	public void onClearButtonPressed(EntityPlayer player){
-
-		Slot centre = this.getSlot(CENTRE_SLOT);
-
-		if(centre.getStack().getItem() instanceof IWorkbenchItem){ // Should always be true, but no harm in checking.
-
-			Slot[] spellBooks = this.inventorySlots.subList(0, 8).toArray(new Slot[8]);
-
-			((IWorkbenchItem) centre.getStack().getItem()).onClearButtonPressed(player, centre, this.getSlot(CRYSTAL_SLOT), this.getSlot(UPGRADE_SLOT), spellBooks);
-		}
-	}
-
 	/** Scrolls to the given row number. */
 	public void scrollTo(int row){
 		this.scroll = row;

src/main/java/electroblob/wizardry/inventory/ContainerBookshelf.java

@@ -127,7 +127,9 @@ public class ContainerBookshelf extends Container {
 		registerBookItem(Items.WRITABLE_BOOK);
 		registerBookItem(Items.ENCHANTED_BOOK);
 		registerBookItem(WizardryItems.spell_book);
-		registerBookItem(WizardryItems.arcane_tome);
+		registerBookItem(WizardryItems.arcane_tome_apprentice);
+		registerBookItem(WizardryItems.arcane_tome_advanced);
+		registerBookItem(WizardryItems.arcane_tome_master);
 		registerBookItem(WizardryItems.wizard_handbook);
 		registerBookItem(WizardryItems.ruined_spell_book);
 		registerBookItem(WizardryItems.scroll);

src/main/java/electroblob/wizardry/item/IWorkbenchItem.java

@@ -55,26 +55,6 @@ public interface IWorkbenchItem {
 	 */
 	boolean onApplyButtonPressed(EntityPlayer player, Slot centre, Slot crystals, Slot upgrade, Slot[] spellBooks);
 
-	/**
-	 * Called when this item is in the central slot of an arcane workbench and the apply clear is pressed. Items must
-	 * implement this method to define what happens when the apply button is pressed.
-	 * @param player The player that pressed the apply button.
-	 * @param centre The central slot in the arcane workbench. This slot will always contain a stack of the implementing
-	 * item, or in other words, <i>it is guaranteed that</i> {@code this == centre.getStack().getItem()}.
-	 * @param crystals The magic crystal slot of the arcane workbench.
-	 * @param upgrade The upgrade slot of the arcane workbench.
-	 * @param spellBooks An array of the <i>active</i> (visible) spell book slots in the arcane workbench. The length of
-	 * the array will be equal to the value returned by {@link IWorkbenchItem#getSpellSlotCount(ItemStack)}.
-	 * */
-	default void onClearButtonPressed(EntityPlayer player, Slot centre, Slot crystals, Slot upgrade, Slot[] spellBooks){};
-
-	/**
-	 * Must be overridden in the item class to make the clear button in the Arcane Workbench clickable.
-	 * */
-	default boolean isClearable() {
-		return false;
-	}
-
 	/**
 	 * Returns whether the tooltip (dark grey box) should be drawn when this item is in an arcane workbench. Only
 	 * called client-side.

src/main/java/electroblob/wizardry/item/ItemArcaneTome.java

@@ -1,20 +1,11 @@
 package electroblob.wizardry.item;
 
 import electroblob.wizardry.Wizardry;
-import electroblob.wizardry.block.BlockBookshelf;
 import electroblob.wizardry.constants.Tier;
 import electroblob.wizardry.registry.WizardryTabs;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -23,68 +14,33 @@ import java.util.List;
 
 public class ItemArcaneTome extends Item {
 
-	public ItemArcaneTome(){
+	private final EnumRarity rarity;
+	private final Tier tier;
+
+	public ItemArcaneTome(EnumRarity rarity, Tier tier){
 		super();
-		setHasSubtypes(true);
 		setMaxStackSize(1);
 		setCreativeTab(WizardryTabs.WIZARDRY);
+		this.rarity = rarity;
+		this.tier = tier;
 	}
 
-	@Override
-	public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list){
-		if(tab == WizardryTabs.WIZARDRY || tab == CreativeTabs.SEARCH){ // Don't use isInCreativeTab here.
-			for(int i = 1; i < Tier.values().length; i++){
-				list.add(new ItemStack(this, 1, i));
-			}
-		}
-	}
+	public Tier getTier() { return tier; }
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public boolean hasEffect(ItemStack stack){
-		return true;
-	}
+	public boolean hasEffect(ItemStack stack){ return true; }
 
 	@Override
-	public EnumRarity getRarity(ItemStack stack){
-		switch(this.getDamage(stack)){
-		case 1:
-			return EnumRarity.UNCOMMON;
-		case 2:
-			return EnumRarity.RARE;
-		case 3:
-			return EnumRarity.EPIC;
-		}
-		return EnumRarity.COMMON;
-	}
-
-	@Override
-	public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand,
-			EnumFacing facing, float hitX, float hitY, float hitZ){
-		if(player.isSneaking()){
-			IBlockState state = world.getBlockState(pos);
-			if(state.getBlock() instanceof BlockBookshelf){
-				if(state.getBlock().onBlockActivated(world, pos, state, player, hand, facing, hitX, hitY, hitZ)){
-					return EnumActionResult.SUCCESS;
-				}
-			}
-		}
-		return EnumActionResult.PASS;
-	}
+	public EnumRarity getRarity(ItemStack stack){ return rarity; }
 
 	@SideOnly(Side.CLIENT)
 	@Override
 	public void addInformation(ItemStack stack, World world, List<String> tooltip, net.minecraft.client.util.ITooltipFlag showAdvanced){
-
-		if(stack.getItemDamage() < 1){
-			return; // If something's up with the metadata it will display a 'generic' tome of arcana with no info
-		}
-
-		Tier tier = Tier.values()[stack.getItemDamage()];
-		Tier tier2 = Tier.values()[stack.getItemDamage() - 1];
-
 		tooltip.add(tier.getDisplayNameWithFormatting());
-		Wizardry.proxy.addMultiLineDescription(tooltip, "item." + this.getRegistryName() + ".desc",
+		Tier tier2 = Tier.values()[tier.ordinal() - 1];
+
+		Wizardry.proxy.addMultiLineDescription(tooltip, "item." + Wizardry.MODID + ":arcane_tome.desc",
 				tier2.getDisplayNameWithFormatting() + "\u00A77", tier.getDisplayNameWithFormatting() + "\u00A77");
 	}
 

src/main/java/electroblob/wizardry/item/ItemArtefact.java

@@ -10,7 +10,6 @@ import electroblob.wizardry.entity.living.ISummonedCreature;
 import electroblob.wizardry.entity.projectile.EntityDart;
 import electroblob.wizardry.entity.projectile.EntityForceOrb;
 import electroblob.wizardry.entity.projectile.EntityIceShard;
-import electroblob.wizardry.event.ArtefactCheckEvent;
 import electroblob.wizardry.event.SpellCastEvent;
 import electroblob.wizardry.event.SpellCastEvent.Source;
 import electroblob.wizardry.integration.DamageSafetyChecker;
@@ -38,7 +37,6 @@ import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
 import net.minecraftforge.common.BiomeDictionary;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingEvent;
@@ -90,10 +88,7 @@ public class ItemArtefact extends Item {
 
 		/** An artefact that improves attacking spells. Two of these can be active at any one time. */ RING(2),
 		/** An artefact that improves defensive spells. One of these can be active at any one time. */ AMULET(1),
-		/** An artefact that improves utility spells. One of these can be active at any one time. */ CHARM(1),
-		/** Added for add-on artefacts. */ BELT(1),
-		/** Added for add-on artefacts. */ BODY(1),
-		/** Added for add-on artefacts. */ HEAD(1);
+		/** An artefact that improves utility spells. One of these can be active at any one time. */ CHARM(1);
 
 		public final int maxAtOnce;
 
@@ -183,13 +178,6 @@ public class ItemArtefact extends Item {
 
 		if(!((ItemArtefact)artefact).enabled) return false; // Disabled in the config
 
-		ArtefactCheckEvent event = new ArtefactCheckEvent(player, (ItemArtefact) artefact);
-		if(MinecraftForge.EVENT_BUS.post(event)) return false;
-
-		if (event.getResult() == Event.Result.ALLOW) {
-			return true;
-		}
-
 		if(WizardryBaublesIntegration.enabled()){
 			return WizardryBaublesIntegration.isBaubleEquipped(player, artefact);
 		}else{
@@ -675,7 +663,7 @@ public class ItemArtefact extends Item {
 
 				}else if(artefact == WizardryItems.amulet_transience){
 
-					if(!player.world.isRemote && player.getHealth() <= 6 && player.world.rand.nextFloat() < 0.25f){
+					if(player.getHealth() <= 6 && player.world.rand.nextFloat() < 0.25f){
 						player.addPotionEffect(new PotionEffect(WizardryPotions.transience, 300));
 						player.addPotionEffect(new PotionEffect(MobEffects.INVISIBILITY, 300, 0, false, false));
 					}
@@ -701,7 +689,7 @@ public class ItemArtefact extends Item {
 
 				}else if(artefact == WizardryItems.ring_ice_melee){
 
-					if(!player.world.isRemote && EntityUtils.isMeleeDamage(event.getSource()) && mainhandItem.getItem() instanceof ItemWand
+					if(EntityUtils.isMeleeDamage(event.getSource()) && mainhandItem.getItem() instanceof ItemWand
 							&& ((ItemWand)mainhandItem.getItem()).element == Element.ICE){
 						event.getEntityLiving().addPotionEffect(new PotionEffect(WizardryPotions.frost, 200, 0));
 					}
@@ -734,14 +722,14 @@ public class ItemArtefact extends Item {
 
 				}else if(artefact == WizardryItems.ring_necromancy_melee){
 
-					if(!player.world.isRemote && EntityUtils.isMeleeDamage(event.getSource()) && mainhandItem.getItem() instanceof ItemWand
+					if(EntityUtils.isMeleeDamage(event.getSource()) && mainhandItem.getItem() instanceof ItemWand
 							&& ((ItemWand)mainhandItem.getItem()).element == Element.NECROMANCY){
 						event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.WITHER, 200, 0));
 					}
 
 				}else if(artefact == WizardryItems.ring_earth_melee){
 
-					if(!player.world.isRemote && EntityUtils.isMeleeDamage(event.getSource()) && mainhandItem.getItem() instanceof ItemWand
+					if(EntityUtils.isMeleeDamage(event.getSource()) && mainhandItem.getItem() instanceof ItemWand
 							&& ((ItemWand)mainhandItem.getItem()).element == Element.EARTH){
 						event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.POISON, 200, 0));
 					}
@@ -774,12 +762,12 @@ public class ItemArtefact extends Item {
 				}else if(artefact == WizardryItems.ring_soulbinding){
 
 					// Best guess at necromancy spell damage: either it's wither damage...
-					if(!player.world.isRemote && ((event.getSource() instanceof IElementalDamage
+					if((event.getSource() instanceof IElementalDamage
 							&& (((IElementalDamage)event.getSource()).getType() == MagicDamage.DamageType.WITHER))
 						// or it's direct, non-melee damage and the player is holding a wand with a necromancy spell selected
 						|| (event.getSource().getImmediateSource() == player && !EntityUtils.isMeleeDamage(event.getSource())
 							&& Streams.stream(player.getHeldEquipment()).anyMatch(s -> s.getItem() instanceof ISpellCastingItem
-							&& ((ISpellCastingItem)s.getItem()).getCurrentSpell(s).getElement() == Element.NECROMANCY)))){
+							&& ((ISpellCastingItem)s.getItem()).getCurrentSpell(s).getElement() == Element.NECROMANCY))){
 
 						event.getEntityLiving().addPotionEffect(new PotionEffect(WizardryPotions.curse_of_soulbinding, 400));
 						CurseOfSoulbinding.getSoulboundCreatures(WizardData.get(player)).add(event.getEntity().getUniqueID());
@@ -804,14 +792,14 @@ public class ItemArtefact extends Item {
 				}else if(artefact == WizardryItems.ring_poison){
 
 					// Best guess at earth spell damage: either it's poison damage...
-					if(!player.world.isRemote && ((event.getSource() instanceof IElementalDamage
+					if((event.getSource() instanceof IElementalDamage
 							&& (((IElementalDamage)event.getSource()).getType() == MagicDamage.DamageType.POISON))
 							// ...or it was from a dart...
 							|| event.getSource().getImmediateSource() instanceof EntityDart
 							// ...or it's direct, non-melee damage and the player is holding a wand with an earth spell selected
 							|| (event.getSource().getImmediateSource() == player && !EntityUtils.isMeleeDamage(event.getSource())
 							&& Streams.stream(player.getHeldEquipment()).anyMatch(s -> s.getItem() instanceof ISpellCastingItem
-							&& ((ISpellCastingItem)s.getItem()).getCurrentSpell(s).getElement() == Element.EARTH)))){
+							&& ((ISpellCastingItem)s.getItem()).getCurrentSpell(s).getElement() == Element.EARTH))){
 
 						event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.POISON, 200, 0));
 					}

src/main/java/electroblob/wizardry/item/ItemBlankScroll.java

@@ -1,7 +1,6 @@
 package electroblob.wizardry.item;
 
 import electroblob.wizardry.Wizardry;
-import electroblob.wizardry.block.BlockBookshelf;
 import electroblob.wizardry.constants.Constants;
 import electroblob.wizardry.data.WizardData;
 import electroblob.wizardry.registry.Spells;
@@ -9,18 +8,12 @@ import electroblob.wizardry.registry.WizardryItems;
 import electroblob.wizardry.registry.WizardryTabs;
 import electroblob.wizardry.spell.Spell;
 import electroblob.wizardry.util.SpellProperties;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.World;
 
 public class ItemBlankScroll extends Item implements IWorkbenchItem {
 
@@ -74,18 +67,4 @@ public class ItemBlankScroll extends Item implements IWorkbenchItem {
 		return false;
 	}
 
-	@Override
-	public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand,
-			EnumFacing facing, float hitX, float hitY, float hitZ){
-		if(player.isSneaking()){
-			IBlockState state = world.getBlockState(pos);
-			if(state.getBlock() instanceof BlockBookshelf){
-				if(state.getBlock().onBlockActivated(world, pos, state, player, hand, facing, hitX, hitY, hitZ)){
-					return EnumActionResult.SUCCESS;
-				}
-			}
-		}
-		return EnumActionResult.PASS;
-	}
-
 }

src/main/java/electroblob/wizardry/item/ItemCrystal.java

@@ -1,44 +1,21 @@
 package electroblob.wizardry.item;
 
-import electroblob.wizardry.Wizardry;
+import electroblob.wizardry.api.IElemental;
 import electroblob.wizardry.constants.Element;
 import electroblob.wizardry.registry.WizardryTabs;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
 
-/** Note that in 1.13, <i>the flattening</i> will make this class redundant, much like ItemCoal, which is probably its
- * closest analog in vanilla. */
-public class ItemCrystal extends Item implements IMultiTexturedItem {
+public class ItemCrystal extends Item implements IElemental {
 
-	public ItemCrystal(){
+	private final Element element;
+
+	public ItemCrystal(Element element) {
 		super();
-	    this.setHasSubtypes(true);
-        this.setMaxDamage(0);
-        this.setCreativeTab(WizardryTabs.WIZARDRY);
-    }
-
-	@Override
-	public ResourceLocation getModelName(ItemStack stack){
-		int metadata = stack.getMetadata();
-		if(metadata >= Element.values().length) metadata = 0;
-		return new ResourceLocation(Wizardry.MODID, "crystal_" + Element.values()[metadata].getName());
+		this.setMaxDamage(0);
+		this.setCreativeTab(WizardryTabs.WIZARDRY);
+		this.element = element;
 	}
 
 	@Override
-    public String getTranslationKey(ItemStack stack){
-		return "item." + this.getModelName(stack).toString();
-    }
-
-    @Override
-    public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items){
-        if(tab == WizardryTabs.WIZARDRY || tab == CreativeTabs.SEARCH){
-        	for(Element element : Element.values()){
-        		items.add(new ItemStack(this, 1, element.ordinal()));
-        	}
-        }
-    }
-
+	public Element getElement() { return element; }
 }

src/main/java/electroblob/wizardry/item/ItemFlamecatcher.java

@@ -193,6 +193,14 @@ public class ItemFlamecatcher extends ItemBow implements IConjuredItem {
 			charge = net.minecraftforge.event.ForgeEventFactory.onArrowLoose(stack, world, (EntityPlayer)entity, charge, true);
 			if(charge < 0) return;
 
+			if(stack.getTagCompound() != null){
+				int shotsLeft = stack.getTagCompound().getInteger(Flamecatcher.SHOTS_REMAINING_NBT_KEY) - 1;
+				stack.getTagCompound().setInteger(Flamecatcher.SHOTS_REMAINING_NBT_KEY, shotsLeft);
+				if(shotsLeft == 0 && !world.isRemote){
+					stack.setItemDamage(getMaxDamage(stack) - getAnimationFrames());
+				}
+			}
+
 			float velocity = (float)charge / DRAW_TIME;
 			velocity = (velocity * velocity + velocity * 2) / 3;
 
@@ -200,14 +208,6 @@ public class ItemFlamecatcher extends ItemBow implements IConjuredItem {
 
 			if((double)velocity >= 0.1D){
 
-				if(stack.getTagCompound() != null){
-					int shotsLeft = stack.getTagCompound().getInteger(Flamecatcher.SHOTS_REMAINING_NBT_KEY) - 1;
-					stack.getTagCompound().setInteger(Flamecatcher.SHOTS_REMAINING_NBT_KEY, shotsLeft);
-					if(shotsLeft == 0 && !world.isRemote){
-						stack.setItemDamage(getMaxDamage(stack) - getAnimationFrames());
-					}
-				}
-
 				if(!world.isRemote){
 					EntityFlamecatcherArrow arrow = new EntityFlamecatcherArrow(world);
 					arrow.aim(player, EntityFlamecatcherArrow.SPEED * velocity);

src/main/java/electroblob/wizardry/item/ItemFrostAxe.java

@@ -96,7 +96,7 @@ public class ItemFrostAxe extends ItemAxe implements IConjuredItem {
 
 	@Override
 	public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase wielder){
-		if(!target.world.isRemote && !MagicDamage.isEntityImmune(DamageType.FROST, target))
+		if(!MagicDamage.isEntityImmune(DamageType.FROST, target))
 			target.addPotionEffect(new PotionEffect(WizardryPotions.frost, 160, 1));
 		return false;
 	}

src/main/java/electroblob/wizardry/item/ItemIdentificationScroll.java

@@ -1,23 +1,19 @@
 package electroblob.wizardry.item;
 
 import electroblob.wizardry.Wizardry;
-import electroblob.wizardry.block.BlockBookshelf;
 import electroblob.wizardry.data.WizardData;
 import electroblob.wizardry.event.DiscoverSpellEvent;
 import electroblob.wizardry.registry.WizardrySounds;
 import electroblob.wizardry.registry.WizardryTabs;
 import electroblob.wizardry.spell.Spell;
 import electroblob.wizardry.util.InventoryUtils;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
@@ -51,20 +47,6 @@ public class ItemIdentificationScroll extends Item {
 		Wizardry.proxy.addMultiLineDescription(tooltip, "item." + this.getRegistryName() + ".desc");
 	}
 
-	@Override
-	public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand,
-			EnumFacing facing, float hitX, float hitY, float hitZ){
-		if(player.isSneaking()){
-			IBlockState state = world.getBlockState(pos);
-			if(state.getBlock() instanceof BlockBookshelf){
-				if(state.getBlock().onBlockActivated(world, pos, state, player, hand, facing, hitX, hitY, hitZ)){
-					return EnumActionResult.SUCCESS;
-				}
-			}
-		}
-		return EnumActionResult.PASS;
-	}
-
 	@Override
 	public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand){
 

src/main/java/electroblob/wizardry/item/ItemScroll.java

@@ -1,7 +1,6 @@
 package electroblob.wizardry.item;
 
 import electroblob.wizardry.Wizardry;
-import electroblob.wizardry.block.BlockBookshelf;
 import electroblob.wizardry.data.WizardData;
 import electroblob.wizardry.event.SpellCastEvent;
 import electroblob.wizardry.event.SpellCastEvent.Source;
@@ -10,7 +9,6 @@ import electroblob.wizardry.packet.WizardryPacketHandler;
 import electroblob.wizardry.registry.WizardryTabs;
 import electroblob.wizardry.spell.Spell;
 import electroblob.wizardry.util.SpellModifiers;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -19,10 +17,8 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.Style;
 import net.minecraft.util.text.TextFormatting;
@@ -126,20 +122,6 @@ public class ItemScroll extends Item implements ISpellCastingItem, IWorkbenchIte
 		return CASTING_TIME;
 	}
 
-	@Override
-	public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand,
-			EnumFacing facing, float hitX, float hitY, float hitZ){
-		if(player.isSneaking()){
-			IBlockState state = world.getBlockState(pos);
-			if(state.getBlock() instanceof BlockBookshelf){
-				if(state.getBlock().onBlockActivated(world, pos, state, player, hand, facing, hitX, hitY, hitZ)){
-					return EnumActionResult.SUCCESS;
-				}
-			}
-		}
-		return EnumActionResult.PASS;
-	}
-
 	@Override
 	public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand){
 
@@ -178,21 +160,12 @@ public class ItemScroll extends Item implements ISpellCastingItem, IWorkbenchIte
 
 			Spell spell = Spell.byMetadata(stack.getItemDamage());
 			// By default, scrolls have no modifiers - but with the event system, they could be added.
-
-			SpellModifiers modifiers;
-
-			if(WizardData.get(player) != null){
-				modifiers = WizardData.get(player).itemCastingModifiers;
-			}else{
-				modifiers = new SpellModifiers();
-			}
-
+			SpellModifiers modifiers = new SpellModifiers();
 			int castingTick = stack.getMaxItemUseDuration() - count;
 
 			// Continuous spells (these must check if they can be cast each tick since the mana changes)
 			// In theory the spell is always continuous here but just in case it isn't...
-			// Do not check canCast() on tick 0 as it is already done in onItemRightClick() and would duplicate modifiers
-			if(spell.isContinuous && (castingTick == 0 || canCast(stack, spell, player, player.getActiveHand(), castingTick, modifiers))){
+			if(spell.isContinuous && canCast(stack, spell, player, player.getActiveHand(), castingTick, modifiers)){
 				cast(stack, spell, player, player.getActiveHand(), castingTick, modifiers);
 			}else{
 				// Scrolls normally work on the max use duration so this isn't ever reached by wizardry, but if the

src/main/java/electroblob/wizardry/item/ItemSpectralBow.java

@@ -1,7 +1,6 @@
 package electroblob.wizardry.item;
 
 import electroblob.wizardry.Wizardry;
-import electroblob.wizardry.entity.projectile.EntityConjuredArrow;
 import electroblob.wizardry.registry.Spells;
 import electroblob.wizardry.util.InventoryUtils;
 import net.minecraft.enchantment.EnchantmentHelper;
@@ -15,7 +14,6 @@ import net.minecraft.init.SoundEvents;
 import net.minecraft.item.IItemPropertyGetter;
 import net.minecraft.item.ItemArrow;
 import net.minecraft.item.ItemBow;
-import net.minecraft.item.ItemSpectralArrow;
 import net.minecraft.item.ItemStack;
 import net.minecraft.stats.StatList;
 import net.minecraft.util.*;
@@ -199,7 +197,8 @@ public class ItemSpectralBow extends ItemBow implements IConjuredItem {
 
 				if(!world.isRemote){
 
-					EntityConjuredArrow entityarrow = new EntityConjuredArrow(world, entityplayer);
+					ItemArrow itemarrow = (ItemArrow)Items.ARROW;
+					EntityArrow entityarrow = itemarrow.createArrow(world, new ItemStack(itemarrow), entityplayer);
 					entityarrow.shoot(entityplayer, entityplayer.rotationPitch, entityplayer.rotationYaw, 0.0F,
 							f * 3.0F, 1.0F);
 

src/main/java/electroblob/wizardry/item/ItemSpectralDust.java

@@ -1,39 +1,13 @@
 package electroblob.wizardry.item;
 
-import electroblob.wizardry.Wizardry;
-import electroblob.wizardry.constants.Element;
 import electroblob.wizardry.registry.WizardryTabs;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
 
-import java.util.Arrays;
-
-public class ItemSpectralDust extends Item implements IMultiTexturedItem {
+public class ItemSpectralDust extends Item {
 
 	public ItemSpectralDust(){
 		super();
-	    this.setHasSubtypes(true);
         this.setMaxDamage(0);
         this.setCreativeTab(WizardryTabs.WIZARDRY);
     }
-
-	@Override
-	public ResourceLocation getModelName(ItemStack stack){
-		int metadata = stack.getMetadata();
-		if(metadata >= Element.values().length) metadata = 0;
-		return new ResourceLocation(Wizardry.MODID, "spectral_dust_" + Element.values()[metadata].getName());
-	}
-
-    @Override
-    public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items){
-        if(tab == WizardryTabs.WIZARDRY || tab == CreativeTabs.SEARCH){
-        	for(Element element : Arrays.copyOfRange(Element.values(), 1, Element.values().length)){
-        		items.add(new ItemStack(this, 1, element.ordinal()));
-        	}
-        }
-    }
-
 }

src/main/java/electroblob/wizardry/item/ItemSpellBook.java

@@ -1,7 +1,6 @@
 package electroblob.wizardry.item;
 
 import com.google.common.collect.ImmutableMap;
-import electroblob.wizardry.block.BlockBookshelf;
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.WizardryGuiHandler;
 import electroblob.wizardry.constants.Tier;
@@ -15,12 +14,9 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.text.Style;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
@@ -62,21 +58,6 @@ public class ItemSpellBook extends Item {
 		}
 	}
 
-	@Override
-	public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand,
-			EnumFacing facing, float hitX, float hitY, float hitZ){
-		// Minecraft skips onBlockActivated when sneaking with a non-empty hand, so we handle it here
-		if(player.isSneaking()){
-			IBlockState state = world.getBlockState(pos);
-			if(state.getBlock() instanceof BlockBookshelf){
-				if(state.getBlock().onBlockActivated(world, pos, state, player, hand, facing, hitX, hitY, hitZ)){
-					return EnumActionResult.SUCCESS;
-				}
-			}
-		}
-		return EnumActionResult.PASS;
-	}
-
 	@Override
 	public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand){
 		ItemStack stack = player.getHeldItem(hand);

src/main/java/electroblob/wizardry/item/ItemWand.java

@@ -28,7 +28,6 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
@@ -46,7 +45,6 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import javax.annotation.Nullable;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 
@@ -70,7 +68,7 @@ import java.util.Random;
 public class ItemWand extends Item implements IWorkbenchItem, ISpellCastingItem, IManaStoringItem {
 	
 	/** The number of spell slots a wand has with no attunement upgrades applied. */
-	public static int BASE_SPELL_SLOTS;
+	public static final int BASE_SPELL_SLOTS = 5;
 
 	/** The number of ticks between each time a continuous spell is added to the player's recently-cast spells. */
 	private static final int CONTINUOUS_TRACKING_INTERVAL = 20;
@@ -228,22 +226,14 @@ public class ItemWand extends Item implements IWorkbenchItem, ISpellCastingItem,
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean isHeldInMainhand){
-		boolean isHeld = isHeldInMainhand || entity instanceof EntityLivingBase && ItemStack.areItemStacksEqual(stack, ((EntityLivingBase) entity).getHeldItemOffhand());
-
-		// If Wizardry.settings.wandsMustBeHeldToDecrementCooldown is false, the cooldowns will be decremented.
-		// If Wizardry.settings.wandsMustBeHeldToDecrementCooldown is true and isHeld is true, the cooldowns will also be decremented.
-		// If Wizardry.settings.wandsMustBeHeldToDecrementCooldown is true and isHeld is false, the cooldowns will not be decremented.
-		if (!Wizardry.settings.wandsMustBeHeldToDecrementCooldown || isHeld) {
-			WandHelper.decrementCooldowns(stack);
-		}
+	public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean isHeld){
+		
+		if(isHeld) WandHelper.decrementCooldowns(stack);
 
 		// Decrements wand damage (increases mana) every 1.5 seconds if it has a condenser upgrade
 		if(!world.isRemote && !this.isManaFull(stack) && world.getTotalWorldTime() % Constants.CONDENSER_TICK_INTERVAL == 0){
 			// If the upgrade level is 0, this does nothing anyway.
-			int baseAmount = WandHelper.getUpgradeLevel(stack, WizardryItems.condenser_upgrade);
-			int amount = (int)(baseAmount * Wizardry.settings.condenserAmountMultiplier);
-			this.rechargeMana(stack, amount);
+			this.rechargeMana(stack, WandHelper.getUpgradeLevel(stack, WizardryItems.condenser_upgrade));
 		}
 	}
 
@@ -697,9 +687,9 @@ public class ItemWand extends Item implements IWorkbenchItem, ISpellCastingItem,
 
 		// Upgrades wand if necessary. Damage is copied, preserving remaining durability,
 		// and also the entire NBT tag compound.
-		if(upgrade.getItem() == WizardryItems.arcane_tome){
+		if(upgrade.getItem() instanceof ItemArcaneTome){
 
-			Tier tier = Tier.values()[upgrade.getItemDamage()];
+			Tier tier = ((ItemArcaneTome) upgrade.getItem()).getTier();
 
 			// Checks the wand upgrade is for the tier above the wand's tier, and that either the wand has enough
 			// progression or the player is in creative mode.
@@ -737,7 +727,7 @@ public class ItemWand extends Item implements IWorkbenchItem, ISpellCastingItem,
 			Item specialUpgrade = upgrade.getItem();
 
 			int maxUpgrades = this.tier.upgradeLimit;
-			if(this.element == null) maxUpgrades += Constants.NON_ELEMENTAL_UPGRADE_BONUS;
+			if(this.element == Element.MAGIC) maxUpgrades += Constants.NON_ELEMENTAL_UPGRADE_BONUS;
 
 			if(WandHelper.getTotalUpgrades(wand) < maxUpgrades
 					&& WandHelper.getUpgradeLevel(wand, specialUpgrade) < Constants.UPGRADE_STACK_LIMIT){
@@ -846,19 +836,8 @@ public class ItemWand extends Item implements IWorkbenchItem, ISpellCastingItem,
 				Spell spell = Spell.byMetadata(spellBooks[i].getStack().getItemDamage());
 				// If the wand is powerful enough for the spell, it's not already bound to that slot and it's enabled for wands
 				if(!(spell.getTier().level > this.tier.level) && spells[i] != spell && spell.isEnabled(SpellProperties.Context.WANDS)){
-
-					// Decide if we can bind this multiple times
-					if (Wizardry.settings.preventBindingSameSpellTwiceToWands && Arrays.stream(spells).anyMatch(s -> s == spell)) {
-						continue;
-					}
-
 					spells[i] = spell;
 					changed = true;
-
-					// setting to consume books upon use
-					if (Wizardry.settings.singleUseSpellBooks) {
-						spellBooks[i].getStack().shrink(1);
-					}
 				}
 			}
 		}
@@ -866,35 +845,36 @@ public class ItemWand extends Item implements IWorkbenchItem, ISpellCastingItem,
 		WandHelper.setSpells(centre.getStack(), spells);
 
 		// Charges wand by appropriate amount
-		if (WandHelper.rechargeManaOnApplyButtonPressed(centre, crystals)) {
+		if(crystals.getStack() != ItemStack.EMPTY && !this.isManaFull(centre.getStack())){
+			
+			int chargeDepleted = this.getManaCapacity(centre.getStack()) - this.getMana(centre.getStack());
+
+			// Not too pretty but allows addons implementing the IManaStoringItem interface to provide their mana amount for custom crystals,
+			// previously this was defaulted to the regular crystal's amount, allowing players to exploit it if a crystal was worth less mana than that.
+			int manaPerItem = crystals.getStack().getItem() instanceof IManaStoringItem ?
+					((IManaStoringItem) crystals.getStack().getItem()).getMana(crystals.getStack()) :
+					crystals.getStack().getItem() instanceof ItemCrystal ? Constants.MANA_PER_CRYSTAL : Constants.MANA_PER_SHARD;
+
+			if(crystals.getStack().getItem() == WizardryItems.crystal_shard) manaPerItem = Constants.MANA_PER_SHARD;
+			if(crystals.getStack().getItem() == WizardryItems.grand_crystal) manaPerItem = Constants.GRAND_CRYSTAL_MANA;
+			
+			if(crystals.getStack().getCount() * manaPerItem < chargeDepleted){
+				// If there aren't enough crystals to fully charge the wand
+				this.rechargeMana(centre.getStack(), crystals.getStack().getCount() * manaPerItem);
+				crystals.decrStackSize(crystals.getStack().getCount());
+
+			}else{
+				// If there are excess crystals (or just enough)
+				this.setMana(centre.getStack(), this.getManaCapacity(centre.getStack()));
+				crystals.decrStackSize((int)Math.ceil(((double)chargeDepleted) / manaPerItem));
+			}
+
 			changed = true;
 		}
-
+		
 		return changed;
 	}
 
-	@Override
-	public void onClearButtonPressed(EntityPlayer player, Slot centre, Slot crystals, Slot upgrade, Slot[] spellBooks){
-		ItemStack stack = centre.getStack();
-		if (stack.hasTagCompound() && stack.getTagCompound().hasKey(WandHelper.SPELL_ARRAY_KEY)) {
-			NBTTagCompound nbt = stack.getTagCompound();
-			int[] spells = nbt.getIntArray(WandHelper.SPELL_ARRAY_KEY);
-			int expectedSlotCount = BASE_SPELL_SLOTS + WandHelper.getUpgradeLevel(stack,
-					WizardryItems.attunement_upgrade);
-
-			// unbrick broken wands
-			if (spells.length < expectedSlotCount) {
-				spells = new int[expectedSlotCount];
-			}
-			Arrays.fill(spells, 0);
-			nbt.setIntArray(WandHelper.SPELL_ARRAY_KEY, spells);
-			stack.setTagCompound(nbt);
-		}
-	}
-
-	@Override
-	public boolean isClearable() { return true; }
-
 	// hitEntity is only called server-side, so we'll have to use events
 	@SubscribeEvent
 	public static void onAttackEntityEvent(AttackEntityEvent event){

src/main/java/electroblob/wizardry/item/ItemWandUpgrade.java

@@ -1,17 +1,10 @@
 package electroblob.wizardry.item;
 
 import electroblob.wizardry.Wizardry;
-import electroblob.wizardry.block.BlockBookshelf;
 import electroblob.wizardry.registry.WizardryTabs;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -31,20 +24,6 @@ public class ItemWandUpgrade extends Item {
 		return EnumRarity.UNCOMMON;
 	}
 
-	@Override
-	public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand,
-			EnumFacing facing, float hitX, float hitY, float hitZ){
-		if(player.isSneaking()){
-			IBlockState state = world.getBlockState(pos);
-			if(state.getBlock() instanceof BlockBookshelf){
-				if(state.getBlock().onBlockActivated(world, pos, state, player, hand, facing, hitX, hitY, hitZ)){
-					return EnumActionResult.SUCCESS;
-				}
-			}
-		}
-		return EnumActionResult.PASS;
-	}
-
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, net.minecraft.client.util.ITooltipFlag flag) {

src/main/java/electroblob/wizardry/item/ItemWizardArmour.java

@@ -209,7 +209,7 @@ public class ItemWizardArmour extends ItemArmor implements IWorkbenchItem, IMana
 
 	@Override
 	public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack){
-		if(!world.isRemote && armorType == EntityEquipmentSlot.HEAD && player.ticksExisted % 20 == 0
+		if(armorType == EntityEquipmentSlot.HEAD && player.ticksExisted % 20 == 0
 				&& isWearingFullSet(player, element, ArmourClass.BATTLEMAGE) && doAllArmourPiecesHaveMana(player)){
 			player.addPotionEffect(new PotionEffect(WizardryPotions.ward, 219, 0, true, false));
 		}

src/main/java/electroblob/wizardry/item/ItemWizardHandbook.java

@@ -2,17 +2,13 @@ package electroblob.wizardry.item;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.WizardryGuiHandler;
-import electroblob.wizardry.block.BlockBookshelf;
 import electroblob.wizardry.registry.WizardryTabs;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.Style;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.util.text.TextFormatting;
@@ -38,20 +34,6 @@ public class ItemWizardHandbook extends Item {
 				new Style().setColor(TextFormatting.GRAY), AUTHOR));
 	}
 
-	@Override
-	public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand,
-			EnumFacing facing, float hitX, float hitY, float hitZ){
-		if(player.isSneaking()){
-			IBlockState state = world.getBlockState(pos);
-			if(state.getBlock() instanceof BlockBookshelf){
-				if(state.getBlock().onBlockActivated(world, pos, state, player, hand, facing, hitX, hitY, hitZ)){
-					return EnumActionResult.SUCCESS;
-				}
-			}
-		}
-		return EnumActionResult.PASS;
-	}
-
 	@Override
 	public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand){
 		ItemStack stack = player.getHeldItem(hand);

src/main/java/electroblob/wizardry/loot/RandomSpell.java

@@ -86,13 +86,7 @@ public class RandomSpell extends LootFunction {
 		// (And WHY does it only return an entity?! The underlying field is always a player so I'm casting it anyway)
 		EntityPlayer player = (EntityPlayer)context.getKillerPlayer();
 
-        Spell spell;
-        try {
-            spell = pickRandomSpell(stack, random, spellContext, player);
-        } catch (ClassCastException e) {
-            Wizardry.logger.warn("Failed to apply random_spell function! An item ({}) was passed to a spell's compatibility check that it couldn't handle.", stack.getItem().getRegistryName(), e);
-            return stack; // Safely bypass processing and return the raw item intact
-        }
+		Spell spell = pickRandomSpell(stack, random, spellContext, player);
 
 		if(spell == Spells.none) Wizardry.logger.warn("Tried to apply the random_spell loot function to an item, but no"
 					+ " enabled spells matched the criteria specified. Substituting placeholder (metadata 0) item.");

src/main/java/electroblob/wizardry/misc/Forfeit.java

@@ -78,7 +78,7 @@ public abstract class Forfeit {
 
 	public Forfeit(ResourceLocation name){
 		this.name = name;
-		this.sound = WizardrySounds.createSound(name.getNamespace(), "forfeit." + name.getPath());
+		this.sound = WizardrySounds.createSound("forfeit." + name.getPath());
 	}
 
 	public abstract void apply(World world, EntityPlayer player);
@@ -257,9 +257,9 @@ public abstract class Forfeit {
 						1, EntityUtils.canDamageBlocks(p, w)));
 		}));
 
-		add(Tier.NOVICE, Element.ICE, create("freeze_self", (w, p) -> { if(!w.isRemote) p.addPotionEffect(new PotionEffect(WizardryPotions.frost, 200)); }));
+		add(Tier.NOVICE, Element.ICE, create("freeze_self", (w, p) -> p.addPotionEffect(new PotionEffect(WizardryPotions.frost, 200))));
 
-		add(Tier.APPRENTICE, Element.ICE, create("freeze_self_2", (w, p) -> { if(!w.isRemote) p.addPotionEffect(new PotionEffect(WizardryPotions.frost, 300, 1)); }));
+		add(Tier.APPRENTICE, Element.ICE, create("freeze_self_2", (w, p) -> p.addPotionEffect(new PotionEffect(WizardryPotions.frost, 300, 1))));
 
 		add(Tier.APPRENTICE, Element.ICE, create("ice_spikes", (w, p) -> {
 			if(!w.isRemote){
@@ -342,7 +342,7 @@ public abstract class Forfeit {
 
 		add(Tier.ADVANCED, Element.LIGHTNING, create("lightning", (w, p) -> w.addWeatherEffect(new EntityLightningBolt(w, p.posX, p.posY, p.posZ, false))));
 
-		add(Tier.ADVANCED, Element.LIGHTNING, create("paralyse_self", (w, p) -> { if(!w.isRemote) p.addPotionEffect(new PotionEffect(WizardryPotions.paralysis, 200)); }));
+		add(Tier.ADVANCED, Element.LIGHTNING, create("paralyse_self", (w, p) -> p.addPotionEffect(new PotionEffect(WizardryPotions.paralysis, 200))));
 
 		add(Tier.ADVANCED, Element.LIGHTNING, create("lightning_wraiths", (w, p) -> {
 			if(!w.isRemote){
@@ -367,7 +367,7 @@ public abstract class Forfeit {
 			}
 		}));
 
-		add(Tier.NOVICE, Element.NECROMANCY, create("nausea", (w, p) -> { if(!w.isRemote) p.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 400)); }));
+		add(Tier.NOVICE, Element.NECROMANCY, create("nausea", (w, p) -> p.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 400))));
 
 		add(Tier.APPRENTICE, Element.NECROMANCY, create("zombie_horde", (w, p) -> {
 			if(!w.isRemote){
@@ -381,7 +381,7 @@ public abstract class Forfeit {
 			}
 		}));
 
-		add(Tier.ADVANCED, Element.NECROMANCY, create("wither_self", (w, p) -> { if(!w.isRemote) p.addPotionEffect(new PotionEffect(MobEffects.WITHER, 400)); }));
+		add(Tier.ADVANCED, Element.NECROMANCY, create("wither_self", (w, p) -> p.addPotionEffect(new PotionEffect(MobEffects.WITHER, 400))));
 
 		add(Tier.MASTER, Element.NECROMANCY, create("cripple_self", (w, p) -> p.attackEntityFrom(DamageSource.MAGIC, p.getHealth() - 1)));
 
@@ -422,7 +422,7 @@ public abstract class Forfeit {
 			}
 		}));
 
-		add(Tier.APPRENTICE, Element.EARTH, create("poison_self", (w, p) -> { if(!w.isRemote) p.addPotionEffect(new PotionEffect(MobEffects.POISON, 400, 1)); }));
+		add(Tier.APPRENTICE, Element.EARTH, create("poison_self", (w, p) -> p.addPotionEffect(new PotionEffect(MobEffects.POISON, 400, 1))));
 
 		add(Tier.ADVANCED, Element.EARTH, create("flood", (w, p) -> {
 			if(!w.isRemote && EntityUtils.canDamageBlocks(p, w)){
@@ -457,7 +457,7 @@ public abstract class Forfeit {
 
 		add(Tier.APPRENTICE, Element.SORCERY, create("teleport_self", (w, p) -> ((Banish)Spells.banish).teleport(p, w, 8 + w.rand.nextDouble() * 8)));
 
-		add(Tier.ADVANCED, Element.SORCERY, create("levitate_self", (w, p) -> { if(!w.isRemote) p.addPotionEffect(new PotionEffect(MobEffects.LEVITATION, 200)); }));
+		add(Tier.ADVANCED, Element.SORCERY, create("levitate_self", (w, p) -> p.addPotionEffect(new PotionEffect(MobEffects.LEVITATION, 200))));
 
 		add(Tier.ADVANCED, Element.SORCERY, create("vex_horde", (w, p) -> {
 			if(!w.isRemote){
@@ -486,8 +486,6 @@ public abstract class Forfeit {
 			}
 		}));
 
-		add(Tier.MASTER, Element.SORCERY, create("teleport_self_large_distance", (w, p) -> ((Banish)Spells.banish).teleport(p, w, 8 + w.rand.nextDouble() * 700)));
-
 		add(Tier.NOVICE, Element.HEALING, create("damage_self", (w, p) -> p.attackEntityFrom(DamageSource.MAGIC, 4)));
 
 		add(Tier.NOVICE, Element.HEALING, create("spill_armour", (w, p) -> {
@@ -500,16 +498,16 @@ public abstract class Forfeit {
 			}
 		}));
 
-		add(Tier.APPRENTICE, Element.HEALING, create("hunger", (w, p) -> { if(!w.isRemote) p.addPotionEffect(new PotionEffect(MobEffects.HUNGER, 400, 4)); }));
+		add(Tier.APPRENTICE, Element.HEALING, create("hunger", (w, p) -> p.addPotionEffect(new PotionEffect(MobEffects.HUNGER, 400, 4))));
 
-		add(Tier.APPRENTICE, Element.HEALING, create("blind_self", (w, p) -> { if(!w.isRemote) p.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, 200)); }));
+		add(Tier.APPRENTICE, Element.HEALING, create("blind_self", (w, p) -> p.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, 200))));
 
-		add(Tier.ADVANCED, Element.HEALING, create("weaken_self", (w, p) -> { if(!w.isRemote) p.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, 600, 3)); }));
+		add(Tier.ADVANCED, Element.HEALING, create("weaken_self", (w, p) -> p.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, 600, 3))));
 
-		add(Tier.ADVANCED, Element.HEALING, create("jam_self", (w, p) -> { if(!w.isRemote) p.addPotionEffect(new PotionEffect(WizardryPotions.arcane_jammer, 300)); }));
+		add(Tier.ADVANCED, Element.HEALING, create("jam_self", (w, p) -> p.addPotionEffect(new PotionEffect(WizardryPotions.arcane_jammer, 300))));
 
-		add(Tier.MASTER, Element.HEALING, create("curse_self", (w, p) -> { if(!w.isRemote) p.addPotionEffect(new PotionEffect(WizardryPotions.curse_of_undeath, Integer.MAX_VALUE)); }));
+		add(Tier.MASTER, Element.HEALING, create("curse_self", (w, p) -> p.addPotionEffect(new PotionEffect(WizardryPotions.curse_of_undeath, Integer.MAX_VALUE))));
 
 	}
 
-}
+}

src/main/java/electroblob/wizardry/packet/PacketBombExplosion.java

@@ -1,79 +0,0 @@
-package electroblob.wizardry.packet;
-
-import electroblob.wizardry.Wizardry;
-import io.netty.buffer.ByteBuf;
-import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
-import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
-
-/**
- * <b>[Server -> Client]</b> This packet is sent when a bomb entity impacts something. It is used to guarantee that the
- * client always sees the explosion effect, even in singleplayer where the server may remove the entity before the
- * client's own simulation can call {@code onImpact()}.
- */
-public class PacketBombExplosion implements IMessageHandler<PacketBombExplosion.Message, IMessage> {
-
-	/** Bomb type constants, matching the order bombs are handled in {@link electroblob.wizardry.CommonProxy}. */
-	public static final int FIREBOMB    = 0;
-	public static final int POISON_BOMB = 1;
-	public static final int SMOKE_BOMB  = 2;
-	public static final int SPARK_BOMB  = 3;
-
-	@Override
-	public IMessage onMessage(Message message, MessageContext ctx){
-		if(ctx.side.isClient()){
-			net.minecraft.client.Minecraft.getMinecraft().addScheduledTask(
-					() -> Wizardry.proxy.handleBombExplosionPacket(message));
-		}
-		return null;
-	}
-
-	public static class Message implements IMessage {
-
-		/** One of the bomb type constants defined in {@link PacketBombExplosion}. */
-		public int bombType;
-		public double x, y, z;
-		public float blastMultiplier;
-		/** Entity IDs of secondary targets struck by the spark bomb chain. Empty for other bomb types. */
-		public int[] secondaryTargetIDs;
-
-		// Required no-arg constructor
-		public Message(){}
-
-		public Message(int bombType, double x, double y, double z, float blastMultiplier){
-			this(bombType, x, y, z, blastMultiplier, new int[0]);
-		}
-
-		public Message(int bombType, double x, double y, double z, float blastMultiplier, int[] secondaryTargetIDs){
-			this.bombType = bombType;
-			this.x = x;
-			this.y = y;
-			this.z = z;
-			this.blastMultiplier = blastMultiplier;
-			this.secondaryTargetIDs = secondaryTargetIDs;
-		}
-
-		@Override
-		public void fromBytes(ByteBuf buf){
-			bombType = buf.readInt();
-			x = buf.readDouble();
-			y = buf.readDouble();
-			z = buf.readDouble();
-			blastMultiplier = buf.readFloat();
-			int count = buf.readInt();
-			secondaryTargetIDs = new int[count];
-			for(int i = 0; i < count; i++) secondaryTargetIDs[i] = buf.readInt();
-		}
-
-		@Override
-		public void toBytes(ByteBuf buf){
-			buf.writeInt(bombType);
-			buf.writeDouble(x);
-			buf.writeDouble(y);
-			buf.writeDouble(z);
-			buf.writeFloat(blastMultiplier);
-			buf.writeInt(secondaryTargetIDs.length);
-			for(int id : secondaryTargetIDs) buf.writeInt(id);
-		}
-	}
-}

src/main/java/electroblob/wizardry/packet/PacketControlInput.java

@@ -51,17 +51,6 @@ public class PacketControlInput implements IMessageHandler<Message, IMessage> {
 
 					break;
 
-				case CLEAR_BUTTON:
-
-					if(!(player.openContainer instanceof ContainerArcaneWorkbench)){
-						Wizardry.logger.warn("Received a PacketControlInput, but the player that sent it was not " +
-								"currently using an arcane workbench. This should not happen!");
-					}else{
-						((ContainerArcaneWorkbench)player.openContainer).onClearButtonPressed(player);
-					}
-
-					break;
-
 				case NEXT_SPELL_KEY:
 
 					if(wand.getItem() instanceof ISpellCastingItem){
@@ -144,7 +133,7 @@ public class PacketControlInput implements IMessageHandler<Message, IMessage> {
 	}
 
 	public enum ControlType {
-		APPLY_BUTTON, NEXT_SPELL_KEY, PREVIOUS_SPELL_KEY, RESURRECT_BUTTON, CANCEL_RESURRECT, POSSESSION_PROJECTILE, CLEAR_BUTTON
+		APPLY_BUTTON, NEXT_SPELL_KEY, PREVIOUS_SPELL_KEY, RESURRECT_BUTTON, CANCEL_RESURRECT, POSSESSION_PROJECTILE
 	}
 
 	public static class Message implements IMessage {

src/main/java/electroblob/wizardry/packet/PacketPlayerSync.java

@@ -10,11 +10,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 
 /**
  * <b>[Server -> Client]</b> This packet is sent to synchronise any fields that need synchronising in
@@ -58,8 +54,9 @@ public class PacketPlayerSync implements IMessageHandler<Message, IMessage> {
 
 			this.seed = buf.readLong();
 			this.selectedMinionID = buf.readInt();
+
 			this.spellData = new HashMap<>();
-			WizardData.getSyncedVariablesOrderedByKey().forEach(v -> spellData.put(v, v.read(buf)));
+			WizardData.getSyncedVariables().forEach(v -> spellData.put(v, v.read(buf)));
 			// Have to send empty tags to guarantee correct ByteBuf size/order, but no point keeping the resulting nulls
 			spellData.values().removeIf(Objects::isNull);
 
@@ -76,7 +73,7 @@ public class PacketPlayerSync implements IMessageHandler<Message, IMessage> {
 			buf.writeLong(seed);
 			buf.writeInt(selectedMinionID);
 
-			WizardData.getSyncedVariablesOrderedByKey().forEach(v -> v.write(buf, spellData.get(v)));
+			WizardData.getSyncedVariables().forEach(v -> v.write(buf, spellData.get(v)));
 
 			if(this.spellsDiscovered == null) return;
 			for(Spell spell : this.spellsDiscovered){

src/main/java/electroblob/wizardry/packet/PacketSyncArcaneLock.java

@@ -1,57 +0,0 @@
-package electroblob.wizardry.packet;
-
-import electroblob.wizardry.Wizardry;
-import io.netty.buffer.ByteBuf;
-import net.minecraft.util.math.BlockPos;
-import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
-import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
-
-import javax.annotation.Nullable;
-import java.util.UUID;
-
-/**
- * <b>[Server -> Client]</b> This packet is sent when a container is locked or unlocked by Arcane Lock to update clients.
- */
-public class PacketSyncArcaneLock implements IMessageHandler<PacketSyncArcaneLock.Message, IMessage> {
-
-	@Override
-	public IMessage onMessage(Message message, MessageContext ctx){
-
-		if(ctx.side.isClient()){
-			net.minecraft.client.Minecraft.getMinecraft().addScheduledTask(() -> Wizardry.proxy.handleArcaneLockSyncPacket(message));
-		}
-
-		return null;
-	}
-
-	public static class Message implements IMessage {
-
-		public BlockPos pos;
-		public boolean locked;
-		public UUID owner;
-
-		public Message(){}
-
-		public Message(BlockPos pos, boolean locked, @Nullable UUID owner){
-			this.pos = pos;
-			this.locked = locked;
-			this.owner = owner != null ? owner : new UUID(0, 0);
-		}
-
-		@Override
-		public void fromBytes(ByteBuf buf){
-			this.pos = BlockPos.fromLong(buf.readLong());
-			this.locked = buf.readBoolean();
-			this.owner = new UUID(buf.readLong(), buf.readLong());
-		}
-
-		@Override
-		public void toBytes(ByteBuf buf){
-			buf.writeLong(pos.toLong());
-			buf.writeBoolean(locked);
-			buf.writeLong(owner.getMostSignificantBits());
-			buf.writeLong(owner.getLeastSignificantBits());
-		}
-	}
-}

src/main/java/electroblob/wizardry/packet/WizardryPacketHandler.java

@@ -35,8 +35,6 @@ public class WizardryPacketHandler {
 		registerMessage(PacketSpellQuickAccess.class, 		PacketSpellQuickAccess.Message.class);
 		registerMessage(PacketRequestDonationPerks.class, 	PacketRequestDonationPerks.Message.class);
 		registerMessage(PacketSyncDonationPerks.class, 		PacketSyncDonationPerks.Message.class);
-		registerMessage(PacketBombExplosion.class, 			PacketBombExplosion.Message.class);
-		registerMessage(PacketSyncArcaneLock.class, 		PacketSyncArcaneLock.Message.class);
 	}
 
 	private static int nextPacketId = 0;

src/main/java/electroblob/wizardry/potion/CurseUndeath.java

@@ -1,7 +1,6 @@
 package electroblob.wizardry.potion;
 
 import electroblob.wizardry.Wizardry;
-import electroblob.wizardry.item.ItemWizardArmour;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
@@ -46,12 +45,8 @@ public class CurseUndeath extends Curse {
 						} else {
 							itemstack.setItemDamage(itemstack.getItemDamage() + entitylivingbase.world.rand.nextInt(2));
 							if (itemstack.getItemDamage() >= itemstack.getMaxDamage()) {
-								if (itemstack.getItem() instanceof ItemWizardArmour) {
-									entitylivingbase.setFire(8);
-								} else {
-									entitylivingbase.renderBrokenItemStack(itemstack);
-									entitylivingbase.setItemStackToSlot(EntityEquipmentSlot.HEAD, ItemStack.EMPTY);
-								}
+								entitylivingbase.renderBrokenItemStack(itemstack);
+								entitylivingbase.setItemStackToSlot(EntityEquipmentSlot.HEAD, ItemStack.EMPTY);
 							}
 						}
 					}

src/main/java/electroblob/wizardry/potion/PotionDiamondflesh.java

@@ -13,15 +13,12 @@ public class PotionDiamondflesh extends PotionMagicEffect {
 		super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/diamondflesh.png"));
 		// This needs to be here because registerPotionAttributeModifier doesn't like it if the potion has no name yet.
 		this.setPotionName("potion." + Wizardry.MODID + ":ironflesh");
-		// Only apply slowness if the setting allows it
-		if(Wizardry.settings.fleshSpellsCauseSlowness) {
-			this.registerPotionAttributeModifier(SharedMonsterAttributes.MOVEMENT_SPEED,
-					"158a8af2-6db0-4340-a01c-a7b60d10ddf4", -0.1f, EntityUtils.Operations.MULTIPLY_CUMULATIVE);
-		}
+		this.registerPotionAttributeModifier(SharedMonsterAttributes.MOVEMENT_SPEED,
+				"158a8af2-6db0-4340-a01c-a7b60d10ddf4", -0.1f, EntityUtils.Operations.MULTIPLY_CUMULATIVE);
 		this.registerPotionAttributeModifier(SharedMonsterAttributes.ARMOR_TOUGHNESS,
-				"a68d4532-5847-426c-9b03-d541b113cec2", (float)Wizardry.settings.diamondFleshArmorToughnessBonus, EntityUtils.Operations.ADD);
+				"a68d4532-5847-426c-9b03-d541b113cec2", 3.0f, EntityUtils.Operations.ADD);
 		this.registerPotionAttributeModifier(SharedMonsterAttributes.ARMOR,
-				"46a095be-82dd-43fd-8b67-13f51591eb8e", (float)Wizardry.settings.diamondFleshArmorBonus, EntityUtils.Operations.ADD);
+				"46a095be-82dd-43fd-8b67-13f51591eb8e", 4.0f, EntityUtils.Operations.ADD);
 	}
 
 	@Override

src/main/java/electroblob/wizardry/potion/PotionFireskin.java

@@ -1,97 +0,0 @@
-package electroblob.wizardry.potion;
-
-import electroblob.wizardry.registry.WizardrySounds;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-public class PotionFireskin extends PotionMagicEffectParticles {
-
-	public PotionFireskin(boolean isBadEffect, int liquidColour, ResourceLocation texture) {
-		super(isBadEffect, liquidColour, texture);
-		this.setBeneficial();
-	}
-
-	@Override
-	public void spawnCustomParticle(World world, double x, double y, double z){
-		if(world.isRemote){
-			// Spawn ambient fire particles around the entity
-			world.spawnParticle(EnumParticleTypes.FLAME, x, y, z, 0, 0, 0);
-		}
-	}
-
-	@Override
-	public boolean isReady(int duration, int amplifier) {
-		return true;
-	}
-
-	@Override
-	public void performEffect(EntityLivingBase entitylivingbase, int strength){
-
-		// Original fireskin behavior: extinguish the entity to prevent fire damage from melee attacks
-		entitylivingbase.extinguish();
-
-		// Server-side cobweb burning logic
-		World world = entitylivingbase.world;
-		if(!world.isRemote){
-
-			AxisAlignedBB entityBox = entitylivingbase.getEntityBoundingBox();
-
-			// Expand the bounding box slightly to catch cobwebs the entity is touching
-			entityBox = entityBox.expand(0.1, 0.1, 0.1);
-
-			BlockPos minPos = new BlockPos(entityBox.minX, entityBox.minY, entityBox.minZ);
-			BlockPos maxPos = new BlockPos(entityBox.maxX, entityBox.maxY, entityBox.maxZ);
-
-			boolean burnedCobweb = false;
-
-			// Check all blocks in the entity's bounding box
-			for(int x = minPos.getX(); x <= maxPos.getX(); x++){
-				for(int y = minPos.getY(); y <= maxPos.getY(); y++){
-					for(int z = minPos.getZ(); z <= maxPos.getZ(); z++){
-
-						BlockPos pos = new BlockPos(x, y, z);
-
-						if(world.getBlockState(pos).getBlock() == Blocks.WEB){
-							// Burn the cobweb
-							world.setBlockToAir(pos);
-							burnedCobweb = true;
-
-							// Add visual effects - spawn particles on client side
-							if(world.rand.nextFloat() < 0.7f){ // 70% chance to spawn particles for better visibility
-								float offsetX = world.rand.nextFloat() * 0.1f - 0.05f;
-								float offsetY = world.rand.nextFloat() * 0.1f + 0.05f;
-								float offsetZ = world.rand.nextFloat() * 0.1f - 0.05f;
-
-								// Main flame particle rising up
-								world.spawnParticle(EnumParticleTypes.FLAME,
-									pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5,
-									0, 0.1, 0);
-
-								// Two additional flame particles with random movement
-								world.spawnParticle(EnumParticleTypes.FLAME,
-									pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5,
-									offsetX, offsetY, offsetZ);
-
-								world.spawnParticle(EnumParticleTypes.FLAME,
-									pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5,
-									offsetX * -0.5f, offsetY * 0.8f, offsetZ * -0.5f);
-							}
-						}
-					}
-				}
-			}
-
-			// Play the fire extinguish sound only when cobwebs were actually burned
-			if(burnedCobweb){
-				world.playSound(null, entitylivingbase.getPosition(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.6f, 0.8f + world.rand.nextFloat() * 0.4f);
-			}
-		}
-	}
-}