Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Slimefun/Slimefun4
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 845ef7791924518b64cc07cef78233df5faf9b21
Choose a base ref
..
head repository: Slimefun/Slimefun4
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5b5cfcf8604ae0ef14dd8ec46db9a05872151c2e
Choose a head ref
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yaml
Original file line number Diff line number Diff line change
@@ -20,6 +20,8 @@ body:
options:
- label: I am using the official english version of Slimefun and did not modify the jar.
required: true
- label: I downloaded the official version from the new build site [Blob Builds](https://blob.build/).
required: true
- label: I am using an up to date "DEV" (not "RC") version of Slimefun.
required: true
- label: I am aware that issues related to Slimefun addons need to be reported on their bug trackers and not here.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -421,7 +421,7 @@
<dependency>
<groupId>com.sk89q.worldedit</groupId>
<artifactId>worldedit-bukkit</artifactId>
<version>7.3.5</version>
<version>7.3.6</version>
<scope>provided</scope>

<exclusions>
Original file line number Diff line number Diff line change
@@ -93,4 +93,4 @@ public void setCancelled(boolean cancel) {
public static @Nonnull HandlerList getHandlerList() {
return handlers;
}
}
}
Original file line number Diff line number Diff line change
@@ -160,6 +160,21 @@ public SlimefunItem(ItemGroup itemGroup, SlimefunItemStack item, RecipeType reci
this.recipeOutput = recipeOutput;
}

/**
* This creates a new {@link SlimefunItem} from the given arguments.
*
* @param itemGroup
* The {@link ItemGroup} this {@link SlimefunItem} belongs
* to
* @param item
* The {@link SlimefunItemStack} that describes the visual
* features of our {@link SlimefunItem}
*/
@ParametersAreNonnullByDefault
public SlimefunItem(ItemGroup itemGroup, SlimefunItemStack item) {
this(itemGroup, item, RecipeType.NULL, new ItemStack[] {});
}

// Previously deprecated constructor, now only for internal purposes
@ParametersAreNonnullByDefault
protected SlimefunItem(ItemGroup itemGroup, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {
Original file line number Diff line number Diff line change
@@ -44,6 +44,10 @@ protected void tick(Block b) {
for (int slot : getInputSlots()) {
ItemStack item = inv.getItemInSlot(slot);

if (item == null || item.getAmount() != 1) {
continue;
}

if (charge(b, inv, slot, item)) {
return;
}
Original file line number Diff line number Diff line change
@@ -13,10 +13,8 @@
* An old remnant of CS-CoreLib.
* This will be removed once we updated everything.
* Don't look at the code, it will be gone soon, don't worry.
*
* @deprecated Only used by the legacy {@link BlockStorage} system.
* Only used by the legacy {@link BlockStorage} system.
*/
@Deprecated
public class Config {

private final File file;
Original file line number Diff line number Diff line change
@@ -16,9 +16,7 @@
* An old remnant of CS-CoreLib.
* This will be removed once we updated everything.
* Don't look at the code, it will be gone soon, don't worry.
*
*/
@Deprecated
public class ChestMenu {

private boolean clickable;
@@ -207,7 +205,6 @@ public ChestMenu addMenuCloseHandler(MenuCloseHandler handler) {
*
* @return The ChestMenu Instance
*/
@Deprecated
public ChestMenu build() {
return this;
}
Original file line number Diff line number Diff line change
@@ -4,9 +4,7 @@
* An old remnant of CS-CoreLib.
* This will be removed once we updated everything.
* Don't look at the code, it will be gone soon, don't worry.
*
*/
@Deprecated
public class ClickAction {

private boolean right;
Original file line number Diff line number Diff line change
@@ -17,12 +17,9 @@

/**
* An old {@link Listener} for CS-CoreLib
*
* @deprecated This is an old remnant of CS-CoreLib, the last bits of the past. They will be removed once everything is
* This is an old remnant of CS-CoreLib, the last bits of the past. They will be removed once everything is
* updated.
*
*/
@Deprecated
public class MenuListener implements Listener {

static final Map<UUID, ChestMenu> menus = new HashMap<>();
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/**
* Old CS-CoreLib 1.X code.
*/
@java.lang.Deprecated
package me.mrCookieSlime.CSCoreLibPlugin;
1 change: 0 additions & 1 deletion src/main/java/me/mrCookieSlime/package-info.java
Original file line number Diff line number Diff line change
@@ -3,5 +3,4 @@
* Don't look too close at the code that lays here. It's horrible, believe me.
* Once we updated everything, all of these classes will be removed.
*/
@java.lang.Deprecated
package me.mrCookieSlime;