Closes #828 and #829 (#835)

* update to gradle 4.0

* update forge/maps

* Fix table on a stick

now mimics vanilla behavior and tries to add stacks back to inv before
dropping.

* fix a nonsense dupe glitch

* fix worm

* move a thing so its not on fire

and lowercase thingy

build.gradle

@@ -23,10 +23,10 @@ if(hasProperty('buildnumber')){
 }
 
 minecraft {
- version = "1.12-14.21.1.2387"
+ version = "1.12-14.21.1.2400"
  runDir = "idea"
 
- mappings = "snapshot_20170628"
+ mappings = "snapshot_20170706"
  makeObfSourceJar = false
  //useDepAts = true
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Sep 14 12:28:28 PDT 2015
+#Sat Jul 01 10:16:13 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,20 +6,38 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# 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 ( ) {
+warn () {
  echo "$*"
 }
 
-die ( ) {
+die () {
  echo
  echo "$*"
  echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
  CYGWIN* )
  cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
  MINGW* )
  msys=true
  ;;
+ NONSTOP* )
+ nonstop=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.
@@ -90,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
@@ -114,6 +113,7 @@ fi
 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`
@@ -154,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=("[email protected]")
+# 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 "[email protected]")
+
+# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "[email protected]"
+exec "$JAVACMD" "[email protected]"

gradlew.bat

@@ -8,14 +8,14 @@
 @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 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
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@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.
@@ -60,11 +59,6 @@ set _SKIP=2
 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

src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java

@@ -30,4 +30,5 @@ public final class InitEntities{
  public static void initClient(){
  RenderingRegistry.registerEntityRenderingHandler(EntityWorm.class, RenderWorm.FACTORY);
  }
+ 
 }

src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java

@@ -26,14 +26,18 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 @SideOnly(Side.CLIENT)
 public class RenderWorm extends Render<EntityWorm>{
 
- public static final IRenderFactory FACTORY = new IRenderFactory(){
+ public static final IRenderFactory<EntityWorm> FACTORY = new IRenderFactory<EntityWorm>(){
  @Override
- public Render createRenderFor(RenderManager manager){
+ public Render<EntityWorm> createRenderFor(RenderManager manager){
  return new RenderWorm(manager);
  }
  };
 
- private static final ItemStack STACK = new ItemStack(InitItems.itemWorm);
+ private static ItemStack stack = ItemStack.EMPTY;
+
+ public static void fixItemStack(){
+ stack = new ItemStack(InitItems.itemWorm);
+ }
 
  protected RenderWorm(RenderManager renderManager){
  super(renderManager);
@@ -47,13 +51,14 @@ public class RenderWorm extends Render<EntityWorm>{
  @Override
  public void doRender(EntityWorm entity, double x, double y, double z, float entityYaw, float partialTicks){
  GlStateManager.pushMatrix();
+ bindEntityTexture(entity);
  GlStateManager.translate(x, y+0.7F, z);
  double boop = Minecraft.getSystemTime()/70D;
  GlStateManager.rotate(-(float)((boop%360)), 0, 1, 0);
  GlStateManager.translate(0, 0, 0.4);
 
- STACK.setStackDisplayName(entity.getName());
- AssetUtil.renderItemInWorld(STACK);
+ stack.setStackDisplayName(entity.getName());
+ AssetUtil.renderItemInWorld(stack);
 
  GlStateManager.popMatrix();
  }

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java

@@ -13,11 +13,13 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.util.StackUtil;
 import invtweaks.api.container.InventoryContainer;
+import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.*;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.world.World;
 
 @InventoryContainer
@@ -107,19 +109,21 @@ public class ContainerCrafter extends Container{
  public void onContainerClosed(EntityPlayer player){
  super.onContainerClosed(player);
 
- if(!this.world.isRemote){
  for(int i = 0; i < 9; ++i){
  ItemStack stack = this.craftMatrix.removeStackFromSlot(i);
  if(StackUtil.isValid(stack)){
-  player.dropItem(stack, false);
- }
+  if(!player.addItemStackToInventory(stack))
+  if(!this.world.isRemote) Block.spawnAsEntity(world, player.getPosition(), stack);
  }
  }
  }
 
  @Override
  public void onCraftMatrixChanged(IInventory inv){
- this.craftResult.setInventorySlotContents(0, CraftingManager.findMatchingRecipe(this.craftMatrix, this.world).getRecipeOutput());
+ IRecipe output = CraftingManager.findMatchingRecipe(this.craftMatrix, this.world);
+ ItemStack stack = ItemStack.EMPTY;
+ if(output != null) stack = output.getRecipeOutput();
+ this.craftResult.setInventorySlotContents(0, stack.copy());
  }
 
  @Override

src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java

@@ -14,6 +14,7 @@ package de.ellpeck.actuallyadditions.mod.proxy;
 import de.ellpeck.actuallyadditions.mod.ClientRegistryHandler;
 import de.ellpeck.actuallyadditions.mod.blocks.render.*;
 import de.ellpeck.actuallyadditions.mod.entity.InitEntities;
+import de.ellpeck.actuallyadditions.mod.entity.RenderWorm;
 import de.ellpeck.actuallyadditions.mod.event.ClientEvents;
 import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit;
 import de.ellpeck.actuallyadditions.mod.tile.*;
@@ -55,6 +56,8 @@ public class ClientProxy implements IProxy{
  public void init(FMLInitializationEvent event){
  ModUtil.LOGGER.info("Initializing ClientProxy...");
 
+ RenderWorm.fixItemStack();
+ 
  new ClientEvents();
 
  ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompost.class, new RenderCompost());