Updated Forge

gradle.properties

@@ -7,7 +7,7 @@ mod_version=8.0.0
 
 minecraft_version=1.13.2
 minecraft_version_toml=13
-forge_version=25.0.34
+forge_version=25.0.215
 forge_version_toml=25
 forge_group=net.minecraftforge
 mappings_version=20190215-1.13.1

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or 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
+#
+#      http://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.
+#
 
 ##############################################################################
 ##
@@ -6,42 +22,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 +40,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='"-Xmx64m" "-Xms64m"'
+
+# 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 +105,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 +170,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
+# Escape application args
-function splitJvmOpts() {
+save () {
-    JVM_OPTS=("$@")
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+APP_ARGS=$(save "$@")
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-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" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@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      http://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
@@ -8,14 +24,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="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +62,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 +75,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/biomesoplenty/common/item/ItemWaterPlant.java

@@ -50,56 +50,55 @@ public class ItemWaterPlant extends ItemBlock
 	   @Override
 	   public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn)
 	   {
-	      ItemStack itemstack = playerIn.getHeldItem(handIn);
+		   ItemStack itemstack = playerIn.getHeldItem(handIn);
-	      RayTraceResult raytraceresult = this.rayTrace(worldIn, playerIn, true);
+		   RayTraceResult raytraceresult = this.rayTrace(worldIn, playerIn, true);
-	      if (raytraceresult == null)
+		   if (raytraceresult == null)
-	      {
+		   {
-	         return new ActionResult<>(EnumActionResult.PASS, itemstack);
+			   return new ActionResult<>(EnumActionResult.PASS, itemstack);
-	      }
+		   }
-	      else
+		   else
-	      {
+		   {
-	         if (raytraceresult.type == RayTraceResult.Type.BLOCK)
+			   if (raytraceresult.type == RayTraceResult.Type.BLOCK)
-	         {
+			   {
-	            BlockPos blockpos = raytraceresult.getBlockPos();
+				   BlockPos blockpos = raytraceresult.getBlockPos();
-	            if (!worldIn.isBlockModifiable(playerIn, blockpos) || !playerIn.canPlayerEdit(blockpos.offset(raytraceresult.sideHit), raytraceresult.sideHit, itemstack))
+				   if (!worldIn.isBlockModifiable(playerIn, blockpos) || !playerIn.canPlayerEdit(blockpos.offset(raytraceresult.sideHit), raytraceresult.sideHit, itemstack))
-	            {
+				   {
-	               return new ActionResult<>(EnumActionResult.FAIL, itemstack);
+					   return new ActionResult<>(EnumActionResult.FAIL, itemstack);
-	            }
+				   }
 
-	            BlockPos blockpos1 = blockpos.up();
+				   BlockPos blockpos1 = blockpos.up();
-	            IBlockState iblockstate = worldIn.getBlockState(blockpos);
+				   IBlockState iblockstate = worldIn.getBlockState(blockpos);
-	            Material material = iblockstate.getMaterial();
+				   Material material = iblockstate.getMaterial();
-	            IFluidState ifluidstate = worldIn.getFluidState(blockpos);
+				   IFluidState ifluidstate = worldIn.getFluidState(blockpos);
-	            Block ground = worldIn.getBlockState(blockpos.down()).getBlock();
+				   if ((ifluidstate.getFluid() == Fluids.WATER || material == Material.ICE) && worldIn.isAirBlock(blockpos1))
-	            if ((ifluidstate.getFluid() == Fluids.WATER || material == Material.ICE) && worldIn.isAirBlock(blockpos1) && (ground == Blocks.DIORITE || ground == Blocks.GRANITE || ground == Blocks.ANDESITE || ground == Blocks.STONE || ground == Blocks.DIRT || ground == Blocks.COARSE_DIRT || ground == Blocks.GRASS_BLOCK || ground == Blocks.GRAVEL || ground == Blocks.SAND || ground == Blocks.RED_SAND || ground == BOPBlocks.white_sand || ground == BOPBlocks.mud || ground == BOPBlocks.dried_sand))
+				   {
-	            {
 
-	               // special case for handling block placement with water lilies
+					   // special case for handling block placement with water lilies
-	               net.minecraftforge.common.util.BlockSnapshot blocksnapshot = net.minecraftforge.common.util.BlockSnapshot.getBlockSnapshot(worldIn, blockpos1);
+					   net.minecraftforge.common.util.BlockSnapshot blocksnapshot = net.minecraftforge.common.util.BlockSnapshot.getBlockSnapshot(worldIn, blockpos1);
-	               worldIn.setBlockState(blockpos1, this.block.getDefaultState(), 11);
+					   worldIn.setBlockState(blockpos1, Blocks.LILY_PAD.getDefaultState(), 11);
-	               if (net.minecraftforge.event.ForgeEventFactory.onPlayerBlockPlace(playerIn, blocksnapshot, net.minecraft.util.EnumFacing.UP, handIn).isCanceled())
+					   if (net.minecraftforge.event.ForgeEventFactory.onBlockPlace(playerIn, blocksnapshot, net.minecraft.util.EnumFacing.UP))
-	               {
+					   {
-	                  blocksnapshot.restore(true, false);
+						   blocksnapshot.restore(true, false);
-	                  return new ActionResult<ItemStack>(EnumActionResult.FAIL, itemstack);
+						   return new ActionResult<ItemStack>(EnumActionResult.FAIL, itemstack);
-	               }
+					   }
 
-	               if (playerIn instanceof EntityPlayerMP)
+					   if (playerIn instanceof EntityPlayerMP)
-	               {
+					   {
-	                  CriteriaTriggers.PLACED_BLOCK.trigger((EntityPlayerMP)playerIn, blockpos1, itemstack);
+						   CriteriaTriggers.PLACED_BLOCK.trigger((EntityPlayerMP) playerIn, blockpos1, itemstack);
-	               }
+					   }
 
-	               if (!playerIn.abilities.isCreativeMode)
+					   if (!playerIn.abilities.isCreativeMode)
-	               {
+					   {
-	                  itemstack.shrink(1);
+						   itemstack.shrink(1);
-	               }
+					   }
 
-	               playerIn.addStat(StatList.ITEM_USED.get(this));
+					   playerIn.addStat(StatList.ITEM_USED.get(this));
-	               worldIn.playSound(playerIn, blockpos, SoundEvents.BLOCK_LILY_PAD_PLACE, SoundCategory.BLOCKS, 1.0F, 1.0F);
+					   worldIn.playSound(playerIn, blockpos, SoundEvents.BLOCK_LILY_PAD_PLACE, SoundCategory.BLOCKS, 1.0F, 1.0F);
-	               return new ActionResult<>(EnumActionResult.SUCCESS, itemstack);
+					   return new ActionResult<>(EnumActionResult.SUCCESS, itemstack);
-	            }
+				   }
-	         }
+			   }
 
-	         return new ActionResult<>(EnumActionResult.FAIL, itemstack);
+			   return new ActionResult<>(EnumActionResult.FAIL, itemstack);
-	      }
+		   }
 	   }
 }

src/main/java/biomesoplenty/core/BiomesOPlenty.java

@@ -8,13 +8,12 @@
 
 package biomesoplenty.core;
 
-import biomesoplenty.client.util.GenLayerVisualizer;
 import biomesoplenty.common.command.BOPCommand;
 import biomesoplenty.init.*;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -35,7 +34,7 @@ public class BiomesOPlenty
     {
     	instance = this;
 
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientSetup);
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::loadComplete);
         MinecraftForge.EVENT_BUS.addListener(this::serverStarting);
 
@@ -46,9 +45,9 @@ public class BiomesOPlenty
         ModBiomes.init();
     }
     
-    private void setup(final FMLCommonSetupEvent event)
+    private void clientSetup(final FMLClientSetupEvent event)
     {
-        proxy.preInit();
+        proxy.registerRenderers();
     }
 
     private void loadComplete(final FMLLoadCompleteEvent event) // PostRegistrationEven

src/main/java/biomesoplenty/core/ClientProxy.java

@@ -38,9 +38,14 @@ public class ClientProxy extends CommonProxy
     }
 
     @Override
-    public void preInit()
+    public void registerRenderers()
     {
-        RenderingRegistry.registerEntityRenderingHandler(EntityMudball.class, manager -> new RenderSprite<Entity>(manager, BOPItems.mudball, Minecraft.getInstance().getItemRenderer()));
+        RenderingRegistry.registerEntityRenderingHandler(EntityMudball.class, manager ->
+        {
+            BiomesOPlenty.logger.info("Creating sprite renderer");
+            BiomesOPlenty.logger.info(Minecraft.getInstance().getItemRenderer() == null);
+            return new RenderSprite<Entity>(manager, BOPItems.mudball, Minecraft.getInstance().getItemRenderer());
+        });
     }
 
     @Override

src/main/java/biomesoplenty/core/CommonProxy.java

@@ -17,7 +17,7 @@ public class CommonProxy
 
     }
 
-    public void preInit() {}
+    public void registerRenderers() {}
     public void init() {}
 
     public void spawnParticle(BOPParticleTypes type, World parWorld, double x, double y, double z, Object... info) {}