From 222c7eb0c82ce277d7f6767f289748438c178d5d Mon Sep 17 00:00:00 2001 From: makeo Date: Mon, 21 Dec 2015 20:10:33 +0100 Subject: [PATCH] -Added temporary obisidian golem --- .../golems/types/ObsidianGolemType.java | 49 ++++++++++++++++++ .../registration/RegisteredGolemStuff.java | 3 ++ .../assets/gadomancy/lang/en_US.lang | 1 + .../textures/items/golem_obsidian.png | Bin 0 -> 547 bytes .../textures/models/golem_obsidian.png | Bin 0 -> 5357 bytes 5 files changed, 53 insertions(+) create mode 100644 src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java create mode 100644 src/main/resources/assets/gadomancy/textures/items/golem_obsidian.png create mode 100644 src/main/resources/assets/gadomancy/textures/models/golem_obsidian.png 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 0000000000000000000000000000000000000000..7b8668e50c26c92eaf8ac8779f066225e4745f45 GIT binary patch literal 547 zcmV+;0^I$HP)D+r9>D>_X;f1H000McNliru-wYKCCm+@m9)|z`0kBC# zK~y-)wUf>;cbK0Gq{q4+uX5oKYH`tMGup_^VQNKF4Gdz^GzXian zlPARKnYtFhw>xrp_Yr9x^Ze*B01dmpLRW=c_JIE@g1N=lM!3ZTlW5Yw>HG(*ySrZfP{a7nTmm6Z9iW|!#8 zdm4sK!>}ou>6L@d$q4;)300E@s zZc6BFt({11ozt^7XgZx$n^k|~7EUAJT7bamNfe(Fr{}frL-dBw+s3oo@<%}1?{g8K lvQim9L{LhhDgEF7*zcw1rbO3Aij4pO002ovPDHLkV1fjo_&Wdq literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..83409b1844633155a9c2af397e18c6354bdcf710 GIT binary patch literal 5357 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