Repo-Mirror/Reforges
9
0
Fork 0
mirror of https://github.com/Auxilor/Reforges.git synced 2025-12-23 00:49:31 +00:00
Code Issues Releases 1 Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Auxilor
2021-09-14 11:10:40 +01:00
parent b0dc87d1db a9411562e3
commit ae86b88f72
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@@ -68,7 +68,15 @@ shadowJar {
} }
jar { jar {
archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + " " + "unshaded" + ".jar" archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar"
}
publishing {
publications {
maven(MavenPublication) {
from(components.java)
}
}
} }
group = 'com.willfp' group = 'com.willfp'

4
eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java
View File

@@ -10,6 +10,7 @@ import com.willfp.reforges.display.ReforgesDisplay;
import com.willfp.reforges.reforges.Reforge; import com.willfp.reforges.reforges.Reforge;
import com.willfp.reforges.reforges.Reforges; import com.willfp.reforges.reforges.Reforges;
import com.willfp.reforges.reforges.util.ReforgeArgParser; import com.willfp.reforges.reforges.util.ReforgeArgParser;
import com.willfp.reforges.reforges.util.WatcherTriggers;
import com.willfp.reforges.util.AntiPlaceListener; import com.willfp.reforges.util.AntiPlaceListener;
import com.willfp.reforges.util.DiscoverRecipeListener; import com.willfp.reforges.util.DiscoverRecipeListener;
import com.willfp.reforges.vault.EconomyHandler; import com.willfp.reforges.vault.EconomyHandler;
@@ -67,7 +68,8 @@ public class ReforgesPlugin extends EcoPlugin {
protected List<Listener> loadListeners() { protected List<Listener> loadListeners() {
return Arrays.asList( return Arrays.asList(
new DiscoverRecipeListener(this), new DiscoverRecipeListener(this),
new AntiPlaceListener(this) new AntiPlaceListener(this),
new WatcherTriggers(this)
); );
} }

5
eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/WatcherTriggers.java
View File

@@ -44,6 +44,7 @@ public class WatcherTriggers extends PluginDependent<EcoPlugin> implements Liste
*/ */
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
public void onBlockBreak(@NotNull final BlockBreakEvent event) { public void onBlockBreak(@NotNull final BlockBreakEvent event) {
if (McmmoManager.isFake(event)) { if (McmmoManager.isFake(event)) {
return; return;
} }
@@ -55,10 +56,6 @@ public class WatcherTriggers extends PluginDependent<EcoPlugin> implements Liste
return; return;
} }
if (event.isCancelled()) {
return;
}
ItemStack itemStack = player.getInventory().getItemInMainHand(); ItemStack itemStack = player.getInventory().getItemInMainHand();
Reforge reforge = ReforgeUtils.getReforge(itemStack); Reforge reforge = ReforgeUtils.getReforge(itemStack);