he make an big steppy

This commit is contained in:
Boblet 2023-09-07 15:33:27 +02:00
parent 24444d6c4e
commit be51ae39d0
4 changed files with 34 additions and 6 deletions

View File

@ -353,16 +353,16 @@ public class ShredderRecipes extends SerializableRecipe {
/* GC COMPAT */
Block gcMoonBlock = Compat.tryLoadBlock(Compat.MOD_GCC, "moonBlock");
if(gcMoonBlock != null) {
if(gcMoonBlock != null && gcMoonBlock != Blocks.air) {
ShredderRecipes.setRecipe(new ItemStack(gcMoonBlock, 1, 3), new ItemStack(ModBlocks.moon_turf)); //Moon dirt
ShredderRecipes.setRecipe(new ItemStack(gcMoonBlock, 1, 5), new ItemStack(ModBlocks.moon_turf)); //Moon topsoil
}
/* AR COMPAT */
Block arMoonTurf = Compat.tryLoadBlock(Compat.MOD_AR, "turf");
if(arMoonTurf != null) ShredderRecipes.setRecipe(arMoonTurf, new ItemStack(ModBlocks.moon_turf)); //i assume it's moon turf
if(arMoonTurf != null && gcMoonBlock != Blocks.air) ShredderRecipes.setRecipe(arMoonTurf, new ItemStack(ModBlocks.moon_turf)); //i assume it's moon turf
Block arMoonTurfDark = Compat.tryLoadBlock(Compat.MOD_AR, "turfDark");
if(arMoonTurfDark != null) ShredderRecipes.setRecipe(arMoonTurfDark, new ItemStack(ModBlocks.moon_turf)); //probably moon dirt? would have helped if i had ever played AR for more than 5 seconds
if(arMoonTurfDark != null && gcMoonBlock != Blocks.air) ShredderRecipes.setRecipe(arMoonTurfDark, new ItemStack(ModBlocks.moon_turf)); //probably moon dirt? would have helped if i had ever played AR for more than 5 seconds
}
/**

View File

@ -4957,10 +4957,12 @@ public class ModItems {
ArmorMaterial aMatTrench = EnumHelper.addArmorMaterial("HBM_TRENCH", 150, new int[] { 3, 8, 6, 3 }, 100);
aMatTrench.customCraftingMaterial = ModItems.plate_iron;
trenchmaster_helmet = new ArmorTrenchmaster(aMatTrench, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png")
.addEffect(new PotionEffect(Potion.damageBoost.id, 20, 9))
.addEffect(new PotionEffect(Potion.digSpeed.id, 20, 7))
.addEffect(new PotionEffect(Potion.jump.id, 20, 2))
.addEffect(new PotionEffect(Potion.damageBoost.id, 20, 2))
.addEffect(new PotionEffect(Potion.digSpeed.id, 20, 1))
.addEffect(new PotionEffect(Potion.jump.id, 20, 1))
.addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 0))
.enableVATS(true)
.setStepSize(1)
.hides(EnumPlayerPart.HAT)
.setUnlocalizedName("trenchmaster_helmet").setTextureName(RefStrings.MODID + ":trenchmaster_helmet");
trenchmaster_plate = new ArmorTrenchmaster(aMatTrench, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) trenchmaster_helmet).setUnlocalizedName("trenchmaster_plate").setTextureName(RefStrings.MODID + ":trenchmaster_plate");

View File

@ -65,6 +65,7 @@ public class ArmorFSB extends ItemArmor implements IArmorDisableModel {
public boolean hardLanding = false;
public double gravity = 0;
public int dashCount = 0;
public int stepSize = 0;
public String step;
public String jump;
public String fall;
@ -158,6 +159,11 @@ public class ArmorFSB extends ItemArmor implements IArmorDisableModel {
this.dashCount = dashCount;
return this;
}
public ArmorFSB setStepSize(int stepSize) {
this.stepSize = stepSize;
return this;
}
public ArmorFSB setStep(String step) {
this.step = step;
@ -199,6 +205,7 @@ public class ArmorFSB extends ItemArmor implements IArmorDisableModel {
this.hardLanding = original.hardLanding;
this.gravity = original.gravity;
this.dashCount = original.dashCount;
this.stepSize = original.stepSize;
this.step = original.step;
this.jump = original.jump;
this.fall = original.fall;

View File

@ -953,6 +953,25 @@ public class ModEventHandlerClient {
}
}
}
if(event.phase == Phase.START) {
EntityPlayer player = mc.thePlayer;
float discriminator = 0.003F;
float defaultStepSize = 0.5F;
int newStepSize = 0;
if(player.inventory.armorInventory[2] != null && player.inventory.armorInventory[2].getItem() instanceof ArmorFSB) {
ArmorFSB plate = (ArmorFSB) player.inventory.armorInventory[2].getItem();
if(plate.hasFSBArmor(player)) newStepSize = plate.stepSize;
}
if(newStepSize > 0) {
player.stepHeight = newStepSize + discriminator;
} else {
for(int i = 1; i < 4; i++) if(player.stepHeight == i + discriminator) player.stepHeight = defaultStepSize;
}
}
}
@SideOnly(Side.CLIENT)