Fix possible crash with getIcon (#16)

* Update dependencies * Fix possible crash with getIcon * Fix formatting in readme * updateBuildScript & spotlessApply * Use devOnlyNonPublishable for NEI
GTNewHorizons · May 12, 2023 · 2247e0b · 2247e0b
1 parent 77f2cbc
commit 2247e0b
Show file tree

Hide file tree

Showing 155 changed files with 781 additions and 610 deletions.
diff --git a/README.md b/README.md
@@ -1,17 +1,17 @@
-#[Natura](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1294968-natura)
+# [Natura](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1294968-natura)
 
-We work all day and we work all night 	 
-The mandrake gives us quite a fright 	 
-We munch on berries high and lo 	 
-While we search for herbs to grow 	 
+We work all day and we work all night  
+The mandrake gives us quite a fright  
+We munch on berries high and lo  
+While we search for herbs to grow  
 
-Heyo, Redwood trees! Chop them all day long~ 	 
-Heyo, Redwood trees! Chop them all day long~ 	
+Heyo, Redwood trees! Chop them all day long~  
+Heyo, Redwood trees! Chop them all day long~  
 
-##Development
+## Development
 Install Forge as usual, and setup your IDE as with any other Forge project. Forge Multipart, and CClib must be installed to `forge/mcp/jars/mods/` from the Forge File Server: [ForgeMultipart](http://files.minecraftforge.net/ForgeMultipart/) and [CClib](http://files.minecraftforge.net/CodeChickenLib/). The DEVELOPMENT version of NEI must be installed to the same directory from [Chicken Bones Site](http://www.chickenbones.craftsaddle.org/Files/New_Versions/links.php). Tinkers' Construct must be installed as well from [dvs1](https://dvs1.progwml6.com/jenkins/job/TConstruct_1.7.x/).
 
-##Issue reporting
+## Issue reporting
 Please include the following:
 
 * Minecraft version

diff --git a/build.gradle b/build.gradle
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,22 +1,18 @@
 // Add your dependencies here
 
 dependencies {
+	api("com.github.GTNewHorizons:Mantle:0.3.6:dev")
 
-	compile("com.github.GTNewHorizons:Mantle:0.3.4:dev")
-
-	compileOnly("com.github.GTNewHorizons:waila:1.5.21:dev") {
-		transitive = false
-	}
-	compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.2.7:dev") {
+	compileOnly("com.github.GTNewHorizons:waila:1.6.0:dev") {
 		transitive = false
 	}
-	compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.2.17-GTNH:dev") {
+	compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.3.3:dev") {
 		transitive = false
 	}
-	compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.9.0-16-GTNH:dev") {
+	devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.3.52-GTNH:dev")
+	compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.9.31-GTNH:dev") {
 		transitive = false
 	}
-
 	compileOnly("curse.maven:minefactory-reloaded-66672:2366150") {
 		transitive = false
 	}

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/repositories.gradle b/repositories.gradle
@@ -1,14 +1,4 @@
 // Add any additional repositiroes for your dependencies here
 
 repositories {
-	maven {
-		name = "GTNH Maven"
-		url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-	}
-	maven {
-		url "https://cursemaven.com"
-	}
-	maven {
-		url = "https://jitpack.io"
-	}
 }
diff --git a/src/main/java/mods/natura/Natura.java b/src/main/java/mods/natura/Natura.java
@@ -5,21 +5,6 @@
 import java.util.Map;
 import java.util.Random;
 
-import mantle.lib.TabTools;
-import mantle.pulsar.control.PulseManager;
-import mods.natura.common.NContent;
-import mods.natura.common.NProxyCommon;
-import mods.natura.common.NaturaTab;
-import mods.natura.common.PHNatura;
-import mods.natura.dimension.NetheriteWorldProvider;
-import mods.natura.gui.NGuiHandler;
-import mods.natura.plugins.PluginController;
-import mods.natura.worldgen.BaseCloudWorldgen;
-import mods.natura.worldgen.BaseCropWorldgen;
-import mods.natura.worldgen.BaseTreeWorldgen;
-import mods.natura.worldgen.retro.TickHandlerWorld;
-import mods.natura.worldgen.retro.WorldHandler;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.EntityLiving;
@@ -57,6 +42,20 @@
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
+import mantle.lib.TabTools;
+import mantle.pulsar.control.PulseManager;
+import mods.natura.common.NContent;
+import mods.natura.common.NProxyCommon;
+import mods.natura.common.NaturaTab;
+import mods.natura.common.PHNatura;
+import mods.natura.dimension.NetheriteWorldProvider;
+import mods.natura.gui.NGuiHandler;
+import mods.natura.plugins.PluginController;
+import mods.natura.worldgen.BaseCloudWorldgen;
+import mods.natura.worldgen.BaseCropWorldgen;
+import mods.natura.worldgen.BaseTreeWorldgen;
+import mods.natura.worldgen.retro.TickHandlerWorld;
+import mods.natura.worldgen.retro.WorldHandler;
 
 @Mod(
         modid = "Natura",

diff --git a/src/main/java/mods/natura/blocks/CloudBlock.java b/src/main/java/mods/natura/blocks/CloudBlock.java
@@ -1,9 +1,5 @@
 package mods.natura.blocks;
 
-import mods.natura.Natura;
-import mods.natura.common.NContent;
-import mods.natura.common.NaturaTab;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
@@ -16,6 +12,10 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import mods.natura.Natura;
+import mods.natura.common.NContent;
+import mods.natura.common.NaturaTab;
+
 public class CloudBlock extends NBlock {
 
     public CloudBlock() {

diff --git a/src/main/java/mods/natura/blocks/GrassBlock.java b/src/main/java/mods/natura/blocks/GrassBlock.java
@@ -2,9 +2,6 @@
 
 import java.util.List;
 
-import mods.natura.client.GrassColorizerAlternate;
-import mods.natura.common.NaturaTab;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -19,6 +16,8 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mods.natura.client.GrassColorizerAlternate;
+import mods.natura.common.NaturaTab;
 
 public class GrassBlock extends Block {
 

diff --git a/src/main/java/mods/natura/blocks/GrassSlab.java b/src/main/java/mods/natura/blocks/GrassSlab.java
@@ -2,9 +2,6 @@
 
 import java.util.List;
 
-import mods.natura.client.GrassColorizerAlternate;
-import mods.natura.common.NaturaTab;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -18,6 +15,8 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mods.natura.client.GrassColorizerAlternate;
+import mods.natura.common.NaturaTab;
 
 public class GrassSlab extends NSlabBase {
 

diff --git a/src/main/java/mods/natura/blocks/NBlock.java b/src/main/java/mods/natura/blocks/NBlock.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import mods.natura.common.NaturaTab;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -14,6 +12,7 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mods.natura.common.NaturaTab;
 
 public class NBlock extends Block {
 

diff --git a/src/main/java/mods/natura/blocks/NButton.java b/src/main/java/mods/natura/blocks/NButton.java
@@ -1,14 +1,13 @@
 package mods.natura.blocks;
 
-import mods.natura.common.NaturaTab;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockButton;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mods.natura.common.NaturaTab;
 
 public class NButton extends BlockButton {
 

diff --git a/src/main/java/mods/natura/blocks/NFenceGate.java b/src/main/java/mods/natura/blocks/NFenceGate.java
@@ -1,14 +1,13 @@
 package mods.natura.blocks;
 
-import mods.natura.common.NaturaTab;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFenceGate;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mods.natura.common.NaturaTab;
 
 public class NFenceGate extends BlockFenceGate {
 

diff --git a/src/main/java/mods/natura/blocks/NLadder.java b/src/main/java/mods/natura/blocks/NLadder.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import mods.natura.common.NaturaTab;
-
 import net.minecraft.block.BlockLadder;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -13,6 +11,7 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mods.natura.common.NaturaTab;
 
 public class NLadder extends BlockLadder {
 

diff --git a/src/main/java/mods/natura/blocks/NPressurePlate.java b/src/main/java/mods/natura/blocks/NPressurePlate.java
@@ -1,7 +1,5 @@
 package mods.natura.blocks;
 
-import mods.natura.common.NaturaTab;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPressurePlate;
 import net.minecraft.block.material.Material;
@@ -10,6 +8,7 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mods.natura.common.NaturaTab;
 
 public class NPressurePlate extends BlockPressurePlate {
 

diff --git a/src/main/java/mods/natura/blocks/NSlabBase.java b/src/main/java/mods/natura/blocks/NSlabBase.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import mods.natura.common.NaturaTab;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -18,6 +16,7 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mods.natura.common.NaturaTab;
 
 public class NSlabBase extends Block {
 

diff --git a/src/main/java/mods/natura/blocks/NStairs.java b/src/main/java/mods/natura/blocks/NStairs.java
@@ -1,10 +1,10 @@
 package mods.natura.blocks;
 
-import mods.natura.common.NaturaTab;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockStairs;
 
+import mods.natura.common.NaturaTab;
+
 public class NStairs extends BlockStairs {
 
     public NStairs(Block par2Block, int par3) {

diff --git a/src/main/java/mods/natura/blocks/NTrapdoor.java b/src/main/java/mods/natura/blocks/NTrapdoor.java
@@ -1,14 +1,13 @@
 package mods.natura.blocks;
 
-import mods.natura.common.NaturaTab;
-
 import net.minecraft.block.BlockTrapDoor;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mods.natura.common.NaturaTab;
 
 public class NTrapdoor extends BlockTrapDoor {
 

diff --git a/src/main/java/mods/natura/blocks/crops/BerryBush.java b/src/main/java/mods/natura/blocks/crops/BerryBush.java
@@ -3,10 +3,6 @@
 import java.util.List;
 import java.util.Random;
 
-import mods.natura.client.BerryRender;
-import mods.natura.common.NContent;
-import mods.natura.common.NaturaTab;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLeavesBase;
 import net.minecraft.block.material.Material;
@@ -28,6 +24,9 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mods.natura.client.BerryRender;
+import mods.natura.common.NContent;
+import mods.natura.common.NaturaTab;
 
 public class BerryBush extends BlockLeavesBase implements IPlantable {
 

diff --git a/src/main/java/mods/natura/blocks/crops/CropBlock.java b/src/main/java/mods/natura/blocks/crops/CropBlock.java
@@ -3,9 +3,6 @@
 import java.util.ArrayList;
 import java.util.Random;
 
-import mods.natura.client.CropRender;
-import mods.natura.common.NContent;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockBush;
 import net.minecraft.block.IGrowable;
@@ -22,6 +19,8 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mods.natura.client.CropRender;
+import mods.natura.common.NContent;
 
 public class CropBlock extends BlockBush implements IGrowable {
 

diff --git a/src/main/java/mods/natura/blocks/crops/Glowshroom.java b/src/main/java/mods/natura/blocks/crops/Glowshroom.java
@@ -3,10 +3,6 @@
 import java.util.List;
 import java.util.Random;
 
-import mods.natura.common.NaturaTab;
-import mods.natura.worldgen.GlowshroomGenBlueGreen;
-import mods.natura.worldgen.GlowshroomGenPurple;
-
 import net.minecraft.block.BlockMushroom;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -18,6 +14,9 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import mods.natura.common.NaturaTab;
+import mods.natura.worldgen.GlowshroomGenBlueGreen;
+import mods.natura.worldgen.GlowshroomGenPurple;
 
 public class Glowshroom extends BlockMushroom {
 

diff --git a/src/main/java/mods/natura/blocks/crops/HerbBlock.java b/src/main/java/mods/natura/blocks/crops/HerbBlock.java
@@ -2,9 +2,6 @@
 
 import java.util.Random;
 
-import mods.natura.common.NContent;
-import mods.natura.common.NaturaTab;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
@@ -13,6 +10,9 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.EnumPlantType;
 
+import mods.natura.common.NContent;
+import mods.natura.common.NaturaTab;
+
 public class HerbBlock extends CropBlock {
 
     protected HerbBlock() {