Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ curseForgeRelations =
# projects. New projects should not use this parameter.
customArchiveBaseName = Tainted-Magic

# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
# runClientWorkingDirectory = run/client

# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
# runServerWorkingDirectory = run/server

# Optional parameter to have the build automatically fail if an illegal version is used.
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
# The check is ONLY performed if the version is a git tag.
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.46'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.49'
}


Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,9 @@ public void onUpdate(ItemStack s, World w, Entity e, int j, boolean k) {
}

public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
super.onArmorTick(world, player, itemStack);
if ((!world.isRemote) && (itemStack.getItemDamage() > 0) && (player.ticksExisted % 20 == 0))
itemStack.damageItem(-1, player);
if (getIntertialState(itemStack) && player.moveForward == 0
if (getInertiaState(itemStack) && player.moveForward == 0
&& player.moveStrafing == 0
&& player.capabilities.isFlying) {
player.motionX *= 0.5;
Expand All @@ -136,12 +135,12 @@ public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
public void movementEffects(EntityPlayer player, float bonus, ItemStack itemStack) {
if (player.moveForward != 0.0F || player.moveStrafing != 0.0F || player.motionY != 0.0F) {
if (TaintedMagic.isBootsActive) {
boolean omniMode = isOmniEnabled(itemStack);
boolean omniMode = getOmniState(itemStack);
if (player.moveForward <= 0F && !omniMode) {
return;
}
}
if (player.worldObj.isRemote && !player.isSneaking()) {
if (player.worldObj.isRemote && !player.isSneaking() && getStepAssistState(itemStack)) {
if (!Thaumcraft.instance.entityEventHandler.prevStep.containsKey(player.getEntityId())) {
Thaumcraft.instance.entityEventHandler.prevStep.put(player.getEntityId(), player.stepHeight);
}
Expand Down Expand Up @@ -221,13 +220,20 @@ public double getJumpModifier(ItemStack stack) {
}

public boolean getOmniState(ItemStack stack) {
if (stack.stackTagCompound != null) {
if (stack.stackTagCompound != null && stack.stackTagCompound.hasKey("omni")) {
return stack.stackTagCompound.getBoolean("omni");
}
return false;
return true;
}

public boolean getStepAssistState(ItemStack stack) {
if (stack.stackTagCompound != null && stack.stackTagCompound.hasKey("step")) {
return stack.stackTagCompound.getBoolean("step");
}
return true;
}

public boolean getIntertialState(ItemStack stack) {
public boolean getInertiaState(ItemStack stack) {
if (stack.stackTagCompound != null) {
return stack.stackTagCompound.getBoolean("inertiacanceling");
}
Expand Down