From e48117ef1ea6650899b59afe6b7b8929ada52db3 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Sun, 9 Aug 2020 17:55:26 +0200 Subject: [PATCH] Import fixes etc. --- src/main/java/mod/acgaming/spackenmobs/ModItems.java | 4 ++-- .../mod/acgaming/spackenmobs/entities/EntityApoRed.java | 3 --- .../acgaming/spackenmobs/entities/EntityDrachenlord.java | 2 +- .../acgaming/spackenmobs/entities/EntityIslamist.java | 3 --- .../mod/acgaming/spackenmobs/entities/EntityJens.java | 1 - .../spackenmobs/entities/EntityMarcellDAvis.java | 3 --- .../mod/acgaming/spackenmobs/entities/EntityMrBean.java | 3 --- .../acgaming/spackenmobs/entities/EntitySchalker.java | 9 +++++---- .../spackenmobs/entities/EntitySmavaCreeper.java | 2 -- .../mod/acgaming/spackenmobs/render/RenderApoRed.java | 9 --------- .../acgaming/spackenmobs/render/RenderDrachenlord.java | 5 ----- .../mod/acgaming/spackenmobs/render/RenderIslamist.java | 6 ------ .../java/mod/acgaming/spackenmobs/render/RenderJens.java | 1 - .../acgaming/spackenmobs/render/RenderMarcellDAvis.java | 6 ------ .../mod/acgaming/spackenmobs/render/RenderMrBean.java | 6 ------ .../acgaming/spackenmobs/render/RenderSmavaCreeper.java | 4 ---- 16 files changed, 8 insertions(+), 59 deletions(-) diff --git a/src/main/java/mod/acgaming/spackenmobs/ModItems.java b/src/main/java/mod/acgaming/spackenmobs/ModItems.java index 815b43e..4c70f6a 100644 --- a/src/main/java/mod/acgaming/spackenmobs/ModItems.java +++ b/src/main/java/mod/acgaming/spackenmobs/ModItems.java @@ -8,7 +8,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ModItems { @GameRegistry.ObjectHolder("spackenmobs:ram") - public static ItemRAM itemRAM; + public static ItemRAM ram; @GameRegistry.ObjectHolder("spackenmobs:ram_on_a_stick") public static ItemRAMOnAStick ram_on_a_stick; @@ -16,7 +16,7 @@ public class ModItems @SideOnly(Side.CLIENT) public static void initModels() { - itemRAM.initModel(); + ram.initModel(); ram_on_a_stick.initModel(); } } \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/entities/EntityApoRed.java b/src/main/java/mod/acgaming/spackenmobs/entities/EntityApoRed.java index 453fd83..b8be796 100644 --- a/src/main/java/mod/acgaming/spackenmobs/entities/EntityApoRed.java +++ b/src/main/java/mod/acgaming/spackenmobs/entities/EntityApoRed.java @@ -1,9 +1,6 @@ package mod.acgaming.spackenmobs.entities; import mod.acgaming.spackenmobs.Spackenmobs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.init.SoundEvents; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundEvent; import net.minecraft.world.World; diff --git a/src/main/java/mod/acgaming/spackenmobs/entities/EntityDrachenlord.java b/src/main/java/mod/acgaming/spackenmobs/entities/EntityDrachenlord.java index 1da3b61..8500c7c 100644 --- a/src/main/java/mod/acgaming/spackenmobs/entities/EntityDrachenlord.java +++ b/src/main/java/mod/acgaming/spackenmobs/entities/EntityDrachenlord.java @@ -1,5 +1,6 @@ package mod.acgaming.spackenmobs.entities; import java.util.UUID; + import javax.annotation.Nullable; import mod.acgaming.spackenmobs.Spackenmobs; @@ -15,7 +16,6 @@ import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; -import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mod/acgaming/spackenmobs/entities/EntityIslamist.java b/src/main/java/mod/acgaming/spackenmobs/entities/EntityIslamist.java index 40d13f4..0b0cb2f 100644 --- a/src/main/java/mod/acgaming/spackenmobs/entities/EntityIslamist.java +++ b/src/main/java/mod/acgaming/spackenmobs/entities/EntityIslamist.java @@ -1,9 +1,6 @@ package mod.acgaming.spackenmobs.entities; import mod.acgaming.spackenmobs.Spackenmobs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.init.SoundEvents; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundEvent; import net.minecraft.world.World; diff --git a/src/main/java/mod/acgaming/spackenmobs/entities/EntityJens.java b/src/main/java/mod/acgaming/spackenmobs/entities/EntityJens.java index b2414df..f584cdf 100644 --- a/src/main/java/mod/acgaming/spackenmobs/entities/EntityJens.java +++ b/src/main/java/mod/acgaming/spackenmobs/entities/EntityJens.java @@ -4,7 +4,6 @@ import java.util.Set; import com.google.common.collect.Sets; import mod.acgaming.spackenmobs.Spackenmobs; -import mod.acgaming.spackenmobs.proxy.CommonProxy; import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.ai.EntityAIFollowParent; import net.minecraft.entity.ai.EntityAILookIdle; diff --git a/src/main/java/mod/acgaming/spackenmobs/entities/EntityMarcellDAvis.java b/src/main/java/mod/acgaming/spackenmobs/entities/EntityMarcellDAvis.java index 37a31b6..e4fa6ed 100644 --- a/src/main/java/mod/acgaming/spackenmobs/entities/EntityMarcellDAvis.java +++ b/src/main/java/mod/acgaming/spackenmobs/entities/EntityMarcellDAvis.java @@ -1,9 +1,6 @@ package mod.acgaming.spackenmobs.entities; import mod.acgaming.spackenmobs.Spackenmobs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.init.SoundEvents; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundEvent; import net.minecraft.world.World; diff --git a/src/main/java/mod/acgaming/spackenmobs/entities/EntityMrBean.java b/src/main/java/mod/acgaming/spackenmobs/entities/EntityMrBean.java index 0bdec64..7c9b5b2 100644 --- a/src/main/java/mod/acgaming/spackenmobs/entities/EntityMrBean.java +++ b/src/main/java/mod/acgaming/spackenmobs/entities/EntityMrBean.java @@ -1,9 +1,6 @@ package mod.acgaming.spackenmobs.entities; import mod.acgaming.spackenmobs.Spackenmobs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.init.SoundEvents; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundEvent; import net.minecraft.world.World; diff --git a/src/main/java/mod/acgaming/spackenmobs/entities/EntitySchalker.java b/src/main/java/mod/acgaming/spackenmobs/entities/EntitySchalker.java index ef5813c..18d789a 100644 --- a/src/main/java/mod/acgaming/spackenmobs/entities/EntitySchalker.java +++ b/src/main/java/mod/acgaming/spackenmobs/entities/EntitySchalker.java @@ -1,12 +1,13 @@ package mod.acgaming.spackenmobs.entities; +import java.util.List; +import java.util.UUID; + +import javax.annotation.Nullable; + import com.google.common.base.Optional; import com.google.common.base.Predicate; import mod.acgaming.spackenmobs.Spackenmobs; - -import java.util.List; -import java.util.UUID; -import javax.annotation.Nullable; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.BlockPistonExtension; import net.minecraft.block.material.Material; diff --git a/src/main/java/mod/acgaming/spackenmobs/entities/EntitySmavaCreeper.java b/src/main/java/mod/acgaming/spackenmobs/entities/EntitySmavaCreeper.java index 50e9d9f..c88d9a0 100644 --- a/src/main/java/mod/acgaming/spackenmobs/entities/EntitySmavaCreeper.java +++ b/src/main/java/mod/acgaming/spackenmobs/entities/EntitySmavaCreeper.java @@ -1,9 +1,7 @@ package mod.acgaming.spackenmobs.entities; import mod.acgaming.spackenmobs.Spackenmobs; -import net.minecraft.entity.Entity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.init.SoundEvents; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundEvent; import net.minecraft.world.World; diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderApoRed.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderApoRed.java index bf152ad..fe2e5dd 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderApoRed.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderApoRed.java @@ -1,21 +1,12 @@ package mod.acgaming.spackenmobs.render; import mod.acgaming.spackenmobs.entities.EntityApoRed; -import mod.acgaming.spackenmobs.entities.EntityIslamist; -import mod.acgaming.spackenmobs.entities.EntitySmavaCreeper; -import mod.acgaming.spackenmobs.render.RenderSmavaCreeper.Factory; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelSkeleton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderBiped; -import net.minecraft.client.renderer.entity.RenderCreeper; -import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderSkeleton; import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; -import net.minecraft.client.renderer.entity.layers.LayerCreeperCharge; import net.minecraft.client.renderer.entity.layers.LayerHeldItem; -import net.minecraft.entity.Entity; import net.minecraft.entity.monster.AbstractSkeleton; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.IRenderFactory; diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderDrachenlord.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderDrachenlord.java index 4bfe336..6cc2901 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderDrachenlord.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderDrachenlord.java @@ -1,18 +1,13 @@ package mod.acgaming.spackenmobs.render; import mod.acgaming.spackenmobs.entities.EntityDrachenlord; -import mod.acgaming.spackenmobs.entities.EntitySmavaCreeper; -import mod.acgaming.spackenmobs.render.RenderSmavaCreeper.Factory; import net.minecraft.client.model.ModelZombie; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderZombie; import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.IRenderFactory; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class RenderDrachenlord extends RenderZombie { diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderIslamist.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderIslamist.java index 70163e7..c989857 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderIslamist.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderIslamist.java @@ -1,15 +1,9 @@ package mod.acgaming.spackenmobs.render; import mod.acgaming.spackenmobs.entities.EntityIslamist; -import mod.acgaming.spackenmobs.entities.EntitySmavaCreeper; -import mod.acgaming.spackenmobs.render.RenderSmavaCreeper.Factory; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelCreeper; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderCreeper; -import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.layers.LayerCreeperCharge; -import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.IRenderFactory; diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderJens.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderJens.java index f10e5e0..f8bf6a1 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderJens.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderJens.java @@ -1,7 +1,6 @@ package mod.acgaming.spackenmobs.render; import mod.acgaming.spackenmobs.entities.EntityJens; import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.model.ModelZombie; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderMarcellDAvis.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderMarcellDAvis.java index af37b0b..3b2760e 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderMarcellDAvis.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderMarcellDAvis.java @@ -1,16 +1,10 @@ package mod.acgaming.spackenmobs.render; import mod.acgaming.spackenmobs.entities.EntityMarcellDAvis; -import mod.acgaming.spackenmobs.entities.EntitySmavaCreeper; -import mod.acgaming.spackenmobs.render.RenderSmavaCreeper.Factory; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelZombie; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderBiped; -import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderZombie; import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; -import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.IRenderFactory; diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderMrBean.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderMrBean.java index 38c3027..15ccb84 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderMrBean.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderMrBean.java @@ -1,16 +1,10 @@ package mod.acgaming.spackenmobs.render; import mod.acgaming.spackenmobs.entities.EntityMrBean; -import mod.acgaming.spackenmobs.entities.EntitySmavaCreeper; -import mod.acgaming.spackenmobs.render.RenderSmavaCreeper.Factory; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelZombie; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderBiped; -import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderZombie; import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; -import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.IRenderFactory; diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderSmavaCreeper.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderSmavaCreeper.java index cb91eb2..31ed058 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderSmavaCreeper.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderSmavaCreeper.java @@ -1,13 +1,9 @@ package mod.acgaming.spackenmobs.render; import mod.acgaming.spackenmobs.entities.EntitySmavaCreeper; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelCreeper; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderCreeper; -import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.layers.LayerCreeperCharge; -import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.IRenderFactory;