Compare commits

...

2 Commits

Author SHA1 Message Date
WinDanesz 65ed0e8a22 version bump to 4.3.14 2024-05-18 16:07:11 +02:00
WinDanesz 936601cbad fix: Fixed a bug that caused stackable artefacts to alway double their effect 2024-05-18 15:57:15 +02:00
7 changed files with 12 additions and 14 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"homepage": "https://www.curseforge.com/minecraft/mc-mods/electroblobs-wizardry", "homepage": "https://www.curseforge.com/minecraft/mc-mods/electroblobs-wizardry",
"promos": { "promos": {
"1.12.2-latest": "4.3.13", "1.12.2-latest": "4.3.14",
"1.12.2-recommended": "4.3.13" "1.12.2-recommended": "4.3.14"
} }
} }
+1 -1
View File
@@ -38,7 +38,7 @@ apply plugin: org.ajoberstar.grgit.gradle.GrgitPlugin
apply plugin: 'wtf.gofancy.fancygradle' 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 group= "electroblob.wizardry"// http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "ElectroblobsWizardry" archivesBaseName = "ElectroblobsWizardry"
@@ -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.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. * 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 <a href="https://mcforge.readthedocs.io/en/1.12.x/gettingstarted/autoupdate/">update checker</a>. * Json file used by Forge's built-in <a href="https://mcforge.readthedocs.io/en/1.12.x/gettingstarted/autoupdate/">update checker</a>.
@@ -49,7 +49,6 @@ public final class WizardryBaublesIntegration {
ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.BELT, BaubleType.BELT); ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.BELT, BaubleType.BELT);
ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.BODY, BaubleType.BODY); ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.BODY, BaubleType.BODY);
ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.HEAD, BaubleType.HEAD); ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.HEAD, BaubleType.HEAD);
ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.TRINKET, BaubleType.TRINKET);
} }
public static boolean enabled(){ public static boolean enabled(){
@@ -93,8 +93,7 @@ public class ItemArtefact extends Item {
/** An artefact that improves utility spells. One of these can be active at any one time. */ CHARM(1), /** An artefact that improves utility spells. One of these can be active at any one time. */ CHARM(1),
/** Added for add-on artefacts. */ BELT(1), /** Added for add-on artefacts. */ BELT(1),
/** Added for add-on artefacts. */ BODY(1), /** Added for add-on artefacts. */ BODY(1),
/** Added for add-on artefacts. */ HEAD(1), /** Added for add-on artefacts. */ HEAD(1);
/** Added for add-on artefacts. */ TRINKET(1);
public final int maxAtOnce; public final int maxAtOnce;
@@ -36,15 +36,15 @@ public class Telekinesis extends SpellRay {
target.motionZ = (origin.z - target.posZ) / 6; target.motionZ = (origin.z - target.posZ) / 6;
return true; 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? // 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); EntityItem item = player.entityDropItem(player.getHeldItemMainhand(), 0);
// Makes the item move towards the caster // Makes the item move towards the caster
item.motionX = (origin.x - player.posX) / 20; item.motionX = (origin.x - player.posX) / 20;
+1 -1
View File
@@ -2,7 +2,7 @@
{ {
"modid" : "ebwizardry", "modid" : "ebwizardry",
"name" : "Electroblob's Wizardry", "name" : "Electroblob's Wizardry",
"version" : "4.3.13", "version" : "4.3.14",
"mcversion" : "1.12.2", "mcversion" : "1.12.2",
"url" : "https://minecraft.curseforge.com/projects/electroblobs-wizardry", "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", "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",