From 65ed0e8a2226dff727dd593d2f4129307ac49c47 Mon Sep 17 00:00:00 2001 From: WinDanesz <31292708+windanesz@users.noreply.github.com> Date: Sat, 18 May 2024 16:04:04 +0200 Subject: [PATCH] version bump to 4.3.14 --- .forge/update.json | 4 ++-- build.gradle | 2 +- src/main/java/electroblob/wizardry/Wizardry.java | 2 +- .../baubles/WizardryBaublesIntegration.java | 1 - .../java/electroblob/wizardry/spell/Telekinesis.java | 12 ++++++------ src/main/resources/mcmod.info | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.forge/update.json b/.forge/update.json index a78bc7fa8..9c2f650bc 100644 --- a/.forge/update.json +++ b/.forge/update.json @@ -1,7 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/electroblobs-wizardry", "promos": { - "1.12.2-latest": "4.3.13", - "1.12.2-recommended": "4.3.13" + "1.12.2-latest": "4.3.14", + "1.12.2-recommended": "4.3.14" } } diff --git a/build.gradle b/build.gradle index 92e1efe73..65b30abbd 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ apply plugin: org.ajoberstar.grgit.gradle.GrgitPlugin apply plugin: 'wtf.gofancy.fancygradle' -version = "4.3.13" +version = "4.3.14" group= "electroblob.wizardry"// http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "ElectroblobsWizardry" diff --git a/src/main/java/electroblob/wizardry/Wizardry.java b/src/main/java/electroblob/wizardry/Wizardry.java index d5fbe8c2c..844603ee1 100644 --- a/src/main/java/electroblob/wizardry/Wizardry.java +++ b/src/main/java/electroblob/wizardry/Wizardry.java @@ -82,7 +82,7 @@ public class Wizardry { * 1.x.x represents Minecraft 1.7.x versions, 2.x.x represents Minecraft 1.10.x versions, 3.x.x represents Minecraft * 1.11.x versions, and so on. */ - public static final String VERSION = "4.3.13"; + public static final String VERSION = "4.3.14"; /** * Json file used by Forge's built-in update checker. diff --git a/src/main/java/electroblob/wizardry/integration/baubles/WizardryBaublesIntegration.java b/src/main/java/electroblob/wizardry/integration/baubles/WizardryBaublesIntegration.java index 52ceec128..fd1192bf3 100644 --- a/src/main/java/electroblob/wizardry/integration/baubles/WizardryBaublesIntegration.java +++ b/src/main/java/electroblob/wizardry/integration/baubles/WizardryBaublesIntegration.java @@ -49,7 +49,6 @@ public static void init(){ ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.BELT, BaubleType.BELT); ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.BODY, BaubleType.BODY); ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.HEAD, BaubleType.HEAD); - ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.TRINKET, BaubleType.TRINKET); } public static boolean enabled(){ diff --git a/src/main/java/electroblob/wizardry/spell/Telekinesis.java b/src/main/java/electroblob/wizardry/spell/Telekinesis.java index ca79afdbe..0ac201cdf 100644 --- a/src/main/java/electroblob/wizardry/spell/Telekinesis.java +++ b/src/main/java/electroblob/wizardry/spell/Telekinesis.java @@ -36,15 +36,15 @@ protected boolean onEntityHit(World world, Entity target, Vec3d hit, EntityLivin target.motionZ = (origin.z - target.posZ) / 6; return true; - } else if (target instanceof EntityPlayer && (Wizardry.settings.telekineticDisarmament && !ItemArtefact.isArtefactActive((EntityPlayer) target, WizardryItems.amulet_anchoring)) { + } else if (target instanceof EntityPlayer && (Wizardry.settings.telekineticDisarmament && !ItemArtefact.isArtefactActive((EntityPlayer) target, WizardryItems.amulet_anchoring))) { + + EntityPlayer player = (EntityPlayer) target; - EntityPlayer player = (EntityPlayer)target; - // IDEA: Disarm the offhand if the mainhand is empty or otherwise harmless? - if(!player.getHeldItemMainhand().isEmpty()){ + if (!player.getHeldItemMainhand().isEmpty()) { - if(!world.isRemote){ + if (!world.isRemote) { EntityItem item = player.entityDropItem(player.getHeldItemMainhand(), 0); // Makes the item move towards the caster item.motionX = (origin.x - player.posX) / 20; @@ -52,7 +52,7 @@ protected boolean onEntityHit(World world, Entity target, Vec3d hit, EntityLivin } player.setHeldItem(EnumHand.MAIN_HAND, ItemStack.EMPTY); - + return true; } } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 218cd0067..03136830c 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ { "modid" : "ebwizardry", "name" : "Electroblob's Wizardry", - "version" : "4.3.13", + "version" : "4.3.14", "mcversion" : "1.12.2", "url" : "https://minecraft.curseforge.com/projects/electroblobs-wizardry", "credits" : "\nDesigned, coded and textured by Electroblob.\nDiscord Moderators: FavouriteDragon, WinDanesz\nCode contributed by: Corail31, 12foo, Shadows-of-Fire, Tora-B, Avatair, Aeronica, UltraHex, Azim-Palmer, raoulvdberge, rafasoares, xinyuan-liu, SettingDust, Aralu115, WinDanesz, ZettaSword.\nTranslators: Alsentar (Spanish), MadWrist (Mexican Spanish), VilagVil, kellixon, bigenergy, MugGod2 & DrHesperus (Russian), Hahdrim & Crowller (French), lorrampi (Brazilian Portuguese), ZHENGLOC, dragon-evol, Hokorizero, TUsama & Determancer (Chinese - Simplified), shejery, rewi_wire, 방통 & red1854th (Korean), Trozuu & Olej (Polish), BirdyDragon & Lemopav (German), chesterccj305 (Chinese - Traditional), Bombadil (Hungarian).\nSound Effects: OhhWowProductions, fredzed, deleted_user_3277771, DiscoveryME, OGSoundFX, leosalom, juskiddink",