2
0
Fork 0

it works?...

frozen
KeyLime17 2 years ago
parent bd53f99b20
commit 85d3c3a30f

Binary file not shown.

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true"/> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/ideaBuild"/> <output url="file://$PROJECT_DIR$/build/ideaBuild" />
</component> </component>
</project> </project>

@ -168,6 +168,7 @@ public class CinderLoE {
//Bree //Bree
public static Item helmetBree; public static Item helmetBree;
public static Item helmetBreeKettle;
public static Item bodyBree; public static Item bodyBree;
public static Item legsBree; public static Item legsBree;
public static Item bootsBree; public static Item bootsBree;
@ -450,7 +451,7 @@ public class CinderLoE {
utumnoSlaveSpawnEgg = new CinderLoESpawnEgg(UtumnoSlaveTrader.class).setTextureName("lotr:spawn_egg"); utumnoSlaveSpawnEgg = new CinderLoESpawnEgg(UtumnoSlaveTrader.class).setTextureName("lotr:spawn_egg");
// Last ID added: 87 // Last ID added: 88
ItemRegistration.registerItem(redDwarfWarriorSpawnEgg, "redDwarfWarriorSpawnEgg", 0); ItemRegistration.registerItem(redDwarfWarriorSpawnEgg, "redDwarfWarriorSpawnEgg", 0);
ItemRegistration.registerItem(redDwarfArbalestSpawnEgg, "redDwarfArbalestSpawnEgg", 1); ItemRegistration.registerItem(redDwarfArbalestSpawnEgg, "redDwarfArbalestSpawnEgg", 1);
ItemRegistration.registerItem(redDwarfCommanderSpawnEgg, "redDwarfCommanderSpawnEgg", 2); ItemRegistration.registerItem(redDwarfCommanderSpawnEgg, "redDwarfCommanderSpawnEgg", 2);
@ -660,12 +661,14 @@ public class CinderLoE {
MATERIAL_BREE = getLOTRMaterialByName("BREE"); MATERIAL_BREE = getLOTRMaterialByName("BREE");
if (MATERIAL_BREE != null) { if (MATERIAL_BREE != null) {
helmetBree = (new LOTRItemArmor(MATERIAL_BREE, 0, "helmet")).setUnlocalizedName("lotr:helmetBree").setTextureName("lotr:helmetBree"); helmetBree = (new LOTRItemArmor(MATERIAL_BREE, 0, "helmet")).setUnlocalizedName("lotr:helmetBree").setTextureName("lotr:helmetBree");
helmetBreeKettle = (new LOTRItemArmor(MATERIAL_BREE, 0, "helmet")).setUnlocalizedName("lotr:helmetBreeKettle").setTextureName("lotr:breekettlehelmet");
bodyBree = (new LOTRItemArmor(MATERIAL_BREE, 1)).setUnlocalizedName("lotr:bodyBree").setTextureName("lotr:bodyBree"); bodyBree = (new LOTRItemArmor(MATERIAL_BREE, 1)).setUnlocalizedName("lotr:bodyBree").setTextureName("lotr:bodyBree");
legsBree = (new LOTRItemArmor(MATERIAL_BREE, 2)).setUnlocalizedName("lotr:legsBree").setTextureName("lotr:legsBree"); legsBree = (new LOTRItemArmor(MATERIAL_BREE, 2)).setUnlocalizedName("lotr:legsBree").setTextureName("lotr:legsBree");
bootsBree = (new LOTRItemArmor(MATERIAL_BREE, 3)).setUnlocalizedName("lotr:bootsBree").setTextureName("lotr:bootsBree"); bootsBree = (new LOTRItemArmor(MATERIAL_BREE, 3)).setUnlocalizedName("lotr:bootsBree").setTextureName("lotr:bootsBree");
swordBree = (new LOTRItemSword(MATERIAL_BREE)).setUnlocalizedName("lotr:swordBree").setTextureName("lotr:swordBree"); swordBree = (new LOTRItemSword(MATERIAL_BREE)).setUnlocalizedName("lotr:swordBree").setTextureName("lotr:swordBree");
ItemRegistration.registerItem(helmetBree, "helmetBree", 58); ItemRegistration.registerItem(helmetBree, "helmetBree", 58);
ItemRegistration.registerItem(helmetBreeKettle, "breekettle", 88);
ItemRegistration.registerItem(bodyBree, "bodyBree", 59); ItemRegistration.registerItem(bodyBree, "bodyBree", 59);
ItemRegistration.registerItem(legsBree, "legsBree", 60); ItemRegistration.registerItem(legsBree, "legsBree", 60);
ItemRegistration.registerItem(bootsBree, "bootsBree", 61); ItemRegistration.registerItem(bootsBree, "bootsBree", 61);
@ -962,6 +965,7 @@ public class CinderLoE {
CinderCore.registerItemFallback(Item.getIdFromItem(blowgunLimwaith), Item.getIdFromItem(LOTRMod.tauredainBlowgun), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(blowgunLimwaith), Item.getIdFromItem(LOTRMod.tauredainBlowgun), "cinder_loe", "1.0");
CinderCore.registerItemFallback(Item.getIdFromItem(helmetBree), Item.getIdFromItem(Items.iron_helmet), "cinder_loe", "1.1"); CinderCore.registerItemFallback(Item.getIdFromItem(helmetBree), Item.getIdFromItem(Items.iron_helmet), "cinder_loe", "1.1");
CinderCore.registerItemFallback(Item.getIdFromItem(helmetBreeKettle), Item.getIdFromItem(Items.iron_helmet), "cinder_loe", "1.2");
CinderCore.registerItemFallback(Item.getIdFromItem(bodyBree), Item.getIdFromItem(Items.chainmail_chestplate), "cinder_loe", "1.1"); CinderCore.registerItemFallback(Item.getIdFromItem(bodyBree), Item.getIdFromItem(Items.chainmail_chestplate), "cinder_loe", "1.1");
CinderCore.registerItemFallback(Item.getIdFromItem(legsBree), Item.getIdFromItem(Items.chainmail_leggings), "cinder_loe", "1.1"); CinderCore.registerItemFallback(Item.getIdFromItem(legsBree), Item.getIdFromItem(Items.chainmail_leggings), "cinder_loe", "1.1");
CinderCore.registerItemFallback(Item.getIdFromItem(bootsBree), Item.getIdFromItem(Items.iron_boots), "cinder_loe", "1.1"); CinderCore.registerItemFallback(Item.getIdFromItem(bootsBree), Item.getIdFromItem(Items.iron_boots), "cinder_loe", "1.1");

@ -2,16 +2,16 @@ package com.zivilon.cinder_loe.client.model;
import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;
//import lotr.client.model.LOTRModelBiped;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
/** /**
* Created using Tabula 4.1.1 * Created using Tabula 4.1.1
*/ */
public class ModelBreeHelmet extends ModelBiped { public class ModelBreeKettleHelmet extends ModelBiped {
public ModelRenderer shape9; public ModelRenderer shape9;
public ModelBreeHelmet() { public ModelBreeKettleHelmet(float f) {
super(f);
this.textureWidth = 64; this.textureWidth = 64;
this.textureHeight = 32; this.textureHeight = 32;
this.bipedHead = new ModelRenderer(this, 0, 0); this.bipedHead = new ModelRenderer(this, 0, 0);

@ -10,9 +10,6 @@ import lotr.common.entity.animal.LOTREntityHorse;
import lotr.common.entity.npc.LOTREntityGondorSoldier; import lotr.common.entity.npc.LOTREntityGondorSoldier;
import lotr.common.entity.npc.LOTREntityNPC; import lotr.common.entity.npc.LOTREntityNPC;
import lotr.common.entity.npc.LOTRNPCMount; import lotr.common.entity.npc.LOTRNPCMount;
import lotr.common.fac.LOTRFaction;
import lotr.common.quest.LOTRMiniQuest;
import lotr.common.quest.LOTRMiniQuestFactory;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
@ -23,9 +20,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World; import net.minecraft.world.World;
public class BreeOutrider extends BreeCrossbowman { public class BreeOutrider extends BreeSoldier {
protected EntityAIBase rangedAttackAI = this.createBreeRangedAttackAI(); private EntityAIBase rangedAttackAI = this.createBreeRangedAttackAI();
protected EntityAIBase meleeAttackAI; private EntityAIBase meleeAttackAI = this.addBreeAttackAI();
public BreeOutrider(World world) { public BreeOutrider(World world) {
super(world); super(world);
this.addTargetTasks(true); this.addTargetTasks(true);
@ -33,23 +31,38 @@ public class BreeOutrider extends BreeCrossbowman {
this.spawnRidingHorse = true; this.spawnRidingHorse = true;
this.npcShield = LOTRShields.ALIGNMENT_BREE; this.npcShield = LOTRShields.ALIGNMENT_BREE;
} }
@Override
protected void applyEntityAttributes() {
super.applyEntityAttributes();
this.getEntityAttribute(LOTREntityNPC.npcRangedAccuracy).setBaseValue(0.5);
}
protected EntityAIBase createBreeRangedAttackAI() { protected EntityAIBase createBreeRangedAttackAI() {
return new LOTREntityAIRangedAttack(this, 1.25, 30, 40, 16.0f); return new LOTREntityAIRangedAttack(this, 1.25, 30, 40, 16.0f);
} }
protected EntityAIBase addBreeAttackAI() { protected EntityAIBase addBreeAttackAI() {
return new LOTREntityAIAttackOnCollide(this, 1.45D, true); return new LOTREntityAIAttackOnCollide(this, 1.45D, true);
}
@Override
protected void entityInit() {
super.entityInit();
((Entity) this).getDataWatcher().addObject(22, (Object)0);
((Entity) this).getDataWatcher().addObject(23, (Object)0);
} }
@Override @Override
public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) { public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
data = super.onSpawnWithEgg(data); data = super.onSpawnWithEgg(data);
setCurrentItemOrArmor(4, new ItemStack(CinderLoE.helmetBreeKettle));
this.npcItemsInv.setMeleeWeapon(new ItemStack(CinderLoE.swordBree));
this.npcItemsInv.setRangedWeapon(new ItemStack(LOTRMod.ironCrossbow));
this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
return data; return data;
} }
@Override @Override
public void onAttackModeChange(LOTREntityNPC.AttackMode mode, boolean mounted) { public void onAttackModeChange(LOTREntityNPC.AttackMode mode, boolean mounted) {
if (this.rangedAttackAI == null) System.out.println("Ranged attack AI is null");
if (this.meleeAttackAI == null) System.out.println("Melee attack AI is null");
if (mode == LOTREntityNPC.AttackMode.IDLE) { if (mode == LOTREntityNPC.AttackMode.IDLE) {
((EntityLiving)this).tasks.removeTask(this.meleeAttackAI); ((EntityLiving)this).tasks.removeTask(this.meleeAttackAI);
((EntityLiving)this).tasks.removeTask(this.rangedAttackAI); ((EntityLiving)this).tasks.removeTask(this.rangedAttackAI);

@ -1,8 +1,8 @@
package com.zivilon.cinder_loe.mixins; package com.zivilon.cinder_loe.mixins;
import com.zivilon.cinder_loe.CinderLoE; import com.zivilon.cinder_loe.CinderLoE;
import com.zivilon.cinder_loe.client.model.ModelBreeKettleHelmet;
import com.zivilon.cinder_loe.client.model.ModelRedDwarfHelmet; import com.zivilon.cinder_loe.client.model.ModelRedDwarfHelmet;
import com.zivilon.cinder_loe.client.model.ModelBreeHelmet;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@ -98,7 +98,7 @@ public class MixinLOTRArmorModels {
map.put(LOTRMod.bodyHarnedor, new LOTRModelHarnedorChestplate(1.0F)); map.put(LOTRMod.bodyHarnedor, new LOTRModelHarnedorChestplate(1.0F));
map.put(LOTRMod.helmetBlackNumenorean, new LOTRModelBlackNumenoreanHelmet(1.0F)); map.put(LOTRMod.helmetBlackNumenorean, new LOTRModelBlackNumenoreanHelmet(1.0F));
map.put(CinderLoE.helmetRedDwarf, new ModelRedDwarfHelmet(1.0F)); map.put(CinderLoE.helmetRedDwarf, new ModelRedDwarfHelmet(1.0F));
map.put(CinderLoE.helmetBree, new ModelBreeHelmet()); map.put(CinderLoE.helmetBreeKettle, new ModelBreeKettleHelmet(1.0F));
map.put(LOTRMod.plate, new LOTRModelHeadPlate()); map.put(LOTRMod.plate, new LOTRModelHeadPlate());
map.put(LOTRMod.woodPlate, new LOTRModelHeadPlate()); map.put(LOTRMod.woodPlate, new LOTRModelHeadPlate());
map.put(LOTRMod.ceramicPlate, new LOTRModelHeadPlate()); map.put(LOTRMod.ceramicPlate, new LOTRModelHeadPlate());

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

@ -0,0 +1,21 @@
{
"modListVersion": 2,
"modList": [{
"modid": "${modId}",
"name": "${modName}",
"description": "CINDER MOD.\nA pretty big mod adding various additions to the LOTR Mod",
"version": "${modVersion}",
"mcversion": "${minecraftVersion}",
"url": "thelordofembers.com",
"updateUrl": "",
"authorList": ["Shinare", "KeyLime"],
"credits": "cleric_red",
"logoFile": "",
"screenshots": [],
"parent": "",
"requiredMods": [],
"dependencies": [],
"dependants": [],
"useDependencyInformation": true
}]
}
Loading…
Cancel
Save