[ci skip] spotlessApply with the new settings

GTNewHorizons · Jan 29, 2023 · f9bc7c7 · f9bc7c7
1 parent c563066
commit f9bc7c7
Show file tree

Hide file tree

Showing 188 changed files with 2,516 additions and 2,690 deletions.
diff --git a/src/main/java/mods/natura/CloudMaterial.java b/src/main/java/mods/natura/CloudMaterial.java
@@ -4,6 +4,7 @@
 import net.minecraft.block.material.Material;
 
 public class CloudMaterial extends Material {
+
     public CloudMaterial() {
         super(MapColor.snowColor);
         // this.setReplaceable();

diff --git a/src/main/java/mods/natura/Natura.java b/src/main/java/mods/natura/Natura.java
@@ -1,24 +1,10 @@
 package mods.natura;
 
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.eventhandler.Event.Result;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+
 import mantle.lib.TabTools;
 import mantle.pulsar.control.PulseManager;
 import mods.natura.common.NContent;
@@ -33,6 +19,7 @@
 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;
@@ -51,16 +38,34 @@
 import net.minecraftforge.event.entity.player.EntityInteractEvent;
 import net.minecraftforge.event.world.ChunkDataEvent;
 import net.minecraftforge.oredict.OreDictionary;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.FMLLog;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.Mod.Instance;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.eventhandler.Event.Result;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.TickEvent;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
+
 @Mod(
         modid = "Natura",
         name = "Natura",
         version = "GRADLETOKEN_VERSION",
         acceptedMinecraftVersions = "[1.7.10]",
         dependencies = "required-after:Mantle;after:TConstruct")
 public class Natura {
+
     /* Proxies for sides, used for graphics processing */
     @SidedProxy(clientSide = "mods.natura.client.NProxyClient", serverSide = "mods.natura.common.NProxyCommon")
     public static NProxyCommon proxy;
@@ -106,12 +111,12 @@ public void preInit(FMLPreInitializationEvent evt) {
     @EventHandler
     public void init(FMLInitializationEvent evt) {
         if (PHNatura.enableBerryBushes | PHNatura.enableNetherBerryBushes)
-            GameRegistry.registerWorldGenerator(
-                    crops = new BaseCropWorldgen(), 20); // TODO 1.7 Find correct weight (param 2)
-        GameRegistry.registerWorldGenerator(
-                clouds = new BaseCloudWorldgen(), 20); // TODO 1.7 Find correct weight (param 2)
-        GameRegistry.registerWorldGenerator(
-                trees = new BaseTreeWorldgen(), 20); // TODO 1.7 Find correct weight (param 2)
+            GameRegistry.registerWorldGenerator(crops = new BaseCropWorldgen(), 20); // TODO 1.7 Find correct weight
+                                                                                     // (param 2)
+        GameRegistry.registerWorldGenerator(clouds = new BaseCloudWorldgen(), 20); // TODO 1.7 Find correct weight
+                                                                                   // (param 2)
+        GameRegistry.registerWorldGenerator(trees = new BaseTreeWorldgen(), 20); // TODO 1.7 Find correct weight (param
+                                                                                 // 2)
 
         proxy.registerRenderer();
         NetworkRegistry.INSTANCE.registerGuiHandler(instance, new NGuiHandler());
@@ -147,12 +152,9 @@ public void postInit(FMLPostInitializationEvent evt) {
     /**
      * Runtime IMC Handler
      *
-     * Message tag: set-worldgen-overrides
-     * Message NBT data:
-     *  dimensions: int[] - array of dimension IDs to update
-     *  settings: int[] - array of settings to set for the corresponding dimension IDs
-     *  Both arrays must be of the same length
-     *  Settings format: integer with bitfields, enable bits: 1 = crops (berry bushes), 2 = clouds, 4 = trees
+     * Message tag: set-worldgen-overrides Message NBT data: dimensions: int[] - array of dimension IDs to update
+     * settings: int[] - array of settings to set for the corresponding dimension IDs Both arrays must be of the same
+     * length Settings format: integer with bitfields, enable bits: 1 = crops (berry bushes), 2 = clouds, 4 = trees
      */
     @SubscribeEvent
     public void tickEvent(TickEvent.ServerTickEvent event) {
@@ -214,8 +216,7 @@ public void interactEvent(EntityInteractEvent event) {
         if (event.target instanceof EntityCow || event.target instanceof EntitySheep) {
             ItemStack equipped = event.entityPlayer.getCurrentEquippedItem();
             EntityAnimal creature = (EntityAnimal) event.target;
-            if (equipped != null
-                    && equipped.getItem() == NContent.plantItem
+            if (equipped != null && equipped.getItem() == NContent.plantItem
                     && equipped.getItemDamage() == 0
                     && creature.getGrowingAge() == 0
                     && !creature.isInLove()) {
@@ -236,12 +237,11 @@ public void interactEvent(EntityInteractEvent event) {
     @SubscribeEvent
     public void spawnEvent(EntityJoinWorldEvent event) {
         if (event.entity instanceof EntityCow || event.entity instanceof EntitySheep) {
-            ((EntityLiving) event.entity)
-                    .tasks.addTask(
-                            3, new EntityAITempt((EntityCreature) event.entity, 0.25F, NContent.plantItem, false));
+            ((EntityLiving) event.entity).tasks
+                    .addTask(3, new EntityAITempt((EntityCreature) event.entity, 0.25F, NContent.plantItem, false));
         } else if (event.entity instanceof EntityChicken) {
-            ((EntityLiving) event.entity)
-                    .tasks.addTask(3, new EntityAITempt((EntityCreature) event.entity, 0.25F, NContent.seeds, false));
+            ((EntityLiving) event.entity).tasks
+                    .addTask(3, new EntityAITempt((EntityCreature) event.entity, 0.25F, NContent.seeds, false));
         }
     }
 

diff --git a/src/main/java/mods/natura/blocks/CloudBlock.java b/src/main/java/mods/natura/blocks/CloudBlock.java
@@ -3,6 +3,7 @@
 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,8 +17,9 @@
 import net.minecraft.world.World;
 
 public class CloudBlock extends NBlock {
+
     public CloudBlock() {
-        super(Natura.cloud, 0.3F, new String[] {"cloud_white", "cloud_gray", "cloud_dark", "cloud_sulfur"});
+        super(Natura.cloud, 0.3F, new String[] { "cloud_white", "cloud_gray", "cloud_dark", "cloud_sulfur" });
         this.setStepSound(soundTypeCloth);
         this.setBlockName("cloud");
         this.setCreativeTab(NaturaTab.tab);
@@ -36,8 +38,7 @@ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity e
                         y,
                         z,
                         1,
-                        entityarrow.shootingEntity instanceof EntityLiving
-                                ? (EntityLiving) entityarrow.shootingEntity
+                        entityarrow.shootingEntity instanceof EntityLiving ? (EntityLiving) entityarrow.shootingEntity
                                 : null);
                 world.setBlockToAir(x, y, z);
                 return;
@@ -51,11 +52,10 @@ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity e
     }
 
     @Override
-    public boolean onBlockActivated(
-            World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) {
+    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7,
+            float par8, float par9) {
         int meta = world.getBlockMetadata(x, y, z);
-        if (meta == 3
-                && player.getCurrentEquippedItem() != null
+        if (meta == 3 && player.getCurrentEquippedItem() != null
                 && player.getCurrentEquippedItem().getItem() == Items.flint_and_steel) {
             world.setBlockToAir(x, y, z);
             this.explode(world, x, y, z, 1, player);
@@ -66,11 +66,9 @@ public boolean onBlockActivated(
 
     @Override
     public void onBlockDestroyedByExplosion(World world, int x, int y, int z, Explosion par5Explosion) {
-        /*int meta = world.getBlockMetadata(x, y, z);
-        if (meta == 3)
-        {
-            this.explode(world, x, y, z, 1, null);
-        }*/
+        /*
+         * int meta = world.getBlockMetadata(x, y, z); if (meta == 3) { this.explode(world, x, y, z, 1, null); }
+         */
     }
 
     public void explode(World world, int x, int y, int z, int size, EntityLivingBase living) {

diff --git a/src/main/java/mods/natura/blocks/GrassBlock.java b/src/main/java/mods/natura/blocks/GrassBlock.java
@@ -1,10 +1,10 @@
 package mods.natura.blocks;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 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;
@@ -17,7 +17,11 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.biome.BiomeGenBase;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class GrassBlock extends Block {
+
     public GrassBlock() {
         super(Material.grass);
         setHardness(0.6F);
@@ -55,9 +59,9 @@ public int getBlockColor() {
     @Override
     @SideOnly(Side.CLIENT)
     public int getRenderColor(int meta) {
-        /*if (par1 % 8 == 0)
-            return this.getBlockColor();
-        return 0xFFFFFF;*/
+        /*
+         * if (par1 % 8 == 0) return this.getBlockColor(); return 0xFFFFFF;
+         */
         double d0 = 0.5D;
         double d1 = 1.0D;
         switch (meta) {

diff --git a/src/main/java/mods/natura/blocks/GrassSlab.java b/src/main/java/mods/natura/blocks/GrassSlab.java
@@ -1,10 +1,10 @@
 package mods.natura.blocks;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 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;
@@ -16,7 +16,11 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.biome.BiomeGenBase;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class GrassSlab extends NSlabBase {
+
     public GrassSlab() {
         super(Material.ground);
         setHardness(0.6F);
@@ -54,9 +58,9 @@ public int getBlockColor() {
     @Override
     @SideOnly(Side.CLIENT)
     public int getRenderColor(int meta) {
-        /*if (par1 % 8 == 0)
-            return this.getBlockColor();
-        return 0xFFFFFF;*/
+        /*
+         * if (par1 % 8 == 0) return this.getBlockColor(); return 0xFFFFFF;
+         */
         double d0 = 0.5D;
         double d1 = 1.0D;
         switch (meta) {

diff --git a/src/main/java/mods/natura/blocks/NBlock.java b/src/main/java/mods/natura/blocks/NBlock.java
@@ -1,9 +1,9 @@
 package mods.natura.blocks;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 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;
@@ -12,7 +12,11 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class NBlock extends Block {
+
     public String[] textureNames;
     public IIcon[] icons;
 

diff --git a/src/main/java/mods/natura/blocks/NButton.java b/src/main/java/mods/natura/blocks/NButton.java
@@ -1,14 +1,17 @@
 package mods.natura.blocks;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 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;
+
 public class NButton extends BlockButton {
+
     Block modelBlock;
     int modelMeta;
 

diff --git a/src/main/java/mods/natura/blocks/NFenceGate.java b/src/main/java/mods/natura/blocks/NFenceGate.java
@@ -1,14 +1,17 @@
 package mods.natura.blocks;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 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;
+
 public class NFenceGate extends BlockFenceGate {
+
     Block modelBlock;
     int modelMeta;
 

diff --git a/src/main/java/mods/natura/blocks/NLadder.java b/src/main/java/mods/natura/blocks/NLadder.java
@@ -1,17 +1,21 @@
 package mods.natura.blocks;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 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;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class NLadder extends BlockLadder {
+
     public String[] textureNames;
     public IIcon[] icons;
 

diff --git a/src/main/java/mods/natura/blocks/NPressurePlate.java b/src/main/java/mods/natura/blocks/NPressurePlate.java
@@ -1,15 +1,18 @@
 package mods.natura.blocks;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import mods.natura.common.NaturaTab;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPressurePlate;
 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;
+
 public class NPressurePlate extends BlockPressurePlate {
+
     Block modelBlock;
     int modelMeta;