diff --git a/.gradle/8.2.1/executionHistory/executionHistory.bin b/.gradle/8.2.1/executionHistory/executionHistory.bin index cd66888..92cc25e 100644 Binary files a/.gradle/8.2.1/executionHistory/executionHistory.bin and b/.gradle/8.2.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.2.1/executionHistory/executionHistory.lock b/.gradle/8.2.1/executionHistory/executionHistory.lock index 2204291..0fc7cc6 100644 Binary files a/.gradle/8.2.1/executionHistory/executionHistory.lock and b/.gradle/8.2.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.2.1/fileHashes/fileHashes.bin b/.gradle/8.2.1/fileHashes/fileHashes.bin index 82c5b28..183c0bd 100644 Binary files a/.gradle/8.2.1/fileHashes/fileHashes.bin and b/.gradle/8.2.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.2.1/fileHashes/fileHashes.lock b/.gradle/8.2.1/fileHashes/fileHashes.lock index 6c0d03d..f127d2c 100644 Binary files a/.gradle/8.2.1/fileHashes/fileHashes.lock and b/.gradle/8.2.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.2.1/fileHashes/resourceHashesCache.bin b/.gradle/8.2.1/fileHashes/resourceHashesCache.bin index 44622c4..5c8da3d 100644 Binary files a/.gradle/8.2.1/fileHashes/resourceHashesCache.bin and b/.gradle/8.2.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 962b27a..2682f8a 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index a2a8c4a..3a5afb6 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 3f70b8b..7a9dfd4 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..97af3c8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..77e9972 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..59459eb --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..c8b148c --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/modules/CinderLoE-Git.ideVirtualMain.iml b/.idea/modules/CinderLoE-Git.ideVirtualMain.iml new file mode 100644 index 0000000..00adf97 --- /dev/null +++ b/.idea/modules/CinderLoE-Git.ideVirtualMain.iml @@ -0,0 +1,13 @@ + + + + + + + MIXIN + + 1 + + + + \ No newline at end of file diff --git a/.idea/modules/CinderLoE-Git.main.iml b/.idea/modules/CinderLoE-Git.main.iml new file mode 100644 index 0000000..e3c6fcd --- /dev/null +++ b/.idea/modules/CinderLoE-Git.main.iml @@ -0,0 +1,18 @@ + + + + + + + MIXIN + + 1 + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/CinderLoE-Git.test.iml b/.idea/modules/CinderLoE-Git.test.iml new file mode 100644 index 0000000..00adf97 --- /dev/null +++ b/.idea/modules/CinderLoE-Git.test.iml @@ -0,0 +1,13 @@ + + + + + + + MIXIN + + 1 + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/run/natives/lwjgl2/OpenAL32.dll b/run/natives/lwjgl2/OpenAL32.dll new file mode 100644 index 0000000..1f69e94 Binary files /dev/null and b/run/natives/lwjgl2/OpenAL32.dll differ diff --git a/run/natives/lwjgl2/OpenAL64.dll b/run/natives/lwjgl2/OpenAL64.dll new file mode 100644 index 0000000..6f2a2fe Binary files /dev/null and b/run/natives/lwjgl2/OpenAL64.dll differ diff --git a/run/natives/lwjgl2/avutil-ttv-51.dll b/run/natives/lwjgl2/avutil-ttv-51.dll new file mode 100644 index 0000000..fc9a3a5 Binary files /dev/null and b/run/natives/lwjgl2/avutil-ttv-51.dll differ diff --git a/run/natives/lwjgl2/libmfxsw64.dll b/run/natives/lwjgl2/libmfxsw64.dll new file mode 100644 index 0000000..8314f02 Binary files /dev/null and b/run/natives/lwjgl2/libmfxsw64.dll differ diff --git a/run/natives/lwjgl2/libmp3lame-ttv.dll b/run/natives/lwjgl2/libmp3lame-ttv.dll new file mode 100644 index 0000000..803ad5a Binary files /dev/null and b/run/natives/lwjgl2/libmp3lame-ttv.dll differ diff --git a/run/natives/lwjgl2/lwjgl.dll b/run/natives/lwjgl2/lwjgl.dll new file mode 100644 index 0000000..6e9b49d Binary files /dev/null and b/run/natives/lwjgl2/lwjgl.dll differ diff --git a/run/natives/lwjgl2/lwjgl64.dll b/run/natives/lwjgl2/lwjgl64.dll new file mode 100644 index 0000000..3c9b8e9 Binary files /dev/null and b/run/natives/lwjgl2/lwjgl64.dll differ diff --git a/run/natives/lwjgl2/swresample-ttv-0.dll b/run/natives/lwjgl2/swresample-ttv-0.dll new file mode 100644 index 0000000..a7729c1 Binary files /dev/null and b/run/natives/lwjgl2/swresample-ttv-0.dll differ diff --git a/run/natives/lwjgl2/twitchsdk.dll b/run/natives/lwjgl2/twitchsdk.dll new file mode 100644 index 0000000..f21d426 Binary files /dev/null and b/run/natives/lwjgl2/twitchsdk.dll differ diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java index 21f0f10..0ed7aee 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java @@ -279,7 +279,7 @@ public class CinderLoE { event.registerServerCommand(new CommandCinderCharacter()); } - public void registerEntities() { // Last ID added: 34 + public void registerEntities() { // Last ID added: 35 GameRegistry.registerTileEntity(TileEntityMistBlock.class, "TileEntityMistBlock"); int entityID = 7320; // Always increment entityID by 1 over the last entity to ensure unique IDs @@ -298,6 +298,7 @@ public class CinderLoE { EntityRegistry.registerModEntity(FangornAuroch.class, "FangornAuroch", (entityID + 8), this, 64, 1, true); EntityRegistry.registerModEntity(FangornElk.class, "FangornElk", (entityID + 9), this, 64, 1, true); EntityRegistry.registerModEntity(FangornWolf.class, "FangornWolf", (entityID + 10), this, 64, 1, true); + EntityRegistry.registerModEntity(FangornWolf.class, "TamedCrocodile", (entityID + 35), this, 64, 1, true); EntityRegistry.registerModEntity(Limwaith.class, "Limwaith", (entityID + 31), this, 64, 1, true); EntityRegistry.registerModEntity(LimwaithWarrior.class, "LimwaithWarrior", (entityID + 11), this, 64, 1, true); @@ -513,13 +514,13 @@ public class CinderLoE { MATERIAL_ASH = getLOTRMaterialByName("ASH"); ingotAsh = new Item().setUnlocalizedName("lotr:ingotAsh").setTextureName("lotr:ingotAsh").setCreativeTab((CreativeTabs) materials); if (MATERIAL_ASH != null) { - swordAsh = (new LOTRItemSword(MATERIAL_ASH)).setUnlocalizedName("lotr:swordAsh").setTextureName("lotr:swordAsh"); - daggerAsh = (new LOTRItemDagger(MATERIAL_ASH)).setUnlocalizedName("lotr:daggerAsh").setTextureName("lotr:daggerAsh"); - hammerAsh = (new LOTRItemHammer(MATERIAL_ASH)).setUnlocalizedName("lotr:hammerAsh").setTextureName("lotr:hammerAsh"); - battleaxeAsh = (new LOTRItemBattleaxe(MATERIAL_ASH)).setUnlocalizedName("lotr:battleaxeAsh").setTextureName("lotr:battleaxeAsh"); - bowAsh = (new LOTRItemBow(MATERIAL_ASH)).setUnlocalizedName("lotr:bowAsh").setTextureName("lotr:bowAsh"); - pikeAsh = (new LOTRItemPike(MATERIAL_ASH)).setUnlocalizedName("lotr:pikeAsh").setTextureName("lotr:pikeAsh"); - spearAsh = (new LOTRItemSpear(MATERIAL_ASH)).setUnlocalizedName("lotr:spearAsh").setTextureName("lotr:spearAsh"); + swordAsh = (new LOTRItemSword(MATERIAL_ASH)).addWeaponDamage(4.25F).setUnlocalizedName("lotr:swordAsh").setTextureName("lotr:swordAsh"); + daggerAsh = (new LOTRItemDagger(MATERIAL_ASH)).addWeaponDamage(6.75F).setUnlocalizedName("lotr:daggerAsh").setTextureName("lotr:daggerAsh"); + hammerAsh = (new LOTRItemHammer(MATERIAL_ASH)).addWeaponDamage(5.5F).setUnlocalizedName("lotr:hammerAsh").setTextureName("lotr:hammerAsh"); + battleaxeAsh = (new LOTRItemBattleaxe(MATERIAL_ASH)).addWeaponDamage(5.5F).setUnlocalizedName("lotr:battleaxeAsh").setTextureName("lotr:battleaxeAsh"); + bowAsh = (new LOTRItemBow(MATERIAL_ASH)).setDrawTime(16).setUnlocalizedName("lotr:bowAsh").setTextureName("lotr:bowAsh"); + pikeAsh = (new LOTRItemPike(MATERIAL_ASH)).addWeaponDamage(5.0F).setUnlocalizedName("lotr:pikeAsh").setTextureName("lotr:pikeAsh"); + spearAsh = (new LOTRItemSpear(MATERIAL_ASH)).addWeaponDamage(5.0F).setUnlocalizedName("lotr:spearAsh").setTextureName("lotr:spearAsh"); ItemRegistration.registerItem(ingotAsh, "ingotAsh", 74); @@ -725,6 +726,7 @@ public class CinderLoE { RenderingRegistry.registerEntityRenderingHandler(LimwaithBannerBearer.class, new RenderLimwaith()); RenderingRegistry.registerEntityRenderingHandler(LimwaithChieftain.class, new RenderLimwaith()); + RenderingRegistry.registerEntityRenderingHandler(LimwaithCrocodile.class, new RenderTamedCrocodile()); RenderingRegistry.registerEntityRenderingHandler(FangornBear.class, new RenderFangornBear()); RenderingRegistry.registerEntityRenderingHandler(FangornWildBoar.class, new RenderFangornWildBoar()); RenderingRegistry.registerEntityRenderingHandler(FangornAuroch.class, new RenderFangornAuroch()); @@ -979,6 +981,7 @@ public class CinderLoE { CinderCore.registerEntityFallback(LimwaithBannerBearer.class, LOTREntityMoredainBannerBearer.class, "cinder_loe", "1.0"); CinderCore.registerEntityFallback(LimwaithChieftain.class, LOTREntityMoredainChieftain.class, "cinder_loe", "1.0"); + CinderCore.registerEntityFallback(LimwaithCrocodile.class, LOTREntityCrocodile.class, "cinder_loe", "1.2"); CinderCore.registerEntityFallback(FangornBear.class, LOTREntityBear.class, "cinder_loe", "1.0"); CinderCore.registerEntityFallback(FangornWildBoar.class, LOTREntityWildBoar.class, "cinder_loe", "1.0"); CinderCore.registerEntityFallback(FangornAuroch.class, LOTREntityAurochs.class, "cinder_loe", "1.0"); diff --git a/src/main/java/com/zivilon/cinder_loe/Materials.java b/src/main/java/com/zivilon/cinder_loe/Materials.java index feeb5d7..06c4aec 100644 --- a/src/main/java/com/zivilon/cinder_loe/Materials.java +++ b/src/main/java/com/zivilon/cinder_loe/Materials.java @@ -21,7 +21,7 @@ public class Materials { modifyMaterial("EVENT", 2400, 5.0F, 0.0F, 0, 9.0F, 10, null); modifyMaterial("BREE", 350, 2.5F, 0.6F, 2, 6.0F, 10, Items.iron_ingot); modifyMaterial("BATTLENUN", 300, 3F, 0.6F, 2, 6.0F, 10, Items.iron_ingot); - modifyMaterial("ASH", 2000, 4.25F, 0.6F, 2, 7.0F, 10, CinderLoE.ingotAsh); + modifyMaterial("ASH", 2000, 0.0F, 0.6F, 2, 7.0F, 10, CinderLoE.ingotAsh); } public static void modifyMaterial(String fieldName, int uses, float weapon_damage, float protection, int harvest_level, float speed, int enchantability, Item crafting_item) { diff --git a/src/main/java/com/zivilon/cinder_loe/client/render/RenderTamedCrocodile.java b/src/main/java/com/zivilon/cinder_loe/client/render/RenderTamedCrocodile.java new file mode 100644 index 0000000..8aefe9c --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/client/render/RenderTamedCrocodile.java @@ -0,0 +1,21 @@ +package com.zivilon.cinder_loe.client.render; + +import lotr.client.model.LOTRModelBoar; +import lotr.client.model.LOTRModelCrocodile; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; + +public class RenderTamedCrocodile extends RenderLiving { + public static ResourceLocation crocskin = new ResourceLocation("lotr:mob/crocodile.png"); + + public RenderTamedCrocodile() { + super((ModelBase)new LOTRModelCrocodile(), 0.7F); + setRenderPassModel((ModelBase)new LOTRModelCrocodile()); + } + + protected ResourceLocation getEntityTexture(Entity entity) { + return crocskin; + } +} diff --git a/src/main/java/com/zivilon/cinder_loe/entity/LimwaithCrocodile.java b/src/main/java/com/zivilon/cinder_loe/entity/LimwaithCrocodile.java new file mode 100644 index 0000000..8e03883 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/entity/LimwaithCrocodile.java @@ -0,0 +1,144 @@ +package com.zivilon.cinder_loe.entity; + +import com.zivilon.cinder_loe.CinderLoE; +import lotr.common.LOTRLevelData; +import lotr.common.LOTRMod; +import lotr.common.entity.LOTREntities; +import lotr.common.entity.ai.LOTREntityAIAttackOnCollide; +import lotr.common.entity.ai.LOTREntityAIFollowHiringPlayer; +import lotr.common.entity.ai.LOTREntityAIHiredRemainStill; +import lotr.common.entity.npc.LOTREntityNPC; +import lotr.common.entity.npc.LOTREntityNPCRideable; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +public class LimwaithCrocodile extends LOTREntityNPCRideable { + public LimwaithCrocodile(World world) { + super(world); + this.setSize(2.1f, 0.7f); + ((EntityLiving) this).tasks.addTask(0, (EntityAIBase) new EntityAISwimming((EntityLiving) this)); + ((EntityLiving) this).tasks.addTask(1, (EntityAIBase) new LOTREntityAIHiredRemainStill(this)); + ((EntityLiving) this).tasks.addTask(2, (EntityAIBase) new LOTREntityAIAttackOnCollide(this, 1.5D, false)); + ((EntityLiving) this).tasks.addTask(3, (EntityAIBase) new LOTREntityAIFollowHiringPlayer(this)); + ((EntityLiving) this).tasks.addTask(4, (EntityAIBase) new EntityAIWander(this, 1.0D)); + ((EntityLiving) this).tasks.addTask(5, (EntityAIBase) new EntityAIWatchClosest2((EntityLiving) this, EntityPlayer.class, 8.0F, 0.02F)); + ((EntityLiving) this).tasks.addTask(6, (EntityAIBase) new EntityAIWatchClosest2((EntityLiving) this, LOTREntityNPC.class, 12.0F, 0.02F)); + ((EntityLiving) this).tasks.addTask(7, (EntityAIBase) new EntityAIWatchClosest((EntityLiving) this, EntityLiving.class, 8.0F, 0.02F)); + ((EntityLiving) this).tasks.addTask(8, (EntityAIBase) new EntityAILookIdle((EntityLiving) this)); + + this.addTargetTasks(true); + this.spawnsInDarkness = true; + } + + protected void entityInit() { + super.entityInit(); + ((Entity) this).getDataWatcher().addObject(20, (Object) 0); + } + + protected void applyEntityAttributes() { + super.applyEntityAttributes(); + getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(30.0D); + getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.2D); + getAttributeMap().registerAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(8.0D); + } + + public int getSnapTime() { + return ((Entity) this).getDataWatcher().getWatchableObjectInt(20); + } + + public void setSnapTime(int i) { + ((Entity) this).getDataWatcher().updateObject(20, (Object) i); + } + + public boolean isAIEnabled() { + return true; + } + + public boolean canBreatheUnderwater() { + return true; + } + + + public boolean attackEntityAsMob(Entity entity) { + boolean flag = super.attackEntityAsMob(entity); + if (flag) { + if (!((Entity) this).worldObj.isRemote) { + this.setSnapTime(20); + } + ((Entity) this).worldObj.playSoundAtEntity((Entity) this, "lotr:crocodile.snap", this.getSoundVolume(), this.getSoundPitch()); + } + return flag; + } + protected void dropFewItems(boolean flag, int i) { + int hides = 2 + rand.nextInt(3) + rand.nextInt(1 + i); + for (int l = 0; l < hides; l++) + dropItem(Items.bone, 1); + int meats = 2 + rand.nextInt(3) + rand.nextInt(1 + i); + for (int j = 0; j < meats; j++) { + if (isBurning()) { + dropItem(Items.fish, 1); + } else { + dropItem(Items.leather, 1); + } + } + dropItem(LOTRMod.zebraRaw, 1); + } + protected String getLivingSound() { + return "lotr:crocodile.say"; + } + + protected String getHurtSound() { + return "lotr:crocodile.say"; + } + + protected String getDeathSound() { + return "lotr:crocodile.death"; + } + + public void attackEntityWithRangedAttack(EntityLivingBase target, float distanceFactor) { + // No ranged attack implemented + } + + @Override + public ItemStack getPickedResult(MovingObjectPosition target) { + return new ItemStack(LOTRMod.spawnEgg, 1, LOTREntities.getEntityID((Entity) this)); + } + + @Override + public boolean isMountSaddled() { + return this.isNPCTamed() && ((Entity) this).riddenByEntity instanceof EntityPlayer; + } + + @Override + public boolean getBelongsToNPC() { + return false; + } + + @Override + public void setBelongsToNPC(boolean flag) { + } + + @Override + public String getMountArmorTexture() { + return null; + } + + public void onLivingUpdate() { + super.onLivingUpdate(); + if (!((Entity) this).worldObj.isRemote) { + Entity rider = ((Entity) this).riddenByEntity; + } + if (!((Entity) this).worldObj.isRemote && ((Entity) this).riddenByEntity instanceof EntityPlayer && LOTRLevelData.getData((EntityPlayer) ((Entity) this).riddenByEntity).getAlignment(this.getFaction()) < 50.0f) { + ((Entity) this).riddenByEntity.mountEntity(null); + } + } +} diff --git a/src/main/resources/LICENSE b/src/main/resources/LICENSE index be08a1d..e69de29 100644 --- a/src/main/resources/LICENSE +++ b/src/main/resources/LICENSE @@ -1,88 +0,0 @@ -Code of CinderLoE is marked with CC0 1.0 Universal. To view a copy of this license, visit http://creativecommons.org/publicdomain/zero/1.0 -License not applicable to graphics contained within the package. - -Graphics: -KeyLime17 & cleric_red: (All rights reserved) -- assets/cinder_loe/mob/limwaith/* -- assets/lotr/armor/* -- assets/lotr/item/banner/banner_redDwarf.png -- assets/lotr/textures/blocks/bars_red_dwarf.png -- assets/lotr/textures/blocks/chandelier_red_dwarf.png -- assets/lotr/textures/blocks/red_dwarf_steel.png -- assets/lotr/textures/items/alatarStaff.png -- assets/lotr/textures/items/pallandoStaff.png -- assets/lotr/textures/items/radagastStaff.png -- assets/lotr/textures/items/sarumanStaff.png -- assets/lotr/textures/items/banner_redDwarf.png -- assets/lotr/textures/items/battleaxeLimwaith.png -- assets/lotr/textures/items/blowgunLimwaith.png -- assets/lotr/textures/items/daggerLimwaith.png -- assets/lotr/textures/items/daggerLimwaithPoisoned.png -- assets/lotr/textures/items/tridentLimwaith.png -- assets/lotr/textures/items/truncheonLimwaith.png -- assets/lotr/textures/items/spearLimwaith.png -- assets/lotr/textures/items/helmetLimwaith.png -- assets/lotr/textures/items/bodyLimwaith.png -- assets/lotr/textures/items/legsLimwaith.png -- assets/lotr/textures/items/bootsLimwaith.png -- assets/lotr/textures/items/battleaxeRedDwarf.png -- assets/lotr/textures/items/crossbowRedDwarf.png -- assets/lotr/textures/items/crossbowRedDwarf_pull_0.png -- assets/lotr/textures/items/crossbowRedDwarf_pull_1.png -- assets/lotr/textures/items/crossbowRedDwarf_pull_2.png -- assets/lotr/textures/items/daggerRedDwarf.png -- assets/lotr/textures/items/daggerRedDwarfPoisoned.png -- assets/lotr/textures/items/hammerRedDwarf.png -- assets/lotr/textures/items/pikeRedDwarf.png -- assets/lotr/textures/items/spearRedDwarf.png -- assets/lotr/textures/items/swordRedDwarf.png -- assets/lotr/textures/items/redDwarfSteel.png -- assets/lotr/textures/items/helmetRedDwarf.png -- assets/lotr/textures/items/bodyRedDwarf.png -- assets/lotr/textures/items/legsRedDwarf.png -- assets/lotr/textures/items/bootsRedDwarf.png -- assets/lotr/textures/items/boarArmorRedDwarf.png -- assets/lotr/textures/items/large/alatarStaff.png -- assets/lotr/textures/items/large/pallandoStaff.png -- assets/lotr/textures/items/large/radagastStaff.png -- assets/lotr/textures/items/large/sarumanStaff.png -- assets/lotr/textures/items/large/battleaxeLimwaith.png -- assets/lotr/textures/items/large/tridentLimwaith.png -- assets/lotr/textures/items/large/spearLimwaith.png -- assets/lotr/textures/items/large/spearRedDwarf.png -- assets/lotr/textures/items/large2/pikeRedDwarf.png -- assets/lotr/textures/shield/alignment_RedDwarf.png - -LOTRMod team: (All rights reserved) -- assets/lotr/textures/blocks/fur_bundle_bottom.png -- assets/lotr/textures/blocks/fur_bundle_top.png -- assets/lotr/textures/blocks/fur_bundle_side_0.png -- assets/lotr/textures/blocks/fur_bundle_side_90.png -- assets/lotr/textures/blocks/fur_bundle_side_180.png -- assets/lotr/textures/blocks/fur_bundle_side_270.png -- assets/lotr/textures/blocks/leather_bundle_bottom.png -- assets/lotr/textures/blocks/leather_bundle_top.png -- assets/lotr/textures/blocks/leather_bundle_side_0.png -- assets/lotr/textures/blocks/leather_bundle_side_90.png -- assets/lotr/textures/blocks/leather_bundle_side_180.png -- assets/lotr/textures/blocks/leather_bundle_side_270.png -- assets/lotr/textures/blocks/reed_bale_bottom.png -- assets/lotr/textures/blocks/reed_bale_top.png -- assets/lotr/textures/blocks/reed_bale_side_0.png -- assets/lotr/textures/blocks/reed_bale_side_90.png -- assets/lotr/textures/blocks/reed_bale_side_180.png -- assets/lotr/textures/blocks/reed_bale_side_270.png -- assets/lotr/textures/items/gandalfStaffGrey.png -- assets/lotr/textures/items/gandalfStaffWhite.png -- assets/lotr/textures/items/large/gandalfStaffGrey.png -- assets/lotr/textures/items/large/gandalfStaffWhite.png - - -Mojang: (All rights reserved) -- assets/lotr/textures/items/spawn_egg.png - -Unidentified: (Assume all rights reserved) -- assets/lotr/textures/blocks/cinder_block.png -- assets/lotr/textures/blocks/ivory_block_top.png -- assets/lotr/textures/blocks/ivory_block_side_0.png -- assets/lotr/textures/blocks/ivory_block_side_90.png diff --git a/src/main/resources/assets/cinder_loe/mob/limwaith/shaman_outfit/0.png b/src/main/resources/assets/cinder_loe/mob/limwaith/shaman_outfit/0.png new file mode 100644 index 0000000..0701de5 Binary files /dev/null and b/src/main/resources/assets/cinder_loe/mob/limwaith/shaman_outfit/0.png differ diff --git a/src/main/resources/assets/cinder_loe/speech/limwaith/shaman/friendly.txt b/src/main/resources/assets/cinder_loe/speech/limwaith/shaman/friendly.txt new file mode 100644 index 0000000..070b080 --- /dev/null +++ b/src/main/resources/assets/cinder_loe/speech/limwaith/shaman/friendly.txt @@ -0,0 +1,15 @@ +I have many oddities from the groves. What would you like? +Some call it witchery. I call it medicine. +Our swamp water invigorates even the weakest wanderer! +What remedies can I offer you, #? +Are you sick, #? I can heal many things! +My bonemold recipes are the best in the Swamps! +Banana bread is such a disgrace to good breads. +Do you have any delicious fish for me, #? +I'll buy lots of bone, if you have them, #. +My darts are the sharpest in all the groves! +I might have just what you are looking for, #. +What can I get for you, #, warrior of the tribe? +I hope you have enough silver, #. +My goods aren't pricey, but they're not cheap either, #. +You could use some strength, #. I may have just the thing! \ No newline at end of file diff --git a/src/main/resources/assets/cinder_loe/speech/limwaith/shaman/hostile.txt b/src/main/resources/assets/cinder_loe/speech/limwaith/shaman/hostile.txt new file mode 100644 index 0000000..c84fbd8 --- /dev/null +++ b/src/main/resources/assets/cinder_loe/speech/limwaith/shaman/hostile.txt @@ -0,0 +1,11 @@ +No more dealings with you, #! +Thieves! Mongrels! Slaves of the Enemy! You are all dead in my eyes. +Jungle dweller! You will get nothing but death from me! +How foolish of you to come here, #! +The beasts of the waters will tear you apart! +There is no hope for you now, #! +What makes you think you deserve what I have to sell, #? +I will boil you down in a cauldron! +The Jungles do not protect you here! +Our warriors will crush you, savage! +I will not trade with a savage out of the jungle! \ No newline at end of file diff --git a/src/main/resources/assets/cinder_loe/speech/limwaith/shaman/neutral.txt b/src/main/resources/assets/cinder_loe/speech/limwaith/shaman/neutral.txt new file mode 100644 index 0000000..b46ddd4 --- /dev/null +++ b/src/main/resources/assets/cinder_loe/speech/limwaith/shaman/neutral.txt @@ -0,0 +1,10 @@ +You don't quite have my trust yet, #. Come back another day! +I don't want your fish, #. +Prove your friendship with our people, and then you may buy from me. +You look like trouble, #. +I doubt you have enough money for my goods. +You don't look like one of us. +I bet you like banana bread, #. Fool! +You are not a friend of my people, #. Begone. +I doubt you are any better than those savage jungle dwellers, #. +Mind yourself, #. It is unwise to make enemies in the groves. \ No newline at end of file diff --git a/src/main/resources/assets/lotr/armor/bonemold_1.png b/src/main/resources/assets/lotr/armor/bonemold_1.png new file mode 100644 index 0000000..9f85741 Binary files /dev/null and b/src/main/resources/assets/lotr/armor/bonemold_1.png differ diff --git a/src/main/resources/assets/lotr/armor/bonemold_2.png b/src/main/resources/assets/lotr/armor/bonemold_2.png new file mode 100644 index 0000000..1d18d3e Binary files /dev/null and b/src/main/resources/assets/lotr/armor/bonemold_2.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/bronzeChain_bottom.png b/src/main/resources/assets/lotr/textures/blocks/bronzeChain_bottom.png new file mode 100644 index 0000000..5cfcd06 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/bronzeChain_bottom.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/bronzeChain_mid.png b/src/main/resources/assets/lotr/textures/blocks/bronzeChain_mid.png new file mode 100644 index 0000000..069555b Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/bronzeChain_mid.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/bronzeChain_single.png b/src/main/resources/assets/lotr/textures/blocks/bronzeChain_single.png new file mode 100644 index 0000000..f55d397 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/bronzeChain_single.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/bronzeChain_top.png b/src/main/resources/assets/lotr/textures/blocks/bronzeChain_top.png new file mode 100644 index 0000000..4713718 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/bronzeChain_top.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/cobbleDrystone.png b/src/main/resources/assets/lotr/textures/blocks/cobbleDrystone.png new file mode 100644 index 0000000..646d702 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/cobbleDrystone.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/cutDrystone.png b/src/main/resources/assets/lotr/textures/blocks/cutDrystone.png new file mode 100644 index 0000000..315ee0c Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/cutDrystone.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/reeflessCoral.png b/src/main/resources/assets/lotr/textures/blocks/reeflessCoral.png new file mode 100644 index 0000000..ef49e3e Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/reeflessCoral.png differ diff --git a/src/main/resources/assets/lotr/textures/items/battleaxeAsh.png b/src/main/resources/assets/lotr/textures/items/battleaxeAsh.png new file mode 100644 index 0000000..7b1b6ee Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/battleaxeAsh.png differ diff --git a/src/main/resources/assets/lotr/textures/items/bodyboneLimwaith.png b/src/main/resources/assets/lotr/textures/items/bodyboneLimwaith.png new file mode 100644 index 0000000..dc6b065 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/bodyboneLimwaith.png differ diff --git a/src/main/resources/assets/lotr/textures/items/bonemold.png b/src/main/resources/assets/lotr/textures/items/bonemold.png new file mode 100644 index 0000000..53a5f55 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/bonemold.png differ diff --git a/src/main/resources/assets/lotr/textures/items/bootsboneLimwaith.png b/src/main/resources/assets/lotr/textures/items/bootsboneLimwaith.png new file mode 100644 index 0000000..9e057b5 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/bootsboneLimwaith.png differ diff --git a/src/main/resources/assets/lotr/textures/items/bowAsh.png b/src/main/resources/assets/lotr/textures/items/bowAsh.png new file mode 100644 index 0000000..c8598ee Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/bowAsh.png differ diff --git a/src/main/resources/assets/lotr/textures/items/bronzeChain.png b/src/main/resources/assets/lotr/textures/items/bronzeChain.png new file mode 100644 index 0000000..43e2cae Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/bronzeChain.png differ diff --git a/src/main/resources/assets/lotr/textures/items/daggerAsh.png b/src/main/resources/assets/lotr/textures/items/daggerAsh.png new file mode 100644 index 0000000..2d24517 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/daggerAsh.png differ diff --git a/src/main/resources/assets/lotr/textures/items/daggerAsh.png.mcmeta b/src/main/resources/assets/lotr/textures/items/daggerAsh.png.mcmeta new file mode 100644 index 0000000..762e94b --- /dev/null +++ b/src/main/resources/assets/lotr/textures/items/daggerAsh.png.mcmeta @@ -0,0 +1,69 @@ +{ + "animation": { + "frames": [ + 0, + 1, + 1, + 2, + 2, + 3, + 3, + 4, + 4, + 5, + 5, + 6, + 6, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7, + 7 + ] + } +} diff --git a/src/main/resources/assets/lotr/textures/items/helmetboneLimwaith.png b/src/main/resources/assets/lotr/textures/items/helmetboneLimwaith.png new file mode 100644 index 0000000..8f78e1b Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/helmetboneLimwaith.png differ diff --git a/src/main/resources/assets/lotr/textures/items/ingotAsh.png b/src/main/resources/assets/lotr/textures/items/ingotAsh.png new file mode 100644 index 0000000..c2b118e Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/ingotAsh.png differ diff --git a/src/main/resources/assets/lotr/textures/items/ingotAsh.png.mcmeta b/src/main/resources/assets/lotr/textures/items/ingotAsh.png.mcmeta new file mode 100644 index 0000000..6580237 --- /dev/null +++ b/src/main/resources/assets/lotr/textures/items/ingotAsh.png.mcmeta @@ -0,0 +1,53 @@ +{ + "animation": { + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 2, + 2, + 3, + 3, + 4, + 4, + 5, + 5, + 6, + 6, + 7, + 7, + 8, + 8, + 7, + 7, + 6, + 6, + 5, + 5, + 4, + 4, + 3, + 3, + 2, + 2, + 1, + 1 + ] + } +} diff --git a/src/main/resources/assets/lotr/textures/items/large/battleaxeAsh.png b/src/main/resources/assets/lotr/textures/items/large/battleaxeAsh.png new file mode 100644 index 0000000..cee1eda Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/large/battleaxeAsh.png differ diff --git a/src/main/resources/assets/lotr/textures/items/large/battleaxeAsh.png.mcmeta b/src/main/resources/assets/lotr/textures/items/large/battleaxeAsh.png.mcmeta new file mode 100644 index 0000000..e3143f5 --- /dev/null +++ b/src/main/resources/assets/lotr/textures/items/large/battleaxeAsh.png.mcmeta @@ -0,0 +1,43 @@ +{ + "animation": { + "frames": [ + 8, + 8, + 8, + 7, + 7, + 7, + 6, + 6, + 6, + 5, + 5, + 5, + 4, + 4, + 4, + 3, + 3, + 3, + 2, + 2, + 2, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] + } +} diff --git a/src/main/resources/assets/lotr/textures/items/large/bowAsh.png b/src/main/resources/assets/lotr/textures/items/large/bowAsh.png new file mode 100644 index 0000000..4cb3bbe Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/large/bowAsh.png differ diff --git a/src/main/resources/assets/lotr/textures/items/large/bowAsh_pull_0.png b/src/main/resources/assets/lotr/textures/items/large/bowAsh_pull_0.png new file mode 100644 index 0000000..8564bfd Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/large/bowAsh_pull_0.png differ diff --git a/src/main/resources/assets/lotr/textures/items/large/bowAsh_pull_1.png b/src/main/resources/assets/lotr/textures/items/large/bowAsh_pull_1.png new file mode 100644 index 0000000..837cb15 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/large/bowAsh_pull_1.png differ diff --git a/src/main/resources/assets/lotr/textures/items/large/bowAsh_pull_2.png b/src/main/resources/assets/lotr/textures/items/large/bowAsh_pull_2.png new file mode 100644 index 0000000..920b514 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/large/bowAsh_pull_2.png differ diff --git a/src/main/resources/assets/lotr/textures/items/large/hammerAsh.png b/src/main/resources/assets/lotr/textures/items/large/hammerAsh.png new file mode 100644 index 0000000..607519c Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/large/hammerAsh.png differ diff --git a/src/main/resources/assets/lotr/textures/items/large/hammerAsh.png.mcmeta b/src/main/resources/assets/lotr/textures/items/large/hammerAsh.png.mcmeta new file mode 100644 index 0000000..e3143f5 --- /dev/null +++ b/src/main/resources/assets/lotr/textures/items/large/hammerAsh.png.mcmeta @@ -0,0 +1,43 @@ +{ + "animation": { + "frames": [ + 8, + 8, + 8, + 7, + 7, + 7, + 6, + 6, + 6, + 5, + 5, + 5, + 4, + 4, + 4, + 3, + 3, + 3, + 2, + 2, + 2, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] + } +} diff --git a/src/main/resources/assets/lotr/textures/items/large/spearAsh.png b/src/main/resources/assets/lotr/textures/items/large/spearAsh.png new file mode 100644 index 0000000..1a0814e Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/large/spearAsh.png differ diff --git a/src/main/resources/assets/lotr/textures/items/large/spearAsh.png.mcmeta b/src/main/resources/assets/lotr/textures/items/large/spearAsh.png.mcmeta new file mode 100644 index 0000000..e3143f5 --- /dev/null +++ b/src/main/resources/assets/lotr/textures/items/large/spearAsh.png.mcmeta @@ -0,0 +1,43 @@ +{ + "animation": { + "frames": [ + 8, + 8, + 8, + 7, + 7, + 7, + 6, + 6, + 6, + 5, + 5, + 5, + 4, + 4, + 4, + 3, + 3, + 3, + 2, + 2, + 2, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] + } +} diff --git a/src/main/resources/assets/lotr/textures/items/large/swordAsh.png b/src/main/resources/assets/lotr/textures/items/large/swordAsh.png new file mode 100644 index 0000000..df60e7a Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/large/swordAsh.png differ diff --git a/src/main/resources/assets/lotr/textures/items/large/swordAsh.png.mcmeta b/src/main/resources/assets/lotr/textures/items/large/swordAsh.png.mcmeta new file mode 100644 index 0000000..e3143f5 --- /dev/null +++ b/src/main/resources/assets/lotr/textures/items/large/swordAsh.png.mcmeta @@ -0,0 +1,43 @@ +{ + "animation": { + "frames": [ + 8, + 8, + 8, + 7, + 7, + 7, + 6, + 6, + 6, + 5, + 5, + 5, + 4, + 4, + 4, + 3, + 3, + 3, + 2, + 2, + 2, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] + } +} diff --git a/src/main/resources/assets/lotr/textures/items/large2/pikeAsh.png b/src/main/resources/assets/lotr/textures/items/large2/pikeAsh.png new file mode 100644 index 0000000..73fcfef Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/large2/pikeAsh.png differ diff --git a/src/main/resources/assets/lotr/textures/items/large2/pikeAsh.png.mcmeta b/src/main/resources/assets/lotr/textures/items/large2/pikeAsh.png.mcmeta new file mode 100644 index 0000000..6abaaed --- /dev/null +++ b/src/main/resources/assets/lotr/textures/items/large2/pikeAsh.png.mcmeta @@ -0,0 +1,49 @@ +{ + "animation": { + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 10, + 10, + 10, + 9, + 9, + 9, + 8, + 8, + 8, + 7, + 7, + 7, + 6, + 6, + 6, + 5, + 5, + 5, + 4, + 4, + 4, + 3, + 3, + 3, + 2, + 2, + 2, + 1, + 1, + 1 + ] + } +} diff --git a/src/main/resources/assets/lotr/textures/items/legsboneLimwaith.png b/src/main/resources/assets/lotr/textures/items/legsboneLimwaith.png new file mode 100644 index 0000000..5528d0d Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/legsboneLimwaith.png differ diff --git a/src/main/resources/assets/lotr/textures/items/pikeAsh.png b/src/main/resources/assets/lotr/textures/items/pikeAsh.png new file mode 100644 index 0000000..2bf4ba1 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/pikeAsh.png differ diff --git a/src/main/resources/assets/lotr/textures/items/spearAsh.png b/src/main/resources/assets/lotr/textures/items/spearAsh.png new file mode 100644 index 0000000..29950ac Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/spearAsh.png differ diff --git a/src/main/resources/assets/lotr/textures/items/swordAsh.png b/src/main/resources/assets/lotr/textures/items/swordAsh.png new file mode 100644 index 0000000..54f91ae Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/swordAsh.png differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 360f3c8..e69de29 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,21 +0,0 @@ -{ - "modListVersion": 2, - "modList": [{ - "modid": "${modId}", - "name": "${modName}", - "description": "CINDER MOD.\nMod designed to add blocks to The Lord of Embers Minecraft server.", - "version": "${modVersion}", - "mcversion": "${minecraftVersion}", - "url": "thelordofembers.com", - "updateUrl": "", - "authorList": ["Shinare"], - "credits": "", - "logoFile": "", - "screenshots": [], - "parent": "", - "requiredMods": [], - "dependencies": [], - "dependants": [], - "useDependencyInformation": true - }] -}