From 3a173b25d1799ac1086e4d56087e415b0be0f1b4 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Tue, 10 Mar 2020 17:32:00 -0400 Subject: [PATCH] 1.1.7 Improve JavaDoc Update Mappings Tweak Spell Texture --- CHANGELOG.md | 5 +++++ gradle.properties | 4 ++-- .../sorcerycraft/block/CastingTableBlock.java | 1 - .../sorcerycraft/item/SpellItem.java | 4 ++-- .../sorcerycraft/spell/api/Spell.java | 15 ++++++++++----- .../spell/registry/SpellRegistry.java | 6 ++++++ .../sorcerycraft/textures/item/spell.png | Bin 1403 -> 1434 bytes 7 files changed, 25 insertions(+), 10 deletions(-) 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 4be7858efc730e38147df11e242bc67e36da813a..d51c89b861956fd474bf3e5bbf09e0034b4ebe89 100644 GIT binary patch delta 1370 zcmV-g1*Q7?3YrU$B!4A(R9JLUVRs;Ka&Km7Y-J#Hd2nSQWq4_3004N}>nIHT z*D7WS2=Nfh!91#F2ebU!VC*D5IXTa-JEm-dEQ_XF!U?ti{_XS+4$ET6`KTd0E!(JlM-Xn&_zRvcY{_zXM`88eUm z^3xSa>~7~ZrnKJ6?ru5jv}J`|!LMT%K}Pk62aaqL7K5vfS!6#mPQi6N0Vav)TS>Tj zNzb{XvwI=$>|MAsdD-QW3Nm3igbPQ@&i-PTa~gY9?U?!Dfm9RC{c*=#?^Szm`|7d_ zU@FjB)UlM=gMZ@&DrLSF&>~Kcew;0#DVA8EScRG!S|Lu1#5A29SI*qI&3oYjh|V?} zaksWunKqSZlPxkNaHDaz5i(Q~g&qZ}3C#Ay!gJm<=PRt3xiUO0BNz(eZKG$#@3b>e z?;~}Yjhhb=J}ReGIbXC zdE?0JrNObT0H6qSdw^kq0w%C{4s4>ekr_NH^vOVO#n}xCu=lnyb!a0JAdcEGH{OXn zeXX~<8Cwg4@DfleItm41Ip>i-(J68$d-0CE_rXW6KKUFZxZpzwF^oMbM~N=_7-EbX zQ_L#r)PHNxsH#bGvPrOo`4m#5q$#DGF=8#kmqaoc=?yYW5RI7P@QDh1q+?@)L(^(!+OQ9~v?@HGQErM_(Y7P2 zMt>3#X4^xcBUO$CyuQ;%4ub&{*G@n(T~3^>EL>9HLAmZurAs_twRyTU?7m&X0*fkp z0hT_2`h9TSr3E7rs~LEg-^H-{_J4Ka(~E>|ZqI`5u#+`82Q54SO(*IriC+Xs z-z(FS_c^msDYMvUP>jL$5vw(=l-^LcUaB4$-tn^)fa&YBJ_kl?7uYv}`&9j6rqU-+ ze+o3cPv61bNz+S!^l`<14lrF1-viTn+crn#-1eo?d0RPWOAq>MpQ9e!@fE4#Pc}pk zEAv|{qb~e`u3P|}0dBx(A^R~fdI#w}&?oc1ot}Q>d;Px&gr9ZzD^7m^TR9u;PhW_3 zlWqhue+m^I0noPxQUCw|_DMuRR5;6HU>FjhY|8EbWm9hdCtLHSJD>k=Ir18-AuRYb zGB7YO*ck{gNQ<&FNQ<&F$VqT8Fig4qzbi+Tktkc=e*A@jw;Xx>-#Yd5f2=M*w-p<( z)a7Te))!!4NIm`k=xkF)7G%wK1_BIn5*#=+f5U*CfdGV&dip;TshSxW7#QRvI2evz z{J?N@wkab#FsxHg|F4W!z-!3U*FPB^z4*bPILcj|>=b8B!Uq!0_PtcZTJ=UJ|wymm#=p c7#&;y0CyIR0$^nXy8r+H07*qoM6N<$f_*ZSQvd(} delta 1338 zcmV-A1;zTB3;PO?B!5AAR9JLUVRs;Ka&Km7Y-J#Hd2nSQWq4_3004N}-IiOH<0=eA z{~5&{0+JAj;b0zX^$dFW_h6G$l6I<+>h7Pmm(9aih_i)k*MI&P?mrw%(Yv6@Vvf<{ z2svafsF**Fqa+{p`)c@0<*wgdA27NEr5w%J*Z6{d{dggT)qlU;_q$Y=9b1OzYIr|n z&OGaDoGnAbM?bB$%j>-oZkDqyuFLE){@4x)Vl;(4VaHuaJnlAUk>e`3WWO5*ktEc^ z-Xp^2+PQ1>LA-12K|5bozuZgVd|U(KgGQ^L^r2s_)9@p;%glEVwD{z2j~ngAXf{Sa zR#!rVQqiqNU4NFc*D!E{l(N4TaVA`fdfLy7)3C$}VhuDmoYhe#hT4MyH7Ycy?`5S5 z7Xx=rD48qE-e;0HbCro8%##Ku$${)sCVy`H4Ojs|-DNf`u=wpTu_=AT zmh7AbI+o20{g}LQup{3WgXeDjJ-sMons(wM2;_YK$?(nWIXQ6q2Tx zQnHj&F@LdOYSEIJWhu=unrms?q+$EF*ph43ax0xWLaB$YJ@(YC=UxV4ZO8~iM;vL`$fI1TEvom_=z-kl z)M!zg#KJxP5`D#^afWL5LZB z(|=X>d*bx6Tw`Y=hMrdwA4;v4LAA}2w}NOFqodJ=^cYSY{vQ4l&D^bM;c%=+DPOA6 z-jKrvLx|yGcYrR5;6H zU>Fi0_VEAzv4{WvCtLH?_y7N|eTdx<7JM2R7#J7=V@c;jdZ5bJf zvh~LwOuY8t|Ns2U5iViGWvjO|ZVOV6Gcas=!oct`l97=GS#y9K#F@&x_`@YY4nl8& zxg_>5T*PU(oQ;mJzDM;20|NsC1OIZuhQMM2Lo+dkz-+~-8J8hf-~a#Ld=a-sMqGx> wvtnSl_JM(+=Nd%pV