diff --git a/gradle/.gradle/2.1/taskArtifacts/cache.properties b/gradle/.gradle/2.1/taskArtifacts/cache.properties new file mode 100644 index 00000000..18d2fcb2 --- /dev/null +++ b/gradle/.gradle/2.1/taskArtifacts/cache.properties @@ -0,0 +1 @@ +#Sat Jan 03 10:20:50 EST 2015 diff --git a/gradle/.gradle/2.1/taskArtifacts/cache.properties.lock b/gradle/.gradle/2.1/taskArtifacts/cache.properties.lock new file mode 100644 index 00000000..29e44d00 Binary files /dev/null and b/gradle/.gradle/2.1/taskArtifacts/cache.properties.lock differ diff --git a/gradle/.gradle/2.1/taskArtifacts/fileHashes.bin b/gradle/.gradle/2.1/taskArtifacts/fileHashes.bin new file mode 100644 index 00000000..a2a5c9e7 Binary files /dev/null and b/gradle/.gradle/2.1/taskArtifacts/fileHashes.bin differ diff --git a/gradle/.gradle/2.1/taskArtifacts/fileSnapshots.bin b/gradle/.gradle/2.1/taskArtifacts/fileSnapshots.bin new file mode 100644 index 00000000..67532665 Binary files /dev/null and b/gradle/.gradle/2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/gradle/.gradle/2.1/taskArtifacts/outputFileStates.bin b/gradle/.gradle/2.1/taskArtifacts/outputFileStates.bin new file mode 100644 index 00000000..4409058c Binary files /dev/null and b/gradle/.gradle/2.1/taskArtifacts/outputFileStates.bin differ diff --git a/gradle/.gradle/2.1/taskArtifacts/taskArtifacts.bin b/gradle/.gradle/2.1/taskArtifacts/taskArtifacts.bin new file mode 100644 index 00000000..4917db12 Binary files /dev/null and b/gradle/.gradle/2.1/taskArtifacts/taskArtifacts.bin differ diff --git a/gradle/gradle/wrapper/gradle-wrapper.jar b/gradle/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..3d0dee6e Binary files /dev/null and b/gradle/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/gradle/wrapper/gradle-wrapper.properties b/gradle/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..1cfebde6 --- /dev/null +++ b/gradle/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Jan 03 10:20:50 EST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip diff --git a/gradle/gradlew b/gradle/gradlew new file mode 100644 index 00000000..91a7e269 --- /dev/null +++ b/gradle/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +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 +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +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" + else + 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" + 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" = "false" -a "$darwin" = "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 + 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 + +# 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 + +# 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"` + + # 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 + + 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 + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradle/gradlew.bat b/gradle/gradlew.bat new file mode 100644 index 00000000..8a0b282a --- /dev/null +++ b/gradle/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@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= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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 init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_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=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +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 %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index c231435b..5357fbf5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -1688,7 +1688,7 @@ public class AlchemicalWizardry // continue; // } // -// strLine = strLine.replace('”', '"').replace('“','"').replace("…", "...").replace('’', '\'').replace('–', '-'); +// strLine = strLine.replace('”', '"').replace('“','"').replace("Â…", "...").replace('Â’', '\'').replace('–', '-'); // // if(Minecraft.getMinecraft() != null && Minecraft.getMinecraft().fontRenderer != null) // { diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/Vector3.java b/src/main/java/WayofTime/alchemicalWizardry/api/Vector3.java new file mode 100644 index 00000000..338b2b7f --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/api/Vector3.java @@ -0,0 +1,45 @@ +package WayofTime.alchemicalWizardry.api; + +/* + * Created in Scala by Alex-Hawks + * Translated and implemented by Arcaratus + */ +public class Vector3 +{ + public int x, y, z; + + public Vector3(int x, int y, int z) + { + this.x = x; + this.y = y; + this.z = z; + } + + public Vector3 add(Vector3 vec1) + { + return new Vector3(this.x + vec1.x, this.y + vec1.y, this.z + vec1.z); + } + + @Override + public String toString() + { + return "V3(" + x + "}, " + y + "}," + z + "})"; + } + + private boolean canEqual(Object object) + { + return object instanceof Vector3; + } + + @Override + public boolean equals(Object object) + { + return object == this ? true : (object instanceof Vector3 ? canEqual(this) && this.x == ((Vector3) object).x && this.y == ((Vector3) object).y && this.z == ((Vector3) object).z : false); + } + + @Override + public int hashCode() + { + return 48131 * x - 95021 * y + z; + } +} diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java index 5b21ce24..ead88598 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java @@ -1,5 +1,6 @@ package WayofTime.alchemicalWizardry.client; +import WayofTime.alchemicalWizardry.client.renderer.RitualDivinerRender; import net.minecraft.item.ItemBlock; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; @@ -146,6 +147,7 @@ public class ClientProxy extends CommonProxy RenderingRegistry.registerEntityRenderingHandler(EntityMinorDemonGruntGuardianEarth.class, new RenderMinorDemonGruntGuardian(new ModelMinorDemonGruntGuardian(), 0.5F)); RenderingRegistry.registerEntityRenderingHandler(EntityMinorDemonGruntGuardianWind.class, new RenderMinorDemonGruntGuardian(new ModelMinorDemonGruntGuardian(), 0.5F)); + MinecraftForge.EVENT_BUS.register(new RitualDivinerRender()); ClientRegistry.bindTileEntitySpecialRenderer(TEAltar.class, new TEAltarRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TEPedestal.class, new RenderPedestal()); diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java index 7ef876aa..21f2fba8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java @@ -20,8 +20,7 @@ public class NEIBindingRitualHandler extends TemplateRecipeHandler { public class CachedBindingRecipe extends CachedRecipe { - PositionedStack input; - PositionedStack output; + PositionedStack input, output; public CachedBindingRecipe(BindingRecipe recipe) { @@ -45,7 +44,7 @@ public class NEIBindingRitualHandler extends TemplateRecipeHandler @Override public void loadCraftingRecipes(String outputId, Object... results) { - if (outputId.equals("alchemicalwizardry.binding") && getClass() == NEIBindingRitualHandler.class) + if (outputId.equals("alchemicalwizardry.bindingritual") && getClass() == NEIBindingRitualHandler.class) { for (BindingRecipe recipe : BindingRegistry.bindingRecipes) { @@ -94,13 +93,13 @@ public class NEIBindingRitualHandler extends TemplateRecipeHandler @Override public String getOverlayIdentifier() { - return "bindingritual"; + return "alchemicalwizardry.bindingritual"; } @Override public void loadTransferRects() { - transferRects.add(new RecipeTransferRect(new Rectangle(90, 32, 22, 16), "alchemicalwizardry.bindingritual")); + transferRects.add(new RecipeTransferRect(new Rectangle(68, 20, 22, 16), "alchemicalwizardry.bindingritual")); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/Helper.java b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/Helper.java new file mode 100644 index 00000000..1d3bcada --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/Helper.java @@ -0,0 +1,17 @@ +package WayofTime.alchemicalWizardry.client.renderer; + +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.rituals.Rituals; + +public class Helper +{ + public static RitualEffect getEffectFromString(String name) + { + Rituals ritual = Rituals.ritualMap.get(name); + + if (ritual == null) + return null; + + return ritual.effect; + } +} diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderFakeBlocks.java b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderFakeBlocks.java new file mode 100644 index 00000000..0170b012 --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderFakeBlocks.java @@ -0,0 +1,105 @@ +package WayofTime.alchemicalWizardry.client.renderer; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +/* + * Created in Scala by Alex-Hawks + * Translated and implemented by Arcaratus + */ +public class RenderFakeBlocks +{ + public static void drawFakeBlock(WayofTime.alchemicalWizardry.api.Vector3 vector3, Block block, int meta, double minX, double minY, double minZ, World world) + { + double maxX = minX + 1; + double maxY = minY + 1; + double maxZ = minZ + 1; + Tessellator tessellator = Tessellator.instance; + + tessellator.startDrawingQuads(); + + float texMinU, texMaxU, texMinV, texMaxV; + + texMinU = getMinU(block, meta, 0); + texMaxU = getMaxU(block, meta, 0); + texMinV = getMinV(block, meta, 0); + texMaxV = getMaxV(block, meta, 0); + tessellator.addVertexWithUV(minX, minY, minZ, texMinU, texMinV); + tessellator.addVertexWithUV(maxX, minY, minZ, texMaxU, texMinV); + tessellator.addVertexWithUV(maxX, minY, maxZ, texMaxU, texMaxV); + tessellator.addVertexWithUV(minX, minY, maxZ, texMinU, texMaxV); + + texMinU = getMinU(block, meta, 1); + texMaxU = getMaxU(block, meta, 1); + texMinV = getMinV(block, meta, 1); + texMaxV = getMaxV(block, meta, 1); + tessellator.addVertexWithUV(minX, maxY, maxZ, texMinU, texMaxV); + tessellator.addVertexWithUV(maxX, maxY, maxZ, texMaxU, texMaxV); + tessellator.addVertexWithUV(maxX, maxY, minZ, texMaxU, texMinV); + tessellator.addVertexWithUV(minX, maxY, minZ, texMinU, texMinV); + + texMinU = getMinU(block, meta, 2); + texMaxU = getMaxU(block, meta, 2); + texMinV = getMinV(block, meta, 2); + texMaxV = getMaxV(block, meta, 2); + tessellator.addVertexWithUV(maxX, minY, minZ, texMinU, texMaxV); + tessellator.addVertexWithUV(minX, minY, minZ, texMaxU, texMaxV); + tessellator.addVertexWithUV(minX, maxY, minZ, texMaxU, texMinV); + tessellator.addVertexWithUV(maxX, maxY, minZ, texMinU, texMinV); + + texMinU = getMinU(block, meta, 3); + texMaxU = getMaxU(block, meta, 3); + texMinV = getMinV(block, meta, 3); + texMaxV = getMaxV(block, meta, 3); + tessellator.addVertexWithUV(minX, minY, maxZ, texMinU, texMaxV); + tessellator.addVertexWithUV(maxX, minY, maxZ, texMaxU, texMaxV); + tessellator.addVertexWithUV(maxX, maxY, maxZ, texMaxU, texMinV); + tessellator.addVertexWithUV(minX, maxY, maxZ, texMinU, texMinV); + + texMinU = getMinU(block, meta, 4); + texMaxU = getMaxU(block, meta, 4); + texMinV = getMinV(block, meta, 4); + texMaxV = getMaxV(block, meta, 4); + tessellator.addVertexWithUV(minX, minY, minZ, texMinU, texMaxV); + tessellator.addVertexWithUV(minX, minY, maxZ, texMaxU, texMaxV); + tessellator.addVertexWithUV(minX, maxY, maxZ, texMaxU, texMinV); + tessellator.addVertexWithUV(minX, maxY, minZ, texMinU, texMinV); + + texMinU = getMinU(block, meta, 5); + texMaxU = getMaxU(block, meta, 5); + texMinV = getMinV(block, meta, 5); + texMaxV = getMaxV(block, meta, 5); + tessellator.addVertexWithUV(maxX, minY, maxZ, texMinU, texMaxV); + tessellator.addVertexWithUV(maxX, minY, minZ, texMaxU, texMaxV); + tessellator.addVertexWithUV(maxX, maxY, minZ, texMaxU, texMinV); + tessellator.addVertexWithUV(maxX, maxY, maxZ, texMinU, texMinV); + + tessellator.draw(); + } + + private static float getMinU(Block block, int meta, int side) + { + IIcon icon = block.getIcon(side, meta); + return icon.getMinU(); + } + + private static float getMaxU(Block block, int meta, int side) + { + IIcon icon = block.getIcon(side, meta); + return icon.getMaxU(); + } + + private static float getMinV(Block block, int meta, int side) + { + IIcon icon = block.getIcon(side, meta); + return icon.getMinV(); + } + + private static float getMaxV(Block block, int meta, int side) + { + IIcon icon = block.getIcon(side, meta); + return icon.getMaxV(); + } +} diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RitualDivinerRender.java b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RitualDivinerRender.java new file mode 100644 index 00000000..8ff39cb6 --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RitualDivinerRender.java @@ -0,0 +1,83 @@ +package WayofTime.alchemicalWizardry.client.renderer; + +import WayofTime.alchemicalWizardry.ModBlocks; +import WayofTime.alchemicalWizardry.api.Vector3; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.rituals.Rituals; +import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import net.minecraftforge.client.event.RenderWorldLastEvent; + +/* + * Created in Scala by Alex-Hawks + * Translated and implemented by Arcaratus + */ +public class RitualDivinerRender +{ + @SubscribeEvent + public void render(RenderWorldLastEvent event) + { + Minecraft minecraft = Minecraft.getMinecraft(); + EntityClientPlayerMP player = minecraft.thePlayer; + World world = player.worldObj; + + if (minecraft.objectMouseOver == null || minecraft.objectMouseOver.typeOfHit != MovingObjectPosition.MovingObjectType.BLOCK) + { + return; + } + + TileEntity tileEntity = world.getTileEntity(minecraft.objectMouseOver.blockX, minecraft.objectMouseOver.blockY, minecraft.objectMouseOver.blockZ); + + if (!(tileEntity instanceof IMasterRitualStone)) + { + return; + } + + Vector3 vec3 = new Vector3(minecraft.objectMouseOver.blockX, minecraft.objectMouseOver.blockY, minecraft.objectMouseOver.blockZ); + double posX = player.lastTickPosX + (player.posX - player.lastTickPosX) * event.partialTicks; + double posY = player.lastTickPosY + (player.posY - player.lastTickPosY) * event.partialTicks; + double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * event.partialTicks; + + if (player.inventory.getCurrentItem() != null && player.inventory.getCurrentItem().getItem() instanceof ItemRitualDiviner) + { + ItemRitualDiviner ritualDiviner = (ItemRitualDiviner) player.inventory.getCurrentItem().getItem(); + int direction = ritualDiviner.getDirection(player.inventory.getCurrentItem()); + RitualEffect ritualEffect = getEffectFromString(ritualDiviner.getCurrentRitual(player.inventory.getCurrentItem())); + + if (ritualEffect == null) + { + return; + } + + for (RitualComponent ritualComponent : ritualEffect.getRitualComponentList()) + { + Vector3 vX = vec3.add(new Vector3(ritualComponent.getX(direction), ritualComponent.getY(), ritualComponent.getZ(direction))); + double minX = vX.x - posX; + double minY = vX.y - posY; + double minZ = vX.z - posZ; + + if (!world.getBlock(vX.x, vX.y, vX.z).isOpaqueCube()) + { + RenderFakeBlocks.drawFakeBlock(vX, ModBlocks.ritualStone, ritualComponent.getStoneType(), minX, minY, minZ, world); + } + } + } + } + + public static RitualEffect getEffectFromString(String name) + { + Rituals ritual = Rituals.ritualMap.get(name); + + if (ritual == null) + return null; + + return ritual.effect; + } +} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementTrigger.java b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementTrigger.java index 8e5ad2c0..e05804aa 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementTrigger.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementTrigger.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.achievements; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; @@ -10,15 +11,18 @@ public class AchievementTrigger @SubscribeEvent public void onItemPickedUp(PlayerEvent.ItemPickupEvent event) { - ItemStack stack = event.pickedUp.getEntityItem(); - - if (stack != null && stack.getItem() instanceof IPickupAchievement) + for (Item item : AchievementsRegistry.pickupList) { - Achievement achievement = ((IPickupAchievement) stack.getItem()).getAchievementOnPickup(stack, event.player, event.pickedUp); + ItemStack stack = event.pickedUp.getEntityItem(); - if (achievement != null) + if (stack != null && stack.getItem() == item) { - event.player.addStat(achievement, 1); + Achievement achievement = AchievementsRegistry.getAchievementForItem(item); + + if (achievement != null) + { + event.player.addStat(achievement, 1); + } } } } @@ -26,13 +30,16 @@ public class AchievementTrigger @SubscribeEvent public void onItemCrafted(PlayerEvent.ItemCraftedEvent event) { - if (event.crafting != null && event.crafting.getItem() instanceof ICraftAchievement) + for (Item item : AchievementsRegistry.craftinglist) { - Achievement achievement = ((ICraftAchievement) event.crafting.getItem()).getAchievementOnCraft(event.crafting, event.player, event.craftMatrix); - - if (achievement != null) + if (event.crafting != null && event.crafting.getItem() == item) { - event.player.addStat(achievement, 1); + Achievement achievement = AchievementsRegistry.getAchievementForItem(event.crafting.getItem()); + + if (achievement != null) + { + event.player.addStat(achievement, 1); + } } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementsRegistry.java b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementsRegistry.java new file mode 100644 index 00000000..5545ab85 --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementsRegistry.java @@ -0,0 +1,43 @@ +package WayofTime.alchemicalWizardry.common.achievements; + +import WayofTime.alchemicalWizardry.ModItems; +import net.minecraft.item.Item; +import net.minecraft.stats.Achievement; + +import java.util.ArrayList; +import java.util.List; + +public class AchievementsRegistry +{ + public final static List craftinglist = new ArrayList(); + public final static List pickupList = new ArrayList(); + + public static void init() + { + addItemsToCraftingList(); + addItemsToPickupList(); + } + + public static void addItemsToCraftingList() + { + craftinglist.add(ModItems.sacrificialDagger); + } + + public static void addItemsToPickupList() + { + pickupList.add(ModItems.weakBloodOrb); + } + + public static Achievement getAchievementForItem(Item item) + { + if (item == ModItems.sacrificialDagger) + { + return ModAchievements.firstPrick; + } + if (item == ModItems.weakBloodOrb) + { + return ModAchievements.weakOrb; + } + return null; + } +} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/achievements/ICraftAchievement.java b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/ICraftAchievement.java index 7e941c8d..47006462 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/achievements/ICraftAchievement.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/ICraftAchievement.java @@ -7,5 +7,5 @@ import net.minecraft.stats.Achievement; public interface ICraftAchievement { - public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix); + Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/achievements/IPickupAchievement.java b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/IPickupAchievement.java index 10b3fda3..3d2a7351 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/achievements/IPickupAchievement.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/IPickupAchievement.java @@ -7,5 +7,5 @@ import net.minecraft.stats.Achievement; public interface IPickupAchievement { - public Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item); + Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/achievements/ModAchievements.java b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/ModAchievements.java index ce164d92..7c00ba4d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/achievements/ModAchievements.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/ModAchievements.java @@ -5,19 +5,23 @@ import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.stats.Achievement; import net.minecraft.util.StatCollector; import net.minecraftforge.common.AchievementPage; +import net.minecraftforge.common.MinecraftForge; public class ModAchievements { public static AchievementPage alchemicalWizardryPage; public static Achievement firstPrick; + public static Achievement weakOrb; public static void init() { - firstPrick = new AchievementsMod(StatCollector.translateToLocal("achievement.firstPrick"), 0, 0, ModItems.sacrificialDagger, firstPrick); + firstPrick = new AchievementsMod(StatCollector.translateToLocal("firstPrick"), 0, 0, ModItems.sacrificialDagger, null); + weakOrb = new AchievementsMod(StatCollector.translateToLocal("weakOrb"), 3, 0, ModItems.weakBloodOrb, firstPrick); alchemicalWizardryPage = new AchievementPage("AlchemicalWizardry", AchievementsMod.achievements.toArray(new Achievement[AchievementsMod.achievements.size()])); AchievementPage.registerAchievementPage(alchemicalWizardryPage); + AchievementsRegistry.init(); FMLCommonHandler.instance().bus().register(new AchievementTrigger()); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockReagentConduit.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockReagentConduit.java index fb5ffeec..16c151f3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockReagentConduit.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockReagentConduit.java @@ -9,6 +9,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockReagentConduit extends BlockContainer @@ -64,4 +65,10 @@ public class BlockReagentConduit extends BlockContainer { return -1; } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) + { + return null; + } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandBind.java b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandBind.java index 42970190..c97515a8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandBind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandBind.java @@ -38,7 +38,7 @@ public class CommandBind extends CommandBase if (targetPlayer == null) { - throw new CommandException("commands.bind.failed.noPlayer", new Object[0]); + throw new CommandException("commands.bind.failed.noPlayer"); } if (item != null && item.getItem() instanceof IBindable) @@ -46,16 +46,16 @@ public class CommandBind extends CommandBase if (EnergyItems.getOwnerName(item).isEmpty()) { EnergyItems.checkAndSetItemOwner(item, targetPlayer); - func_152373_a(iCommandSender, this, "commands.bind.success", new Object[0]); + func_152373_a(iCommandSender, this, "commands.bind.success"); } else { - throw new CommandException("commands.bind.failed.alreadyBound", new Object[0]); + throw new CommandException("commands.bind.failed.alreadyBound"); } } else if (!(item.getItem() instanceof IBindable)) { - throw new CommandException("commands.bind.failed.notBindable", new Object[0]); + throw new CommandException("commands.bind.failed.notBindable"); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandSN.java b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandSN.java index ac89f1bf..72fa59d7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandSN.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandSN.java @@ -1,11 +1,13 @@ package WayofTime.alchemicalWizardry.common.commands; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; import java.util.List; @@ -40,7 +42,7 @@ public class CommandSN extends CommandBase int amount = parseIntBounded(icommandsender, astring[2], Integer.MIN_VALUE, Integer.MAX_VALUE); SoulNetworkHandler.addCurrentEssenceToMaximum(owner, amount, Integer.MAX_VALUE); - func_152373_a(icommandsender, this, "commands.soulnetwork.add.success", new Object[] {amount, owner}); + func_152373_a(icommandsender, this, "commands.soulnetwork.add.success", amount, owner); } else if ("subtract".equalsIgnoreCase(astring[1])) { @@ -50,42 +52,42 @@ public class CommandSN extends CommandBase { int lp = SoulNetworkHandler.getCurrentEssence(owner); SoulNetworkHandler.syphonFromNetwork(owner, lp); - func_152373_a(icommandsender, this, "commands.soulnetwork.subtract.success", new Object[] {SoulNetworkHandler.getCurrentEssence(owner), owner}); + func_152373_a(icommandsender, this, "commands.soulnetwork.subtract.success", SoulNetworkHandler.getCurrentEssence(owner), owner); } else { SoulNetworkHandler.syphonFromNetwork(owner, amount); - func_152373_a(icommandsender, this, "commands.soulnetwork.subtract.success", new Object[] {amount, owner}); + func_152373_a(icommandsender, this, "commands.soulnetwork.subtract.success", amount, owner); } } else if ("fill".equalsIgnoreCase(astring[1])) { int amount = Integer.MAX_VALUE - SoulNetworkHandler.getCurrentEssence(owner); SoulNetworkHandler.addCurrentEssenceToMaximum(owner, amount, Integer.MAX_VALUE); - func_152373_a(icommandsender, this, "commands.soulnetwork.fill.success", new Object[] {owner}); + func_152373_a(icommandsender, this, "commands.soulnetwork.fill.success", owner); } else if ("empty".equalsIgnoreCase(astring[1])) { SoulNetworkHandler.syphonFromNetwork(owner, SoulNetworkHandler.getCurrentEssence(owner)); - func_152373_a(icommandsender, this, "commands.soulnetwork.empty.success", new Object[] {owner}); + func_152373_a(icommandsender, this, "commands.soulnetwork.empty.success", owner); } else if ("get".equalsIgnoreCase(astring[1])) { int amount = SoulNetworkHandler.getCurrentEssence(owner); - func_152373_a(icommandsender, this, "commands.soulnetwork.get.success", new Object[] {amount, owner}); + func_152373_a(icommandsender, this, "commands.soulnetwork.get.success", amount, owner); } else { - throw new CommandException("commands.soulnetwork.notACommand", new Object[0]); + throw new CommandException("commands.soulnetwork.notACommand"); } } else if (astring.length == 0) { - throw new CommandException("commands.soulnetwork.noPlayer", new Object[0]); + throw new CommandException("commands.soulnetwork.noPlayer"); } else if (astring.length == 1) { - throw new CommandException("commands.soulnetwork.noCommand", new Object[0]); + throw new CommandException("commands.soulnetwork.noCommand"); } } @@ -97,7 +99,7 @@ public class CommandSN extends CommandBase } else if (astring.length == 2) { - return getListOfStringsMatchingLastWord(astring, new String[] {"add", "subtract", "fill", "empty"}); + return getListOfStringsMatchingLastWord(astring, "add", "subtract", "fill", "empty"); } return null; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandUnbind.java b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandUnbind.java index 26a2cd71..3a1cc09a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandUnbind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandUnbind.java @@ -36,17 +36,17 @@ public class CommandUnbind extends CommandBase { if (!EnergyItems.getOwnerName(item).isEmpty()) { - item.getTagCompound().setString("ownerName", ""); - func_152373_a(iCommandSender, this, "commands.unbind.success", new Object[0]); + item.getTagCompound().removeTag("ownerName"); + func_152373_a(iCommandSender, this, "commands.unbind.success"); } else { - throw new CommandException("commands.unbind.failed.notBindable", new Object[0]); + throw new CommandException("commands.unbind.failed.notBindable"); } } else if (!(item.getItem() instanceof IBindable)) { - throw new CommandException("commands.unbind.failed.notBindable", new Object[0]); + throw new CommandException("commands.unbind.failed.notBindable"); } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java index 9d074747..073eeeb0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java @@ -127,13 +127,16 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner } } - par3List.add(StatCollector.translateToLocal("tooltip.ritualdiviner.blankstones") + " " + blankStones); + int totalStones = blankStones + airStones + waterStones + fireStones + earthStones + duskStones + dawnStones; + + par3List.add(EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.ritualdiviner.blankstones") + " " + blankStones); par3List.add(EnumChatFormatting.AQUA + StatCollector.translateToLocal("tooltip.ritualdiviner.airstones") + " " + airStones); par3List.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("tooltip.ritualdiviner.waterstones") + " " + waterStones); par3List.add(EnumChatFormatting.RED + StatCollector.translateToLocal("tooltip.ritualdiviner.firestones") + " " + fireStones); par3List.add(EnumChatFormatting.DARK_GREEN + StatCollector.translateToLocal("tooltip.ritualdiviner.earthstones") + " " + earthStones); - par3List.add(EnumChatFormatting.BOLD + StatCollector.translateToLocal("tooltip.ritualdiviner.duskstones") + " " + duskStones); + par3List.add(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tooltip.ritualdiviner.duskstones") + " " + duskStones); par3List.add(EnumChatFormatting.GOLD + StatCollector.translateToLocal("tooltip.ritualdiviner.dawnstones") + " " + dawnStones); + par3List.add(EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal("tooltip.ritualdiviner.totalStones") + " " + totalStones); } }else { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java index 9240e032..9871a4ac 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java @@ -257,11 +257,6 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade { verticalOffset--; } - - if (world.isRemote) - { - verticalOffset--; - } int posX = (int) Math.round(player.posX - 0.5f); int posY = (int) player.posY; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java index 0887e900..7704bcda 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java @@ -56,7 +56,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:SigilOfTheFastMiner"); + this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:MiningSigil_deactivated"); this.activeIcon = iconRegister.registerIcon("AlchemicalWizardry:MiningSigil_activated"); this.passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:MiningSigil_deactivated"); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java index b614c2cf..0a703f49 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java @@ -349,7 +349,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I return 0; } - if (resource.fluidID != (new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 1)).fluidID) + if (resource.getFluidID() != (new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 1)).getFluidID()) { return 0; } @@ -914,7 +914,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I sortList[1] = 0; } else { - sortList[0] = this.fluid.fluidID; + sortList[0] = this.fluid.getFluidID(); sortList[1] = this.fluid.amount; } @@ -924,7 +924,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I sortList[3] = 0; } else { - sortList[2] = this.fluidInput.fluidID; + sortList[2] = this.fluidInput.getFluidID(); sortList[3] = this.fluidInput.amount; } @@ -934,7 +934,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I sortList[5] = 0; } else { - sortList[4] = this.fluidOutput.fluidID; + sortList[4] = this.fluidOutput.getFluidID(); sortList[5] = this.fluidOutput.amount; } diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index f2fd124b..f566f175 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -62,6 +62,11 @@ tile.demonChest.name=Demon's Chest tile.enchantmentGlyph.enchantability.name=Glyph of the Adept Enchanter tile.enchantmentGlyph.enchantmentLevel.name=Glyph of Arcane Potential tile.stabilityGlyph.stability1.name=Glyph of Rigid Stability +tile.schematicSaver.name=Schematic Saver +tile.blockMimic.name=Mimic Block +tile.blockSpectralContainer.name=Spectral Container +tile.blockBloodLightSource.name=Blood Light +tile.spectralBlock.name=Spectral Block #Item Localization item.weakBloodOrb.name=Weak Blood Orb @@ -373,6 +378,7 @@ tooltip.ritualdiviner.moreinfo=Press shift for extended information tooltip.ritualdiviner.ritualtunedto=Ritual tuned to face: tooltip.ritualdiviner.waterstones=Water Stones: tooltip.ritualdiviner.dawnstones=Dawn Stones: +tooltip.ritualdiviner.totalStones=Total Stones: tooltip.sacrificialdagger.desc1=A slight draining feeling tickles your fingers tooltip.sacrificialdagger.desc2=Just a prick of the tooltip.sacrificialdagger.desc3=finger will suffice... @@ -445,5 +451,7 @@ message.tanksegmenter.tankssetto=tank(s) set to: message.routerfocus.limit=Focus' Item Limit set to: #Achievements -achievement.alchemicalwizardy:achievement.firstPrick=Your first prick! -achievement.alchemicalwizardy:achievement.firstPrick.desc=The first drop of life in the Altar... +achievement.alchemicalwizardry:firstPrick=Your First Prick! +achievement.alchemicalwizardry:firstPrick.desc=The first drop of life into the Altar... +achievement.alchemicalwizardry:weakOrb=Faintly Glowing Red... +achievement.alchemicalwizardry:weakOrb.desc=This orb will suffice...for now... diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/guide.png b/src/main/resources/assets/alchemicalwizardry/textures/items/guide.png new file mode 100644 index 00000000..75a93c14 Binary files /dev/null and b/src/main/resources/assets/alchemicalwizardry/textures/items/guide.png differ diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/ritual_dismantler.png b/src/main/resources/assets/alchemicalwizardry/textures/items/ritual_dismantler.png new file mode 100644 index 00000000..2f68300f Binary files /dev/null and b/src/main/resources/assets/alchemicalwizardry/textures/items/ritual_dismantler.png differ