diff --git a/build.gradle b/build.gradle index e8d1986d..9e3ab123 100644 --- a/build.gradle +++ b/build.gradle @@ -61,10 +61,6 @@ repositories { name = "CurseForge" url = "https://minecraft.curseforge.com/api/maven/" } - maven { - name = "progwml6" - url = "https://dvs1.progwml6.com/files/maven/" - } maven { name = "blamejared" url = "https://maven.blamejared.com/" diff --git a/src/main/java/gregtechfoodoption/ClientProxy.java b/src/main/java/gregtechfoodoption/ClientProxy.java index 28ffc451..b469c39e 100644 --- a/src/main/java/gregtechfoodoption/ClientProxy.java +++ b/src/main/java/gregtechfoodoption/ClientProxy.java @@ -1,6 +1,7 @@ package gregtechfoodoption; import com.mojang.authlib.minecraft.MinecraftProfileTexture; +import gregtech.api.GTValues; import gregtech.api.util.LocalizationUtils; import gregtechfoodoption.block.GTFOMetaBlocks; import gregtechfoodoption.entity.GTFOEntities; @@ -14,6 +15,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; @@ -42,13 +44,14 @@ public void preLoad() { Minecraft.getMinecraft().getFramebuffer().enableStencil(); } GTFOEntities.registerRenders(); + OBJLoader.INSTANCE.addDomain(GTValues.MODID); } @Override public void onLoad() { super.onLoad(); - if(Loader.isModLoaded("appleskin")) { + if(Loader.isModLoaded(GTFOValues.MODID_AP)) { GTFOMetaTooltipOverlay.init(); GTFOMetaHUDOverlay.init(); } diff --git a/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java b/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java index 0ca08c79..da3610fa 100644 --- a/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java +++ b/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java @@ -17,11 +17,14 @@ import gregtechfoodoption.potion.*; import gregtechfoodoption.utils.GTFOLog; import gregtechfoodoption.utils.GTFOUtils; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -376,6 +379,11 @@ public class GTFOMetaItem extends MetaItem imple public static MetaItem.MetaValueItem EMERGENCY_RATIONS; + //KillReal items + public static MetaItem.MetaValueItem JACK_DANIELS; + public static MetaItem.MetaValueItem CHEESE; + // + public GTFOMetaItem() { super((short) 0); } @@ -883,6 +891,15 @@ public void registerSubItems() { WHITE_GRAPE_SEED = addItem(321, "seed.white_grape"); WHITE_GRAPE_SEED.addComponents(new GTFOCropSeedBehaviour(GTFOCrops.CROP_WHITE_GRAPE, WHITE_GRAPE_SEED.getStackForm(), WHITE_GRAPES.getStackForm())); + //ALCOHOL + JACK_DANIELS = addItem(326, "food.alcohol.jack_daniels").addComponents(new GTFOFoodStats(4, 0.7f, true, true, new ItemStack(Items.GLASS_BOTTLE), + new RandomPotionEffect(MobEffects.NAUSEA, 600, 0, 100 - 60), + new RandomPotionEffect(MobEffects.RESISTANCE, 400, 0, 100 - 40)) + .setEatingDuration(96)); + // + //Experiment + CHEESE = addItem(327, "food.models.cheese").setHasObjModel(true) + .addComponents(new GTFOFoodStats(4, 0.7f)); // 175-189 left blank for organic circuits SPRINKLER_COVER = addItem(224, "cover.sprinkler"); @@ -936,7 +953,7 @@ public ItemStack getContainerItem(ItemStack stack) { protected String formatModelPath(GTFOMetaItem.GTFOMetaValueItem metaValueItem) { - return "metaitems/" + metaValueItem.unlocalizedName.replace('.', '/'); + return "metaitems/" + metaValueItem.unlocalizedName.replace('.', '/') + (metaValueItem.hasObjModel ? ".obj" : ""); } @Override @@ -972,6 +989,7 @@ public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList.MetaValueItem { + private boolean hasObjModel; protected GTFOMetaValueItem(int metaValue, String unlocalizedName) { super(metaValue, unlocalizedName); @@ -995,7 +1013,37 @@ protected void addItemComponentsInternal(IItemComponent... stats) { } } + public boolean hasObjModel() { + return hasObjModel; + } + + public GTFOMetaValueItem setHasObjModel(boolean hasObjModel) { + this.hasObjModel = hasObjModel; + return this; + } } + @SideOnly(Side.CLIENT) + public void registerModels() { + for (short itemMetaKey : metaItems.keySet()) { + GTFOMetaValueItem metaValueItem = metaItems.get(itemMetaKey); + int numberOfModels = metaValueItem.getModelAmount(); + if (numberOfModels > 1) { + ModelResourceLocation[] resourceLocations = new ModelResourceLocation[numberOfModels]; + for (int i = 0; i < resourceLocations.length; i++) { + ResourceLocation resourceLocation = createItemModelPath(metaValueItem, "/" + (i + 1)); + ModelBakery.registerItemVariants(this, resourceLocation); + resourceLocations[i] = new ModelResourceLocation(resourceLocation, "inventory"); + } + specialItemsModels.put((short) (metaItemOffset + itemMetaKey), resourceLocations); + continue; + } + ResourceLocation resourceLocation = createItemModelPath(metaValueItem, ""); + if (numberOfModels > 0) { + ModelBakery.registerItemVariants(this, resourceLocation); + } + metaItemsModels.put((short) (metaItemOffset + itemMetaKey), new ModelResourceLocation(resourceLocation, "inventory")); + } + } } diff --git a/src/main/resources/assets/gregtech/models/item/gradle/wrapper/gradle-wrapper.jar b/src/main/resources/assets/gregtech/models/item/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 58499e4f..00000000 Binary files a/src/main/resources/assets/gregtech/models/item/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/src/main/resources/assets/gregtech/models/item/gradle/wrapper/gradle-wrapper.properties b/src/main/resources/assets/gregtech/models/item/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 2c2bbe5f..00000000 --- a/src/main/resources/assets/gregtech/models/item/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip diff --git a/src/main/resources/assets/gregtech/models/item/gradlew b/src/main/resources/assets/gregtech/models/item/gradlew deleted file mode 100644 index 9d9cdba7..00000000 --- a/src/main/resources/assets/gregtech/models/item/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# 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\"`/" >/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. -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" -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 - 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"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # 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 - -# 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 --illegal-access=permit $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/src/main/resources/assets/gregtech/models/item/gradlew.bat b/src/main/resources/assets/gregtech/models/item/gradlew.bat deleted file mode 100644 index f9553162..00000000 --- a/src/main/resources/assets/gregtech/models/item/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@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/src/main/resources/assets/gregtech/models/item/metaitems/food/alcohol/jack_daniels.json b/src/main/resources/assets/gregtech/models/item/metaitems/food/alcohol/jack_daniels.json new file mode 100644 index 00000000..76537caa --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/food/alcohol/jack_daniels.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/food/alcohol/jack_daniels" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.mtl b/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.mtl new file mode 100644 index 00000000..db137b42 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.mtl @@ -0,0 +1,4 @@ +# Made in Blockbench 4.7.2 +newmtl m_cdaf725b-c014-6e84-0212-03660f359c4a +map_Kd gregtech:items/metaitems/food/models/cheese +newmtl none diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.obj b/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.obj new file mode 100644 index 00000000..40eddeb7 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.obj @@ -0,0 +1,49 @@ +# Made in Blockbench 4.7.2 +mtllib cheese.mtl + +o cube +v 0.6950825214724776 0.5700825214724776 0.676776695296637 +v 0.5075825214724776 0.7575825214724776 0.4116116523516815 +v 0.7575825214724776 0.5075825214724776 0.5883883476483185 +v 0.5700825214724776 0.6950825214724776 0.32322330470336313 +v 0.24241747852752238 0.4924174785275224 0.4116116523516815 +v 0.4299174785275224 0.3049174785275224 0.676776695296637 +v 0.3049174785275224 0.4299174785275224 0.32322330470336313 +v 0.4924174785275224 0.24241747852752238 0.5883883476483183 +vt 0.375 1 +vt 0.75 1 +vt 0.75 0.875 +vt 0.375 0.875 +vt 0.375 0.875 +vt 0.75 0.875 +vt 0.75 0.75 +vt 0.375 0.75 +vt 0.375 0.75 +vt 0.75 0.75 +vt 0.75 0.625 +vt 0.375 0.625 +vt 0.375 0.625 +vt 0.75 0.625 +vt 0.75 0.5 +vt 0.375 0.5 +vt 0.375 0.625 +vt 0 0.625 +vt 0 1 +vt 0.375 1 +vt 0.375 0.625 +vt 0 0.625 +vt 0 0.25 +vt 0.375 0.25 +vn -0.5000000000000001 0.5000000000000001 -0.7071067811865476 +vn 0.7071067811865475 0.7071067811865476 0 +vn 0.5000000000000001 -0.5000000000000001 0.7071067811865476 +vn -0.7071067811865475 -0.7071067811865476 0 +vn -0.5 0.5 0.7071067811865476 +vn 0.5 -0.5 -0.7071067811865476 +usemtl m_cdaf725b-c014-6e84-0212-03660f359c4a +f 4/4/1 7/3/1 5/2/1 2/1/1 +f 3/8/2 4/7/2 2/6/2 1/5/2 +f 8/12/3 3/11/3 1/10/3 6/9/3 +f 7/16/4 8/15/4 6/14/4 5/13/4 +f 6/20/5 1/19/5 2/18/5 5/17/5 +f 7/24/6 4/23/6 3/22/6 8/21/6 \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/food/alcohol/jack_daniels.png b/src/main/resources/assets/gregtech/textures/items/metaitems/food/alcohol/jack_daniels.png new file mode 100644 index 00000000..6994e4b2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/food/alcohol/jack_daniels.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/food/models/cheese.png b/src/main/resources/assets/gregtech/textures/items/metaitems/food/models/cheese.png new file mode 100644 index 00000000..1e0c43c9 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/food/models/cheese.png differ