diff --git a/README.md b/README.md index 572dbf9d..41160005 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,6 @@ -[![Build Status](https://travis-ci.org/GTNewHorizons/TinkersConstruct.svg?branch=1.7.10)](https://travis-ci.org/GTNewHorizons/TinkersConstruct) +#[Tinkers' Construct - GTNH](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2218638-tinkers-construct) -#TINKERS' CONSTRUCT IS UNDERGOING A REWRITE -The current 1.7.10 version of Tinkers' Construct is the final one for this iteration. Only major bugs will be fixed. -The rework is aimed at 1.8 and has no time-plan. It'll be ready when it's done. - -#[Tinkers' Construct](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2218638-tinkers-construct) +Forked version of Tinker's Construct being maintained for 1.7.10 for use in the GTNH modpack. Modify all the things, then do it again! Melt down any metals you find. @@ -16,13 +12,13 @@ Install Forge as usual, and setup your IDE as with any other Forge project. Forg ## IMC All IMC support and examples can be found here: https://gist.github.com/bonii-xx/e46f9d9e81e29d796b1b -##Compile from Source +## Compile from Source Note: Git MUST be installed and in the system path to use our scripts. * Setup: Run [gradle]in the repository root: `gradlew[.bat] [setupDevWorkspace|setupDecompWorkspace] [eclipse|idea]` * Build: Run [gradle]in the repository root: `gradlew[.bat] build' * If obscure Gradle issues are found try running 'gradlew clean' and 'gradlew cleanCache' -##Issue reporting +## Issue reporting Please include the following: * Minecraft version @@ -34,7 +30,7 @@ Please include the following: * Steps to reproduce * ForgeModLoader-client-0.log (the FML log) from the root folder of the client -##Licenses +## Licenses Most code is public domain under [Creative Commons 0](http://creativecommons.org/publicdomain/zero/1.0/). The rework will be licensed under the [MIT License](https://tldrlegal.com/license/mit-license) Textures and binaries are licensed under [Creative Commons 3](http://creativecommons.org/licenses/by/3.0/). @@ -44,6 +40,3 @@ Any modpack which uses Tinkers' Construct takes **full** responsibility for user If you have queries about any license or the above support restrictions, please drop by our IRC channel, #TinkersConstruct on irc.esper.net Any alternate licenses are noted where appropriate. - -##Jar Signing -Some jars from our build servers may be signed. Under no circumstances does anyone have permission to verify the signatures on those jars from other mods. The signing is for informational purposes only. diff --git a/build.gradle b/build.gradle index b32afe4f..4a33b0b6 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,6 @@ configurations { deployerJars } - dependencies { compile "mantle:Mantle:${config.minecraft_version}-${config.mantle_version}:deobf" compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev" @@ -115,6 +114,10 @@ sourceSets { } } } +sourceSets { + main { output.resourcesDir = output.classesDir } +} + processResources { inputs.property "version", artifact_version diff --git a/build.properties b/build.properties index 03fb6f85..7876801e 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ minecraft_version=1.7.10 -forge_version=10.13.3.1399-1.7.10 +forge_version=10.13.4.1614-1.7.10 mantle_version=0.3.2.jenkins187 CCLIB_version=1.1.3.136 NEI_version=1.0.4.106 ccc_version=1.0.6.43 -mod_version=1.8.9.14-GTNH +mod_version=1.8.9.15-GTNH waila_version=1.5.3_1.7.10 fmp_version=1.1.2.334 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5ccda13e..a1347e58 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fa9b2f4b..2c2bbe5f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sat Mar 05 15:46:25 GMT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip diff --git a/gradlew b/gradlew index 9d82f789..cccdd3d5 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,42 +6,6 @@ ## ############################################################################## -# 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 - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -60,6 +24,46 @@ cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" cd "$SAVED" >/dev/null +APP_NAME="Gradle" +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="" + +# 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 +nonstop=false +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. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +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 @@ -150,11 +154,19 @@ if $cygwin ; then 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=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# 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" "$@" diff --git a/gradlew.bat b/gradlew.bat index 72d362da..f9553162 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,90 +1,84 @@ -@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 Windows 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 +@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 + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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= + +@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 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 %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/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index fa8aa6f1..5b502a8d 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -777,6 +777,7 @@ frypankill.tooltip=This poor animal met its demise with a loud *bang* tconstruct.waila.empty=Empty tconstruct.waila.liquidtag=Liquid: +tconstruct.waila.progress=Casting Progress: tconstruct.waila.amounttag=Amount: tconstruct.waila.contains=Contains: tconstruct.waila.subtanks=Subtanks: diff --git a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java index 0986dc78..3eb79fa4 100644 --- a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java @@ -1,12 +1,16 @@ package tconstruct.plugins.waila; -import java.util.List; -import mcp.mobius.waila.api.*; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.SpecialChars; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; import tconstruct.smeltery.logic.CastingBasinLogic; +import java.util.List; + public class BasinDataProvider implements IWailaDataProvider { @@ -37,6 +41,8 @@ public class BasinDataProvider implements IWailaDataProvider FluidStack fs = te.getFluid(); currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + WailaRegistrar.fluidNameHelper(fs)); currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" + te.getCapacity()); + final int progress = te.getProgress(); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.progress") + progress + "%"); } else { diff --git a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java index d56f07f5..d292b366 100644 --- a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java @@ -1,11 +1,14 @@ package tconstruct.plugins.waila; -import java.util.List; -import mcp.mobius.waila.api.*; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import tconstruct.smeltery.logic.CastingTableLogic; +import java.util.List; + public class TableDataProvider implements IWailaDataProvider { @@ -40,6 +43,8 @@ public class TableDataProvider implements IWailaDataProvider { currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + WailaRegistrar.fluidNameHelper(te.getFluid())); currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + te.getFluidAmount() + "/" + te.getCapacity()); + final int progress = te.getProgress(); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.progress") + progress + "%"); } } return currenttip; diff --git a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java index 02ef7dd5..7563c8f5 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java @@ -22,6 +22,7 @@ import tconstruct.library.util.IPattern; public abstract class CastingBlockLogic extends InventoryLogic implements IFluidTank, IFluidHandler, ISidedInventory { public FluidStack liquid; + protected int maxCastingDelay = 0; protected int castingDelay = 0; protected int renderOffset = 0; protected int capacity = 0; @@ -195,7 +196,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid { if (copyLiquid.amount == this.capacity) { - castingDelay = recipe.coolTime; + maxCastingDelay= castingDelay = recipe.coolTime; } renderOffset = copyLiquid.amount; worldObj.func_147479_m(xCoord, yCoord, zCoord); @@ -217,7 +218,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid if (doFill && roomInTank > 0) { renderOffset = roomInTank; - castingDelay = liquidCasting.getCastingDelay(this.liquid, inventory[0]); + maxCastingDelay = castingDelay = liquidCasting.getCastingDelay(this.liquid, inventory[0]); this.liquid.amount = this.capacity; worldObj.func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; @@ -447,6 +448,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid { SmelteryCastedEvent event = getCastedEvent(recipe, recipe.getResult()); MinecraftForge.EVENT_BUS.post(event); + maxCastingDelay = 0; inventory[1] = event.output; if (event.consumeCast) @@ -485,6 +487,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid else this.capacity = updateCapacity(); this.castingDelay = tags.getInteger("castingDelay"); + this.maxCastingDelay = tags.getInteger("maxCastingDelay"); this.renderOffset = tags.getInteger("RenderOffset"); } @@ -507,6 +510,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid tags.setBoolean("Initialized", init); tags.setInteger("Capacity", capacity); tags.setInteger("castingDelay", castingDelay); + tags.setInteger("maxCastingDelay", maxCastingDelay); tags.setInteger("RenderOffset", renderOffset); } @@ -525,4 +529,12 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid readFromNBT(packet.func_148857_g()); worldObj.func_147479_m(xCoord, yCoord, zCoord); } + + public int getProgress() { + if(castingDelay == 0 || maxCastingDelay == 0) { + return 0; + } + + return (int)(( (maxCastingDelay - castingDelay) / (double)maxCastingDelay) * 100); + } }