fixes, armor sprites

This commit is contained in:
Bob 2023-09-12 22:04:26 +02:00
parent fb09867517
commit 282228239f
9 changed files with 32 additions and 6 deletions

View File

@ -56,6 +56,7 @@ public class HazmatRegistry {
double env = 2D; // 99% double env = 2D; // 99%
double hev = 2.3D; // 99.5% double hev = 2.3D; // 99.5%
double rpa = 2D; // 99% double rpa = 2D; // 99%
double trench = 1D; // 90%
double fau = 4D; // 99.99% double fau = 4D; // 99.99%
double dns = 5D; // 99.999% double dns = 5D; // 99.999%
double security = 0.825D; // 85% double security = 0.825D; // 85%
@ -124,6 +125,11 @@ public class HazmatRegistry {
HazmatRegistry.registerHazmat(ModItems.rpa_legs, rpa * legs); HazmatRegistry.registerHazmat(ModItems.rpa_legs, rpa * legs);
HazmatRegistry.registerHazmat(ModItems.rpa_boots, rpa * boots); HazmatRegistry.registerHazmat(ModItems.rpa_boots, rpa * boots);
HazmatRegistry.registerHazmat(ModItems.trenchmaster_helmet, trench * helmet);
HazmatRegistry.registerHazmat(ModItems.trenchmaster_plate, trench * chest);
HazmatRegistry.registerHazmat(ModItems.trenchmaster_legs, trench * legs);
HazmatRegistry.registerHazmat(ModItems.trenchmaster_boots, trench * boots);
HazmatRegistry.registerHazmat(ModItems.fau_helmet, fau * helmet); HazmatRegistry.registerHazmat(ModItems.fau_helmet, fau * helmet);
HazmatRegistry.registerHazmat(ModItems.fau_plate, fau * chest); HazmatRegistry.registerHazmat(ModItems.fau_plate, fau * chest);
HazmatRegistry.registerHazmat(ModItems.fau_legs, fau * legs); HazmatRegistry.registerHazmat(ModItems.fau_legs, fau * legs);

View File

@ -132,8 +132,6 @@ public class CustomMachineHandler extends TemplateRecipeHandler {
List<CustomMachineRecipe> recipes = CustomMachineRecipes.recipes.get(conf.recipeKey); List<CustomMachineRecipe> recipes = CustomMachineRecipes.recipes.get(conf.recipeKey);
System.out.println(conf.recipeKey);
if(recipes != null) outer:for(CustomMachineRecipe recipe : recipes) { if(recipes != null) outer:for(CustomMachineRecipe recipe : recipes) {
for(Pair<ItemStack, Float> stack : recipe.outputItems) { for(Pair<ItemStack, Float> stack : recipe.outputItems) {

View File

@ -4956,12 +4956,14 @@ public class ModItems {
ArmorMaterial aMatTrench = EnumHelper.addArmorMaterial("HBM_TRENCH", 150, new int[] { 3, 8, 6, 3 }, 100); ArmorMaterial aMatTrench = EnumHelper.addArmorMaterial("HBM_TRENCH", 150, new int[] { 3, 8, 6, 3 }, 100);
aMatTrench.customCraftingMaterial = ModItems.plate_iron; aMatTrench.customCraftingMaterial = ModItems.plate_iron;
trenchmaster_helmet = new ArmorTrenchmaster(aMatTrench, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png") trenchmaster_helmet = new ArmorTrenchmaster(aMatTrench, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png").setMod(0.25F).setThreshold(5.0F)
.addEffect(new PotionEffect(Potion.damageBoost.id, 20, 2)) .addEffect(new PotionEffect(Potion.damageBoost.id, 20, 2))
.addEffect(new PotionEffect(Potion.digSpeed.id, 20, 1)) .addEffect(new PotionEffect(Potion.digSpeed.id, 20, 1))
.addEffect(new PotionEffect(Potion.jump.id, 20, 1)) .addEffect(new PotionEffect(Potion.jump.id, 20, 1))
.addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 0)) .addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 0))
.enableVATS(true) .enableVATS(true)
.addResistance("fall", 0F)
.setFireproof(true)
.setStepSize(1) .setStepSize(1)
.hides(EnumPlayerPart.HAT) .hides(EnumPlayerPart.HAT)
.setUnlocalizedName("trenchmaster_helmet").setTextureName(RefStrings.MODID + ":trenchmaster_helmet"); .setUnlocalizedName("trenchmaster_helmet").setTextureName(RefStrings.MODID + ":trenchmaster_helmet");

View File

@ -2,6 +2,7 @@ package com.hbm.items.armor;
import java.util.List; import java.util.List;
import com.hbm.extprop.HbmPlayerProps;
import com.hbm.render.model.ModelArmorTrenchmaster; import com.hbm.render.model.ModelArmorTrenchmaster;
import com.hbm.util.I18nUtil; import com.hbm.util.I18nUtil;
@ -12,6 +13,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.event.entity.living.LivingAttackEvent;
public class ArmorTrenchmaster extends ArmorFSB { public class ArmorTrenchmaster extends ArmorFSB {
@ -43,4 +45,22 @@ public class ArmorTrenchmaster extends ArmorFSB {
list.add(EnumChatFormatting.RED + " " + I18nUtil.resolveKey("armor.fasterReload")); list.add(EnumChatFormatting.RED + " " + I18nUtil.resolveKey("armor.fasterReload"));
list.add(EnumChatFormatting.RED + " " + I18nUtil.resolveKey("armor.moreAmmo")); list.add(EnumChatFormatting.RED + " " + I18nUtil.resolveKey("armor.moreAmmo"));
} }
@Override
public void handleAttack(LivingAttackEvent event) {
EntityLivingBase e = event.entityLiving;
if(e instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) e;
if(ArmorFSB.hasFSBArmor(player)) {
if(e.getRNG().nextInt(3) == 0) {
HbmPlayerProps.plink(player, "random.break", 0.5F, 1.0F + e.getRNG().nextFloat() * 0.5F);
event.setCanceled(true);
}
}
}
}
} }

View File

@ -289,6 +289,9 @@ public class MainRegistry {
SiegeTier.registerTiers(); SiegeTier.registerTiers();
HazardRegistry.registerItems(); HazardRegistry.registerItems();
HazardRegistry.registerTrafos(); HazardRegistry.registerTrafos();
OreDictManager oreMan = new OreDictManager();
MinecraftForge.EVENT_BUS.register(oreMan); //OreRegisterEvent
OreDictManager.registerGroups(); //important to run first OreDictManager.registerGroups(); //important to run first
OreDictManager.registerOres(); OreDictManager.registerOres();
@ -899,9 +902,6 @@ public class MainRegistry {
MinecraftForge.EVENT_BUS.register(impactHandler); MinecraftForge.EVENT_BUS.register(impactHandler);
MinecraftForge.TERRAIN_GEN_BUS.register(impactHandler); MinecraftForge.TERRAIN_GEN_BUS.register(impactHandler);
OreDictManager oreMan = new OreDictManager();
MinecraftForge.EVENT_BUS.register(oreMan); //OreRegisterEvent
PacketDispatcher.registerPackets(); PacketDispatcher.registerPackets();
ChunkRadiationManager radiationSystem = new ChunkRadiationManager(); ChunkRadiationManager radiationSystem = new ChunkRadiationManager();

Binary file not shown.

After

Width:  |  Height:  |  Size: 164 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 347 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 392 B