diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java b/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java new file mode 100644 index 0000000..904f3d8 --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java @@ -0,0 +1,49 @@ +package makeo.gadomancy.common.entities.golems.types; + +import makeo.gadomancy.api.golems.AdditionalGolemType; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.utils.SimpleResourceLocation; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *
+ * Created by makeo @ 21.12.2015 19:29 + */ +public class ObsidianGolemType extends AdditionalGolemType { + public ObsidianGolemType() { + super(50, 15, 0.2F, true, 2, 48, 100, 6); + } + + @Override + public String getUnlocalizedName() { + return "item.ItemGolemPlacer.obsidian.name"; + } + + private IIcon icon; + @Override + public void registerIcons(IIconRegister ir) { + icon = ir.registerIcon(Gadomancy.MODID + ":golem_obsidian"); + } + + @Override + public IIcon getIcon(ItemStack stack, int pass) { + return icon; + } + + @Override + public ResourceLocation getEntityTexture() { + return new SimpleResourceLocation("models/golem_obsidian.png"); + } + + @Override + public ResourceLocation getInvSlotTexture() { + return new SimpleResourceLocation("gui/default_slot.png"); + } +} diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredGolemStuff.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredGolemStuff.java index f9cce65..3aee90f 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredGolemStuff.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredGolemStuff.java @@ -6,6 +6,7 @@ import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.entities.golems.cores.BodyguardGolemCore; import makeo.gadomancy.common.entities.golems.cores.BreakGolemCore; +import makeo.gadomancy.common.entities.golems.types.ObsidianGolemType; import makeo.gadomancy.common.entities.golems.types.SilverwoodGolemType; import makeo.gadomancy.common.entities.golems.upgrades.GolemUpgrade; import makeo.gadomancy.common.entities.golems.upgrades.GolemUpgradeRunicShield; @@ -28,12 +29,14 @@ public class RegisteredGolemStuff { public static GolemUpgradeRunicShield upgradeRunicShield; public static SilverwoodGolemType typeSilverwood; + public static ObsidianGolemType typeObsidian; public static AdditionalGolemCore breakCore; public static AdditionalGolemCore bodyguardCore; public static void init() { typeSilverwood = registerGolemType("SILVERWOOD", new SilverwoodGolemType()); + typeObsidian = registerGolemType("OBSIDIAN", new ObsidianGolemType()); breakCore = registerGolemCore("breakCore", new BreakGolemCore()); bodyguardCore = registerGolemCore("bodyguardCore", new BodyguardGolemCore()); diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index 94d9e16..5d74985 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -1,4 +1,5 @@ item.ItemGolemPlacer.silverwood.name=Silverwood Golem +item.ItemGolemPlacer.obsidian.name=Obsidian Golem item.ItemTransformationFocus.name=[WIP] Wand Focus: Transformation item.ItemFamiliar.name=Ethereal Familiar item.ItemAuraCore.name=Aura Core diff --git a/src/main/resources/assets/gadomancy/textures/items/golem_obsidian.png b/src/main/resources/assets/gadomancy/textures/items/golem_obsidian.png new file mode 100644 index 0000000..7b8668e Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/items/golem_obsidian.png differ diff --git a/src/main/resources/assets/gadomancy/textures/models/golem_obsidian.png b/src/main/resources/assets/gadomancy/textures/models/golem_obsidian.png new file mode 100644 index 0000000..83409b1 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/models/golem_obsidian.png differ