diff --git a/CHANGELOG.md b/CHANGELOG.md index f178414..ce64bb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ### Changelog +**1.1.7** +* Improve JavaDoc +* Update Mappings +* Tweak Spell Texture + **1.1.6** * Add Spell-related Statistics diff --git a/gradle.properties b/gradle.properties index 6f22a0b..627a6b2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,11 +6,11 @@ org.gradle.jvmargs = -Xmx1G minecraft_version = 20w10a curseforge_id = 365308 simple_minecraft_version = 1.16-Snapshot - yarn_mappings = 20w10a+build.16 + yarn_mappings = 20w10a+build.20 loader_version = 0.7.8+build.187 # Mod Properties - mod_version = 1.1.6 + mod_version = 1.1.7 maven_group = com.thebrokenrail archives_base_name = sorcerycraft diff --git a/src/main/java/com/thebrokenrail/sorcerycraft/block/CastingTableBlock.java b/src/main/java/com/thebrokenrail/sorcerycraft/block/CastingTableBlock.java index 04a5b96..e6bcc23 100644 --- a/src/main/java/com/thebrokenrail/sorcerycraft/block/CastingTableBlock.java +++ b/src/main/java/com/thebrokenrail/sorcerycraft/block/CastingTableBlock.java @@ -6,7 +6,6 @@ import net.fabricmc.fabric.api.container.ContainerProviderRegistry; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Material; -import net.minecraft.client.gui.screen.ingame.CraftingTableScreen; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.screen.BlockContext; import net.minecraft.screen.NameableScreenHandlerFactory; diff --git a/src/main/java/com/thebrokenrail/sorcerycraft/item/SpellItem.java b/src/main/java/com/thebrokenrail/sorcerycraft/item/SpellItem.java index 0221d22..d51732f 100644 --- a/src/main/java/com/thebrokenrail/sorcerycraft/item/SpellItem.java +++ b/src/main/java/com/thebrokenrail/sorcerycraft/item/SpellItem.java @@ -31,13 +31,13 @@ public class SpellItem extends Item { @Override public TypedActionResult use(World world, PlayerEntity playerEntity, Hand hand) { - playerEntity.incrementStat(SorceryCraft.STAT_CAST_SPELL); - ItemStack itemStack = playerEntity.getStackInHand(hand); SorceryCraft.playSpellSound(playerEntity); if (!world.isClient()) { + playerEntity.incrementStat(SorceryCraft.STAT_CAST_SPELL); + SpellEntity entity = new SpellEntity(world, playerEntity); entity.setItem(itemStack); entity.setProperties(playerEntity, playerEntity.pitch, playerEntity.yaw, 0.0f, 1.5f, 1.0f); diff --git a/src/main/java/com/thebrokenrail/sorcerycraft/spell/api/Spell.java b/src/main/java/com/thebrokenrail/sorcerycraft/spell/api/Spell.java index 2cf93b1..93ebe7c 100644 --- a/src/main/java/com/thebrokenrail/sorcerycraft/spell/api/Spell.java +++ b/src/main/java/com/thebrokenrail/sorcerycraft/spell/api/Spell.java @@ -16,14 +16,16 @@ public abstract class Spell { } /** - * @return The ID of this Spell + * Get the ID of this Spell + * @return The Spell ID */ public Identifier getID() { return id; } /** - * @return The level of this Spell + * Get the level of this Spell + * @return The Spell Level */ public int getLevel() { return level; @@ -52,17 +54,20 @@ public abstract class Spell { } /** - * @return The amount of levels required to make this Spell in a Casting Table + * Get the amount of levels required to make this Spell in a Casting Table + * @return The XP cost */ public abstract int getXPCost(); /** - * @return The item(s) required to make ExampleSpell in a Casting Table, or ItemStack.EMPTY if an item is not required + * Get the item(s) required to make ExampleSpell in a Casting Table, or ItemStack.EMPTY if an item is not required + * @return The item cost */ public abstract ItemStack getItemCost(); /** - * @return The maximum level of this Spell + * Get the maximum level of this Spell + * @return The Max Level */ public abstract int getMaxLevel(); } diff --git a/src/main/java/com/thebrokenrail/sorcerycraft/spell/registry/SpellRegistry.java b/src/main/java/com/thebrokenrail/sorcerycraft/spell/registry/SpellRegistry.java index a3a02f4..32e45dd 100644 --- a/src/main/java/com/thebrokenrail/sorcerycraft/spell/registry/SpellRegistry.java +++ b/src/main/java/com/thebrokenrail/sorcerycraft/spell/registry/SpellRegistry.java @@ -53,6 +53,12 @@ public class SpellRegistry { return out.toArray(new Spell[0]); } + /** + * Register a Spell + * @param id The Spell ID + * @param spell The Spell Class + * @return The Spell ID + */ public static Identifier register(Identifier id, Class spell) { spells.put(id, spell); return id; diff --git a/src/main/resources/assets/sorcerycraft/textures/item/spell.png b/src/main/resources/assets/sorcerycraft/textures/item/spell.png index 4be7858..d51c89b 100644 Binary files a/src/main/resources/assets/sorcerycraft/textures/item/spell.png and b/src/main/resources/assets/sorcerycraft/textures/item/spell.png differ