Skip to content

add support for 1.21.4, fix slimefun breaking changes #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexsvorada wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add support for 1.21.4, fix slimefun breaking changes #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4bd16d
add support for 1.21.4, fix slimefun breaking changes
alexsvorada Apr 21, 2025
1bb229d
fix bstats shading issue, set java compiler to v17
alexsvorada Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<version>DevTest-33</version>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -53,14 +53,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<version>3.6.0</version>

<configuration>

<!-- Shade dependencies into the output jar -->
<relocations>
<relocation>
<pattern>org.bstats.bukkit</pattern>
<pattern>org.bstats</pattern>
<shadedPattern>me.sfiguz7.transcendence.bstats</shadedPattern>
</relocation>
</relocations>
Expand Down Expand Up @@ -92,20 +92,20 @@
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>1.7</version>
<version>3.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.15.2-R0.1-SNAPSHOT</version>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.21.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.github.TheBusyBiscuit</groupId>
<artifactId>Slimefun4</artifactId>
<version>RC-27</version>
<version>experimental-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand Down
66 changes: 33 additions & 33 deletions src/main/java/me/sfiguz7/transcendence/TranscEndence.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ public void onEnable() {

new Research(new NamespacedKey(this, "unstable"),
++researchId, "Unstable", 23)
.addItems(TEItems.UNSTABLE_INGOT,
TEItems.UNSTABLE_INGOT_2,
TEItems.UNSTABLE_INGOT_3,
TEItems.UNSTABLE_INGOT_4).register();
.addItems(TEItems.UNSTABLE_INGOT.item(),
TEItems.UNSTABLE_INGOT_2.item(),
TEItems.UNSTABLE_INGOT_3.item(),
TEItems.UNSTABLE_INGOT_4.item()).register();

for (Zots.Type type : Zots.Type.values()) {
new Zots(type).register(this);
Expand All @@ -135,8 +135,8 @@ public void onEnable() {

new Research(new NamespacedKey(this, "stable"),
++researchId, "Stable", 30)
.addItems(TEItems.STABLE_INGOT,
TEItems.STABLE_BLOCK).register();
.addItems(TEItems.STABLE_INGOT.item(),
TEItems.STABLE_BLOCK.item()).register();
/* More items moved below for aesthetic purposes */


Expand All @@ -145,24 +145,24 @@ public void onEnable() {

new Research(new NamespacedKey(this, "quirp_scatterer"),
++researchId, "Quirps Scatterer", 20)
.addItems(TEItems.QUIRP_SCATTERER).register();
.addItems(TEItems.QUIRP_SCATTERER.item()).register();

new NanobotCrafter().register(this);

new Research(new NamespacedKey(this, "nanobot_crafter"),
++researchId, "Nanobot Crafter", 15)
.addItems(TEItems.NANOBOT_CRAFTER).register();
.addItems(TEItems.NANOBOT_CRAFTER.item()).register();

new QuirpOscillator().register(this);

new Research(new NamespacedKey(this, "quirp_oscillator"),
++researchId, "Quirps Oscillator", 37)
.addItems(TEItems.QUIRP_OSCILLATOR,
TEItems.QUIRP_UP,
TEItems.QUIRP_DOWN,
TEItems.QUIRP_LEFT,
TEItems.QUIRP_RIGHT,
TEItems.QUIRP_CONDENSATE).register();
.addItems(TEItems.QUIRP_OSCILLATOR.item(),
TEItems.QUIRP_UP.item(),
TEItems.QUIRP_DOWN.item(),
TEItems.QUIRP_LEFT.item(),
TEItems.QUIRP_RIGHT.item(),
TEItems.QUIRP_CONDENSATE.item()).register();


/* Items pt. 2 */
Expand All @@ -171,35 +171,35 @@ public void onEnable() {
}
new Research(new NamespacedKey(this, "zots"),
++researchId, "Zots", 30)
.addItems(TEItems.ZOT_UP,
TEItems.ZOT_DOWN,
TEItems.ZOT_LEFT,
TEItems.ZOT_RIGHT,
TEItems.ZOT_UP_2,
TEItems.ZOT_DOWN_2,
TEItems.ZOT_LEFT_2,
TEItems.ZOT_RIGHT_2).register();
.addItems(TEItems.ZOT_UP.item(),
TEItems.ZOT_DOWN.item(),
TEItems.ZOT_LEFT.item(),
TEItems.ZOT_RIGHT.item(),
TEItems.ZOT_UP_2.item(),
TEItems.ZOT_DOWN_2.item(),
TEItems.ZOT_LEFT_2.item(),
TEItems.ZOT_RIGHT_2.item()).register();

for (Daxi.Type type : Daxi.Type.values()) {
new Daxi(type).register(this);
}

new Research(new NamespacedKey(this, "daxis"),
++researchId, "Daxis", 30)
.addItems(TEItems.DAXI_STRENGTH,
TEItems.DAXI_ABSORPTION,
TEItems.DAXI_FORTITUDE,
TEItems.DAXI_SATURATION,
TEItems.DAXI_REGENERATION).register();
.addItems(TEItems.DAXI_STRENGTH.item(),
TEItems.DAXI_ABSORPTION.item(),
TEItems.DAXI_FORTITUDE.item(),
TEItems.DAXI_SATURATION.item(),
TEItems.DAXI_REGENERATION.item()).register();

for (Polarizer.Type type : Polarizer.Type.values()) {
new Polarizer(type).register(this);
}

new Research(new NamespacedKey(this, "polarizers"),
++researchId, "Polarizers", 23)
.addItems(TEItems.VERTICAL_POLARIZER,
TEItems.HORIZONTAL_POLARIZER).register();
.addItems(TEItems.VERTICAL_POLARIZER.item(),
TEItems.HORIZONTAL_POLARIZER.item()).register();

/* Machines pt. 2 */
new QuirpAnnihilator().register(this);
Expand All @@ -210,15 +210,15 @@ public void onEnable() {

new Research(new NamespacedKey(this, "quirp_annihilator"),
++researchId, "Quirps Annihilator", 40)
.addItems(TEItems.QUIRP_ANNIHILATOR,
TEItems.QUIRP_CYCLER,
TEItems.STABILIZER).register();
.addItems(TEItems.QUIRP_ANNIHILATOR.item(),
TEItems.QUIRP_CYCLER.item(),
TEItems.STABILIZER.item()).register();

new ZotOverloader().register(this);

new Research(new NamespacedKey(this, "zot_overloader"),
++researchId, "Zot Overloader", 35)
.addItems(TEItems.ZOT_OVERLOADER).register();
.addItems(TEItems.ZOT_OVERLOADER.item()).register();

new SlimefunItem(TEItems.transcendence, TEItems.TE_INFO, RecipeType.NULL, new ItemStack[0]
).register(this);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/me/sfiguz7/transcendence/implementation/items/generators/QuirpScatterer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ public class QuirpScatterer extends AGenerator implements EnergyNetProvider {
public QuirpScatterer() {
super(TEItems.transcendence, TEItems.QUIRP_SCATTERER, TERecipeType.NANOBOT_CRAFTER,
new ItemStack[] {
TEItems.QUIRP_CONDENSATE, TEItems.QUIRP_UP, TEItems.QUIRP_CONDENSATE,
TEItems.QUIRP_LEFT, TEItems.QUIRP_CONDENSATE, TEItems.QUIRP_RIGHT,
TEItems.QUIRP_CONDENSATE, TEItems.QUIRP_DOWN, TEItems.QUIRP_CONDENSATE}
TEItems.QUIRP_CONDENSATE.item(), TEItems.QUIRP_UP.item(), TEItems.QUIRP_CONDENSATE.item(),
TEItems.QUIRP_LEFT.item(), TEItems.QUIRP_CONDENSATE.item(), TEItems.QUIRP_RIGHT.item(),
TEItems.QUIRP_CONDENSATE.item(), TEItems.QUIRP_DOWN.item(), TEItems.QUIRP_CONDENSATE.item()}
);
}

Expand Down Expand Up @@ -48,4 +48,4 @@ public int getCapacity() {
return 65536;
}

}
}
32 changes: 16 additions & 16 deletions src/main/java/me/sfiguz7/transcendence/implementation/items/items/Daxi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ private void startAnimation(Player p) {
float yRand = (random.nextFloat() - 0.5F) * 3.2F;
float zRand = (random.nextFloat() - 0.5F) * 3.2F;

p.getWorld().spawnParticle(Particle.REDSTONE,
p.getWorld().spawnParticle(Particle.DUST,
l.getX() + (double) xRand,
l.getY() + 2.0D + (double) yRand,
l.getZ() + (double) zRand,
Expand Down Expand Up @@ -169,40 +169,40 @@ public static void reapplyEffects(Player p) {

public enum Type {
STRENGTH(TEItems.DAXI_STRENGTH,
new ItemStack[] {TEItems.ZOT_UP_2, TEItems.ZOT_UP_2, TEItems.ZOT_UP_2, TEItems.ZOT_UP_2},
new ItemStack[] {TEItems.ZOT_UP, TEItems.ZOT_UP, TEItems.ZOT_UP, TEItems.ZOT_UP},
new ItemStack[] {TEItems.ZOT_UP_2.item(), TEItems.ZOT_UP_2.item(), TEItems.ZOT_UP_2.item(), TEItems.ZOT_UP_2.item()},
new ItemStack[] {TEItems.ZOT_UP.item(), TEItems.ZOT_UP.item(), TEItems.ZOT_UP.item(), TEItems.ZOT_UP.item()},
new Color[] {Color.RED, Color.RED, Color.FUCHSIA, Color.FUCHSIA},
PotionEffectType.INCREASE_DAMAGE,
PotionEffectType.STRENGTH,
CONFIG.getInt("daxi-effects.strength-level"),
CONFIG.getString("options.daxi-message-strength")
),
ABSORPTION(TEItems.DAXI_ABSORPTION,
new ItemStack[] {TEItems.ZOT_DOWN_2, TEItems.ZOT_DOWN_2, TEItems.ZOT_DOWN_2, TEItems.ZOT_DOWN_2},
new ItemStack[] {TEItems.ZOT_DOWN, TEItems.ZOT_DOWN, TEItems.ZOT_DOWN, TEItems.ZOT_DOWN},
new ItemStack[] {TEItems.ZOT_DOWN_2.item(), TEItems.ZOT_DOWN_2.item(), TEItems.ZOT_DOWN_2.item(), TEItems.ZOT_DOWN_2.item()},
new ItemStack[] {TEItems.ZOT_DOWN.item(), TEItems.ZOT_DOWN.item(), TEItems.ZOT_DOWN.item(), TEItems.ZOT_DOWN.item()},
new Color[] {Color.YELLOW, Color.YELLOW, Color.ORANGE, Color.ORANGE},
PotionEffectType.ABSORPTION,
CONFIG.getInt("daxi-effects.absorption-level"),
CONFIG.getString("options.daxi-message-absorption")
),
FORTITUDE(TEItems.DAXI_FORTITUDE,
new ItemStack[] {TEItems.ZOT_LEFT_2, TEItems.ZOT_LEFT_2, TEItems.ZOT_LEFT_2, TEItems.ZOT_LEFT_2},
new ItemStack[] {TEItems.ZOT_LEFT, TEItems.ZOT_LEFT, TEItems.ZOT_LEFT, TEItems.ZOT_LEFT},
new ItemStack[] {TEItems.ZOT_LEFT_2.item(), TEItems.ZOT_LEFT_2.item(), TEItems.ZOT_LEFT_2.item(), TEItems.ZOT_LEFT_2.item()},
new ItemStack[] {TEItems.ZOT_LEFT.item(), TEItems.ZOT_LEFT.item(), TEItems.ZOT_LEFT.item(), TEItems.ZOT_LEFT.item()},
new Color[] {Color.LIME, Color.LIME, Color.GREEN, Color.GREEN},
PotionEffectType.DAMAGE_RESISTANCE,
PotionEffectType.RESISTANCE,
CONFIG.getInt("daxi-effects.fortitude-level"),
CONFIG.getString("options.daxi-message-fortitude")
),
SATURATION(TEItems.DAXI_SATURATION,
new ItemStack[] {TEItems.ZOT_RIGHT_2, TEItems.ZOT_RIGHT_2, TEItems.ZOT_RIGHT_2, TEItems.ZOT_RIGHT_2},
new ItemStack[] {TEItems.ZOT_RIGHT, TEItems.ZOT_RIGHT, TEItems.ZOT_RIGHT, TEItems.ZOT_RIGHT},
new ItemStack[] {TEItems.ZOT_RIGHT_2.item(), TEItems.ZOT_RIGHT_2.item(), TEItems.ZOT_RIGHT_2.item(), TEItems.ZOT_RIGHT_2.item()},
new ItemStack[] {TEItems.ZOT_RIGHT.item(), TEItems.ZOT_RIGHT.item(), TEItems.ZOT_RIGHT.item(), TEItems.ZOT_RIGHT.item()},
new Color[] {Color.AQUA, Color.AQUA, Color.TEAL, Color.TEAL},
PotionEffectType.SATURATION,
CONFIG.getInt("daxi-effects.saturation-level"),
CONFIG.getString("options.daxi-message-saturation")
),
REGENERATION(TEItems.DAXI_REGENERATION,
new ItemStack[] {TEItems.ZOT_UP_2, TEItems.ZOT_LEFT_2, TEItems.ZOT_RIGHT_2, TEItems.ZOT_DOWN_2},
new ItemStack[] {TEItems.ZOT_UP, TEItems.ZOT_LEFT, TEItems.ZOT_RIGHT, TEItems.ZOT_DOWN},
new ItemStack[] {TEItems.ZOT_UP_2.item(), TEItems.ZOT_LEFT_2.item(), TEItems.ZOT_RIGHT_2.item(), TEItems.ZOT_DOWN_2.item()},
new ItemStack[] {TEItems.ZOT_UP.item(), TEItems.ZOT_LEFT.item(), TEItems.ZOT_RIGHT.item(), TEItems.ZOT_DOWN.item()},
new Color[] {Color.RED, Color.YELLOW, Color.LIME, Color.AQUA},
PotionEffectType.REGENERATION,
CONFIG.getInt("daxi-effects.regeneration-level"),
Expand All @@ -223,9 +223,9 @@ public enum Type {
this.zotsAnimation = zotsAnimation;
this.colors = colors;
this.recipe = new ItemStack[] {
TEItems.STABLE_BLOCK, zots[0], TEItems.STABLE_BLOCK,
zots[1], TEItems.STABLE_INGOT, zots[2],
TEItems.STABLE_BLOCK, zots[3], TEItems.STABLE_BLOCK};
TEItems.STABLE_BLOCK.item(), zots[0], TEItems.STABLE_BLOCK.item(),
zots[1], TEItems.STABLE_INGOT.item(), zots[2],
TEItems.STABLE_BLOCK.item(), zots[3], TEItems.STABLE_BLOCK.item()};
this.effect = effect;
this.level = level - 1;
this.message = message;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/sfiguz7/transcendence/implementation/items/items/Polarizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ public static int[] getChances(Type type) {
public enum Type {
VERTICAL(TEItems.VERTICAL_POLARIZER,
getPolarizedChances(true),
new ItemStack[] {TEItems.QUIRP_UP, TEItems.QUIRP_DOWN}
new ItemStack[] {TEItems.QUIRP_UP.item(), TEItems.QUIRP_DOWN.item()}
),
HORIZONTAL(TEItems.HORIZONTAL_POLARIZER,
getPolarizedChances(false),
new ItemStack[] {TEItems.QUIRP_LEFT, TEItems.QUIRP_RIGHT}
new ItemStack[] {TEItems.QUIRP_LEFT.item(), TEItems.QUIRP_RIGHT.item()}
);

private final SlimefunItemStack slimefunItem;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/me/sfiguz7/transcendence/implementation/items/items/StabilizedItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ public StabilizedItems(Type type) {

public enum Type {
INGOT(TEItems.STABLE_INGOT,
new ItemStack[] {TEItems.UNSTABLE_INGOT_4, TEItems.QUIRP_CONDENSATE, null,
new ItemStack[] {TEItems.UNSTABLE_INGOT_4.item(), TEItems.QUIRP_CONDENSATE.item(), null,
null, null, null,
null, null, null
},
TERecipeType.STABILIZER
),
BLOCK(TEItems.STABLE_BLOCK,
new ItemStack[] {TEItems.STABLE_INGOT, TEItems.STABLE_INGOT, TEItems.STABLE_INGOT,
TEItems.STABLE_INGOT, TEItems.STABLE_INGOT, TEItems.STABLE_INGOT,
TEItems.STABLE_INGOT, TEItems.STABLE_INGOT, TEItems.STABLE_INGOT
new ItemStack[] {TEItems.STABLE_INGOT.item(), TEItems.STABLE_INGOT.item(), TEItems.STABLE_INGOT.item(),
TEItems.STABLE_INGOT.item(), TEItems.STABLE_INGOT.item(), TEItems.STABLE_INGOT.item(),
TEItems.STABLE_INGOT.item(), TEItems.STABLE_INGOT.item(), TEItems.STABLE_INGOT.item()
},
TERecipeType.NANOBOT_CRAFTER
);
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/me/sfiguz7/transcendence/implementation/items/items/UnstableIngots.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ public UnstableIngots(Type type) {

public enum Type {
FULL(TEItems.UNSTABLE_INGOT,
new ItemStack[] {SlimefunItems.BLISTERING_INGOT_3, TEItems.QUIRP_UP, SlimefunItems.BLISTERING_INGOT_3,
TEItems.QUIRP_LEFT, new ItemStack(Material.DIAMOND_BLOCK), TEItems.QUIRP_RIGHT,
SlimefunItems.BLISTERING_INGOT_3, TEItems.QUIRP_DOWN, SlimefunItems.BLISTERING_INGOT_3
new ItemStack[] {SlimefunItems.BLISTERING_INGOT_3.item(), TEItems.QUIRP_UP.item(), SlimefunItems.BLISTERING_INGOT_3.item(),
TEItems.QUIRP_LEFT.item(), new ItemStack(Material.DIAMOND_BLOCK), TEItems.QUIRP_RIGHT.item(),
SlimefunItems.BLISTERING_INGOT_3.item(), TEItems.QUIRP_DOWN.item(), SlimefunItems.BLISTERING_INGOT_3.item()
}
),
SEVENTYFIVE(TEItems.UNSTABLE_INGOT_2, TEItems.UNSTABLE_INGOT
SEVENTYFIVE(TEItems.UNSTABLE_INGOT_2, TEItems.UNSTABLE_INGOT.item()
),
FIFTY(TEItems.UNSTABLE_INGOT_3, TEItems.UNSTABLE_INGOT_2
FIFTY(TEItems.UNSTABLE_INGOT_3, TEItems.UNSTABLE_INGOT_2.item()
),
TWENTYFIVE(TEItems.UNSTABLE_INGOT_4, TEItems.UNSTABLE_INGOT_3
TWENTYFIVE(TEItems.UNSTABLE_INGOT_4, TEItems.UNSTABLE_INGOT_3.item()
);

private final SlimefunItemStack slimefunItem;
Expand All @@ -39,7 +39,7 @@ TEItems.QUIRP_LEFT, new ItemStack(Material.DIAMOND_BLOCK), TEItems.QUIRP_RIGHT,

Type(SlimefunItemStack slimefunItem, ItemStack prevIngot) {
this(slimefunItem, new ItemStack[] {
prevIngot, TEItems.QUIRP_CONDENSATE, null,
prevIngot, TEItems.QUIRP_CONDENSATE.item(), null,
null, null, null,
null, null, null
});
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/me/sfiguz7/transcendence/implementation/items/items/Zots.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ public Zots(Type type) {
}

public enum Type {
UP(TEItems.ZOT_UP, TEItems.QUIRP_UP
UP(TEItems.ZOT_UP, TEItems.QUIRP_UP.item()
),
DOWN(TEItems.ZOT_DOWN, TEItems.QUIRP_DOWN
DOWN(TEItems.ZOT_DOWN, TEItems.QUIRP_DOWN.item()
),
LEFT(TEItems.ZOT_LEFT, TEItems.QUIRP_LEFT
LEFT(TEItems.ZOT_LEFT, TEItems.QUIRP_LEFT.item()
),
RIGHT(TEItems.ZOT_RIGHT, TEItems.QUIRP_RIGHT
RIGHT(TEItems.ZOT_RIGHT, TEItems.QUIRP_RIGHT.item()
);

private final SlimefunItemStack slimefunItem;
Expand All @@ -31,7 +31,7 @@ public enum Type {

this.recipe = new ItemStack[] {
quirp, quirp, quirp,
quirp, stableBlock, quirp,
quirp, stableBlock.item(), quirp,
quirp, quirp, quirp};
}
}
Expand Down
Loading