update 0.2.0

- uses logger now - closed #2 - changed creative tab icon - removed log spamming - fixed ultima-god crystal
MelanX · Feb 20, 2019 · 8c81f28 · 8c81f28
1 parent 94debf4
commit 8c81f28
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 21 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
-mod_version=0.1.2
+mod_version=0.2.0
 mc_version=1.12.2
 forge_version=14.23.4.2705
 mappings_version=snapshot_20171003
diff --git a/src/main/java/de/melanx/ultimatools/SkyblockUltimaTools.java b/src/main/java/de/melanx/ultimatools/SkyblockUltimaTools.java
@@ -39,7 +39,6 @@ public static void registerItems(RegistryEvent.Register<Item> event) {
 
             for(Item item : Registry.ITEMS_TO_REGISTER) {
                 event.getRegistry().register(item);
-                System.out.println(item.getRegistryName());
             }
         }
 
@@ -54,8 +53,8 @@ public static  void registerModels(ModelRegistryEvent event) {
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
-        System.out.println(LibMisc.MODID + " is loading");
         logger = event.getModLog();
+        logger.info(LibMisc.MODID + " is loading");
     }
 
     @Mod.EventHandler
@@ -64,7 +63,7 @@ public void init(FMLInitializationEvent event) {
 
     @Mod.EventHandler
     public void postInit(FMLPostInitializationEvent event) {
-        System.out.println(LibMisc.MODID + " is finished.");
+        logger.info(LibMisc.MODID + " finished loading.");
     }
 
 }
diff --git a/src/main/java/de/melanx/ultimatools/client/ultimatoolsTab.java b/src/main/java/de/melanx/ultimatools/client/ultimatoolsTab.java
@@ -13,7 +13,7 @@ public ultimatoolsTab() {
 
     @Override
     public ItemStack getTabIconItem() {
-        return new ItemStack(ModItems.crystalCyan);
+        return new ItemStack(ModItems.crystalGay);
     }
 
 }
diff --git a/src/main/java/de/melanx/ultimatools/items/crystals/CrystalGay.java b/src/main/java/de/melanx/ultimatools/items/crystals/CrystalGay.java
@@ -27,6 +27,7 @@ public class CrystalGay extends CrystalBase {
 
     public CrystalGay() {
         super("ultima_god");
+        setContainerItem(this);
     }
 
     @Nonnull
@@ -88,7 +89,7 @@ else if(!world.isRemote) {
             if(player.isSneaking()) {
                 if(block == Blocks.GRASS || block == Blocks.DIRT) {
                     Random rand = new Random();
-                    int x = rand.nextInt(10);
+                    int x = rand.nextInt(9);
                     if(x == 0) {
                         EntityCow entityCow = new EntityCow(world);
                         entityCow.setGrowingAge(-24000);
@@ -125,21 +126,16 @@ else if(!world.isRemote) {
                         entityParrot.setLocationAndAngles(pos.getX() + hitX, pos.getY() + hitY, pos.getZ() + hitZ, 0, 0);
                         world.spawnEntity(entityParrot);
                     } else if(x == 7) {
-                        EntityParrot entityParrot = new EntityParrot(world);
-                        entityParrot.setGrowingAge(-24000);
-                        entityParrot.setLocationAndAngles(pos.getX() + hitX, pos.getY() + hitY, pos.getZ() + hitZ, 0, 0);
-                        world.spawnEntity(entityParrot);
-                    } else if(x == 8) {
                         EntityPig entityPig = new EntityPig(world);
                         entityPig.setGrowingAge(-24000);
                         entityPig.setLocationAndAngles(pos.getX() + hitX, pos.getY() + hitY, pos.getZ() + hitZ, 0, 0);
                         world.spawnEntity(entityPig);
-                    } else if(x == 9) {
+                    } else if(x == 8) {
                         EntityRabbit entityRabbit = new EntityRabbit(world);
                         entityRabbit.setGrowingAge(-24000);
                         entityRabbit.setLocationAndAngles(pos.getX() + hitX, pos.getY() + hitY, pos.getZ() + hitZ, 0, 0);
                         world.spawnEntity(entityRabbit);
-                    } else if(x == 10) {
+                    } else if(x == 9) {
                         EntitySheep entitySheep = new EntitySheep(world);
                         entitySheep.setGrowingAge(-24000);
                         entitySheep.setLocationAndAngles(pos.getX() + hitX, pos.getY() + hitY, pos.getZ() + hitZ, 0, 0);

diff --git a/src/main/java/de/melanx/ultimatools/items/crystals/CrystalPink.java b/src/main/java/de/melanx/ultimatools/items/crystals/CrystalPink.java
@@ -24,7 +24,7 @@ public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos
             Block block = worldIn.getBlockState(pos).getBlock();
             if(block == Blocks.GRASS || block == Blocks.DIRT) {
                 Random rand = new Random();
-                int x = rand.nextInt(10);
+                int x = rand.nextInt(9);
                 if(x == 0) {
                     EntityCow entityCow = new EntityCow(worldIn);
                     entityCow.setGrowingAge(-24000);
@@ -61,21 +61,16 @@ public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos
                     entityParrot.setLocationAndAngles(pos.getX() + hitX, pos.getY() + hitY, pos.getZ() + hitZ, 0, 0);
                     worldIn.spawnEntity(entityParrot);
                 } else if(x == 7) {
-                    EntityParrot entityParrot = new EntityParrot(worldIn);
-                    entityParrot.setGrowingAge(-24000);
-                    entityParrot.setLocationAndAngles(pos.getX() + hitX, pos.getY() + hitY, pos.getZ() + hitZ, 0, 0);
-                    worldIn.spawnEntity(entityParrot);
-                } else if(x == 8) {
                     EntityPig entityPig = new EntityPig(worldIn);
                     entityPig.setGrowingAge(-24000);
                     entityPig.setLocationAndAngles(pos.getX() + hitX, pos.getY() + hitY, pos.getZ() + hitZ, 0, 0);
                     worldIn.spawnEntity(entityPig);
-                } else if(x == 9) {
+                } else if(x == 8) {
                     EntityRabbit entityRabbit = new EntityRabbit(worldIn);
                     entityRabbit.setGrowingAge(-24000);
                     entityRabbit.setLocationAndAngles(pos.getX() + hitX, pos.getY() + hitY, pos.getZ() + hitZ, 0, 0);
                     worldIn.spawnEntity(entityRabbit);
-                } else if(x == 10) {
+                } else if(x == 9) {
                     EntitySheep entitySheep = new EntitySheep(worldIn);
                     entitySheep.setGrowingAge(-24000);
                     entitySheep.setLocationAndAngles(pos.getX() + hitX, pos.getY() + hitY, pos.getZ() + hitZ, 0, 0);