diff --git a/gradle.properties b/gradle.properties index f55bd210..1bdd4efb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b1..d4081da4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/settings.gradle b/settings.gradle index f1ba7bf6..b4bf8556 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.46' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.49' } diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java index 32dc9c23..cdd264d5 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java @@ -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; @@ -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); } @@ -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"); }