diff --git a/pom.xml b/pom.xml
index 1350f36..c6387f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,8 @@
DevTest-33
- 1.8
- 1.8
+ 17
+ 17
UTF-8
@@ -53,14 +53,14 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.2.4
+ 3.6.0
- org.bstats.bukkit
+ org.bstats
me.sfiguz7.transcendence.bstats
@@ -92,20 +92,20 @@
org.bstats
bstats-bukkit
- 1.7
+ 3.1.0
compile
- org.bukkit
- bukkit
- 1.15.2-R0.1-SNAPSHOT
+ org.spigotmc
+ spigot-api
+ 1.21.4-R0.1-SNAPSHOT
provided
com.github.TheBusyBiscuit
Slimefun4
- RC-27
+ experimental-SNAPSHOT
provided
diff --git a/src/main/java/me/sfiguz7/transcendence/TranscEndence.java b/src/main/java/me/sfiguz7/transcendence/TranscEndence.java
index 51e76c4..f24294c 100644
--- a/src/main/java/me/sfiguz7/transcendence/TranscEndence.java
+++ b/src/main/java/me/sfiguz7/transcendence/TranscEndence.java
@@ -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);
@@ -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 */
@@ -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 */
@@ -171,14 +171,14 @@ 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);
@@ -186,11 +186,11 @@ public void onEnable() {
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);
@@ -198,8 +198,8 @@ public void onEnable() {
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);
@@ -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);
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/items/generators/QuirpScatterer.java b/src/main/java/me/sfiguz7/transcendence/implementation/items/generators/QuirpScatterer.java
index 50fa2a3..466ee13 100644
--- a/src/main/java/me/sfiguz7/transcendence/implementation/items/generators/QuirpScatterer.java
+++ b/src/main/java/me/sfiguz7/transcendence/implementation/items/generators/QuirpScatterer.java
@@ -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()}
);
}
@@ -48,4 +48,4 @@ public int getCapacity() {
return 65536;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/items/items/Daxi.java b/src/main/java/me/sfiguz7/transcendence/implementation/items/items/Daxi.java
index 795c7bb..02874fe 100644
--- a/src/main/java/me/sfiguz7/transcendence/implementation/items/items/Daxi.java
+++ b/src/main/java/me/sfiguz7/transcendence/implementation/items/items/Daxi.java
@@ -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,
@@ -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"),
@@ -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;
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/items/items/Polarizer.java b/src/main/java/me/sfiguz7/transcendence/implementation/items/items/Polarizer.java
index 0f7c0f8..244bd5b 100644
--- a/src/main/java/me/sfiguz7/transcendence/implementation/items/items/Polarizer.java
+++ b/src/main/java/me/sfiguz7/transcendence/implementation/items/items/Polarizer.java
@@ -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;
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/items/items/StabilizedItems.java b/src/main/java/me/sfiguz7/transcendence/implementation/items/items/StabilizedItems.java
index 1921a3f..1681cd2 100644
--- a/src/main/java/me/sfiguz7/transcendence/implementation/items/items/StabilizedItems.java
+++ b/src/main/java/me/sfiguz7/transcendence/implementation/items/items/StabilizedItems.java
@@ -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
);
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/items/items/UnstableIngots.java b/src/main/java/me/sfiguz7/transcendence/implementation/items/items/UnstableIngots.java
index 72fd2f6..103f09e 100644
--- a/src/main/java/me/sfiguz7/transcendence/implementation/items/items/UnstableIngots.java
+++ b/src/main/java/me/sfiguz7/transcendence/implementation/items/items/UnstableIngots.java
@@ -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;
@@ -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
});
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/items/items/Zots.java b/src/main/java/me/sfiguz7/transcendence/implementation/items/items/Zots.java
index a2e1fc6..073674b 100644
--- a/src/main/java/me/sfiguz7/transcendence/implementation/items/items/Zots.java
+++ b/src/main/java/me/sfiguz7/transcendence/implementation/items/items/Zots.java
@@ -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;
@@ -31,7 +31,7 @@ public enum Type {
this.recipe = new ItemStack[] {
quirp, quirp, quirp,
- quirp, stableBlock, quirp,
+ quirp, stableBlock.item(), quirp,
quirp, quirp, quirp};
}
}
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/QuirpAnnihilator.java b/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/QuirpAnnihilator.java
index e0f3a77..11c411d 100644
--- a/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/QuirpAnnihilator.java
+++ b/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/QuirpAnnihilator.java
@@ -12,19 +12,19 @@ public class QuirpAnnihilator extends AContainer implements RecipeDisplayItem {
public QuirpAnnihilator() {
super(TEItems.transcendence, TEItems.QUIRP_ANNIHILATOR, TERecipeType.NANOBOT_CRAFTER,
- new ItemStack[] {SlimefunItems.ADVANCED_CIRCUIT_BOARD, TEItems.QUIRP_UP,
- SlimefunItems.ADVANCED_CIRCUIT_BOARD,
- TEItems.QUIRP_LEFT, SlimefunItems.HEATED_PRESSURE_CHAMBER_2, TEItems.QUIRP_RIGHT,
- SlimefunItems.REINFORCED_PLATE, TEItems.QUIRP_DOWN, SlimefunItems.REINFORCED_PLATE});
+ new ItemStack[] {SlimefunItems.ADVANCED_CIRCUIT_BOARD.item(), TEItems.QUIRP_UP.item(),
+ SlimefunItems.ADVANCED_CIRCUIT_BOARD.item(),
+ TEItems.QUIRP_LEFT.item(), SlimefunItems.HEATED_PRESSURE_CHAMBER_2.item(), TEItems.QUIRP_RIGHT.item(),
+ SlimefunItems.REINFORCED_PLATE.item(), TEItems.QUIRP_DOWN.item(), SlimefunItems.REINFORCED_PLATE.item()});
}
@Override
protected void registerDefaultRecipes() {
- registerRecipe(8, new ItemStack[] {TEItems.QUIRP_UP, TEItems.QUIRP_DOWN},
- new ItemStack[] {TEItems.QUIRP_CONDENSATE});
- registerRecipe(8, new ItemStack[] {TEItems.QUIRP_LEFT, TEItems.QUIRP_RIGHT},
- new ItemStack[] {TEItems.QUIRP_CONDENSATE});
+ registerRecipe(8, new ItemStack[] {TEItems.QUIRP_UP.item(), TEItems.QUIRP_DOWN.item()},
+ new ItemStack[] {TEItems.QUIRP_CONDENSATE.item()});
+ registerRecipe(8, new ItemStack[] {TEItems.QUIRP_LEFT.item(), TEItems.QUIRP_RIGHT.item()},
+ new ItemStack[] {TEItems.QUIRP_CONDENSATE.item()});
}
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/QuirpCycler.java b/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/QuirpCycler.java
index 0600e91..bfeb2d8 100644
--- a/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/QuirpCycler.java
+++ b/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/QuirpCycler.java
@@ -11,22 +11,22 @@ public class QuirpCycler extends AContainer implements RecipeDisplayItem {
public QuirpCycler() {
super(TEItems.transcendence, TEItems.QUIRP_CYCLER, TERecipeType.NANOBOT_CRAFTER,
- new ItemStack[] {TEItems.QUIRP_CONDENSATE, TEItems.QUIRP_UP, TEItems.QUIRP_CONDENSATE,
- TEItems.QUIRP_LEFT, TEItems.QUIRP_OSCILLATOR, TEItems.QUIRP_RIGHT,
- TEItems.QUIRP_CONDENSATE, TEItems.QUIRP_DOWN, TEItems.QUIRP_CONDENSATE});
+ new ItemStack[] {TEItems.QUIRP_CONDENSATE.item(), TEItems.QUIRP_UP.item(), TEItems.QUIRP_CONDENSATE.item(),
+ TEItems.QUIRP_LEFT.item(), TEItems.QUIRP_OSCILLATOR.item(), TEItems.QUIRP_RIGHT.item(),
+ TEItems.QUIRP_CONDENSATE.item(), TEItems.QUIRP_DOWN.item(), TEItems.QUIRP_CONDENSATE.item()});
}
@Override
protected void registerDefaultRecipes() {
- registerRecipe(8, new ItemStack[] {TEItems.QUIRP_UP},
- new ItemStack[] {TEItems.QUIRP_RIGHT});
- registerRecipe(8, new ItemStack[] {TEItems.QUIRP_RIGHT},
- new ItemStack[] {TEItems.QUIRP_DOWN});
- registerRecipe(8, new ItemStack[] {TEItems.QUIRP_DOWN},
- new ItemStack[] {TEItems.QUIRP_LEFT});
- registerRecipe(8, new ItemStack[] {TEItems.QUIRP_LEFT},
- new ItemStack[] {TEItems.QUIRP_UP});
+ registerRecipe(8, new ItemStack[] {TEItems.QUIRP_UP.item()},
+ new ItemStack[] {TEItems.QUIRP_RIGHT.item()});
+ registerRecipe(8, new ItemStack[] {TEItems.QUIRP_RIGHT.item()},
+ new ItemStack[] {TEItems.QUIRP_DOWN.item()});
+ registerRecipe(8, new ItemStack[] {TEItems.QUIRP_DOWN.item()},
+ new ItemStack[] {TEItems.QUIRP_LEFT.item()});
+ registerRecipe(8, new ItemStack[] {TEItems.QUIRP_LEFT.item()},
+ new ItemStack[] {TEItems.QUIRP_UP.item()});
}
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/QuirpOscillator.java b/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/QuirpOscillator.java
index c9ebde6..32aaeee 100644
--- a/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/QuirpOscillator.java
+++ b/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/QuirpOscillator.java
@@ -31,10 +31,10 @@
public class QuirpOscillator extends SimpleSlimefunItem implements TEInventoryBlock, EnergyNetComponent {
private static final int ENERGY_CONSUMPTION = 128;
- private final ItemStack[] quirps = {TEItems.QUIRP_UP,
- TEItems.QUIRP_DOWN,
- TEItems.QUIRP_LEFT,
- TEItems.QUIRP_RIGHT
+ private final ItemStack[] quirps = {TEItems.QUIRP_UP.item(),
+ TEItems.QUIRP_DOWN.item(),
+ TEItems.QUIRP_LEFT.item(),
+ TEItems.QUIRP_RIGHT.item()
};
private final int[] chancesDefault = {25,
25,
@@ -64,10 +64,10 @@ public class QuirpOscillator extends SimpleSlimefunItem implements
public QuirpOscillator() {
super(TEItems.transcendence, TEItems.QUIRP_OSCILLATOR, TERecipeType.NANOBOT_CRAFTER,
- new ItemStack[] {SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.REINFORCED_PLATE,
- SlimefunItems.BLISTERING_INGOT_3,
- SlimefunItems.SYNTHETIC_EMERALD, SlimefunItems.NETHER_STAR_REACTOR, SlimefunItems.SYNTHETIC_EMERALD,
- SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.REINFORCED_PLATE, SlimefunItems.BLISTERING_INGOT_3}
+ new ItemStack[] {SlimefunItems.BLISTERING_INGOT_3.item(), SlimefunItems.REINFORCED_PLATE.item(),
+ SlimefunItems.BLISTERING_INGOT_3.item(),
+ SlimefunItems.SYNTHETIC_EMERALD.item(), SlimefunItems.NETHER_STAR_REACTOR.item(), SlimefunItems.SYNTHETIC_EMERALD.item(),
+ SlimefunItems.BLISTERING_INGOT_3.item(), SlimefunItems.REINFORCED_PLATE.item(), SlimefunItems.BLISTERING_INGOT_3.item()}
);
createPreset(this, this::constructMenu);
@@ -75,20 +75,20 @@ public QuirpOscillator() {
private void constructMenu(BlockMenuPreset preset) {
for (int i : border) {
- preset.addItem(i, new CustomItemStack(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "),
+ preset.addItem(i, CustomItemStack.create(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "),
ChestMenuUtils.getEmptyClickHandler());
}
for (int i : inputBorder) {
- preset.addItem(i, new CustomItemStack(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "),
+ preset.addItem(i, CustomItemStack.create(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "),
ChestMenuUtils.getEmptyClickHandler());
}
for (int i : outputBorder) {
- preset.addItem(i, new CustomItemStack(new ItemStack(Material.ORANGE_STAINED_GLASS_PANE), " "),
+ preset.addItem(i, CustomItemStack.create(new ItemStack(Material.ORANGE_STAINED_GLASS_PANE), " "),
ChestMenuUtils.getEmptyClickHandler());
}
for (int i : polarizerBorder) {
- preset.addItem(i, new CustomItemStack(new ItemStack(Material.PURPLE_STAINED_GLASS_PANE), " "),
+ preset.addItem(i, CustomItemStack.create(new ItemStack(Material.PURPLE_STAINED_GLASS_PANE), " "),
ChestMenuUtils.getEmptyClickHandler());
}
@@ -190,10 +190,10 @@ private ItemStack getQuirp(BlockMenu menu) {
private int[] getChances(BlockMenu menu) {
ItemStack pol = menu.getItemInSlot(polarizerSlot);
- if (SlimefunUtils.isItemSimilar(pol, TEItems.VERTICAL_POLARIZER, true)) {
+ if (SlimefunUtils.isItemSimilar(pol, TEItems.VERTICAL_POLARIZER.item(), true)) {
return Polarizer.getChances(Polarizer.Type.VERTICAL);
}
- if (SlimefunUtils.isItemSimilar(pol, TEItems.HORIZONTAL_POLARIZER, true)) {
+ if (SlimefunUtils.isItemSimilar(pol, TEItems.HORIZONTAL_POLARIZER.item(), true)) {
return Polarizer.getChances(Polarizer.Type.HORIZONTAL);
}
return chancesDefault;
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/Stabilizer.java b/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/Stabilizer.java
index f5e2952..675ec90 100644
--- a/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/Stabilizer.java
+++ b/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/Stabilizer.java
@@ -11,22 +11,22 @@ public class Stabilizer extends AContainer implements RecipeDisplayItem {
public Stabilizer() {
super(TEItems.transcendence, TEItems.STABILIZER, TERecipeType.NANOBOT_CRAFTER,
- new ItemStack[] {TEItems.QUIRP_CONDENSATE, TEItems.QUIRP_UP, TEItems.QUIRP_CONDENSATE,
- TEItems.QUIRP_LEFT, TEItems.UNSTABLE_INGOT, TEItems.QUIRP_RIGHT,
- TEItems.QUIRP_CONDENSATE, TEItems.QUIRP_DOWN, TEItems.QUIRP_CONDENSATE});
+ new ItemStack[] {TEItems.QUIRP_CONDENSATE.item(), TEItems.QUIRP_UP.item(), TEItems.QUIRP_CONDENSATE.item(),
+ TEItems.QUIRP_LEFT.item(), TEItems.UNSTABLE_INGOT.item(), TEItems.QUIRP_RIGHT.item(),
+ TEItems.QUIRP_CONDENSATE.item(), TEItems.QUIRP_DOWN.item(), TEItems.QUIRP_CONDENSATE.item()});
}
@Override
protected void registerDefaultRecipes() {
- registerRecipe(8, new ItemStack[] {TEItems.UNSTABLE_INGOT, TEItems.QUIRP_CONDENSATE},
- new ItemStack[] {TEItems.UNSTABLE_INGOT_2});
- registerRecipe(8, new ItemStack[] {TEItems.UNSTABLE_INGOT_2, TEItems.QUIRP_CONDENSATE},
- new ItemStack[] {TEItems.UNSTABLE_INGOT_3});
- registerRecipe(8, new ItemStack[] {TEItems.UNSTABLE_INGOT_3, TEItems.QUIRP_CONDENSATE},
- new ItemStack[] {TEItems.UNSTABLE_INGOT_4});
- registerRecipe(8, new ItemStack[] {TEItems.UNSTABLE_INGOT_4, TEItems.QUIRP_CONDENSATE},
- new ItemStack[] {TEItems.STABLE_INGOT});
+ registerRecipe(8, new ItemStack[] {TEItems.UNSTABLE_INGOT.item(), TEItems.QUIRP_CONDENSATE.item()},
+ new ItemStack[] {TEItems.UNSTABLE_INGOT_2.item()});
+ registerRecipe(8, new ItemStack[] {TEItems.UNSTABLE_INGOT_2.item(), TEItems.QUIRP_CONDENSATE.item()},
+ new ItemStack[] {TEItems.UNSTABLE_INGOT_3.item()});
+ registerRecipe(8, new ItemStack[] {TEItems.UNSTABLE_INGOT_3.item(), TEItems.QUIRP_CONDENSATE.item()},
+ new ItemStack[] {TEItems.UNSTABLE_INGOT_4.item()});
+ registerRecipe(8, new ItemStack[] {TEItems.UNSTABLE_INGOT_4.item(), TEItems.QUIRP_CONDENSATE.item()},
+ new ItemStack[] {TEItems.STABLE_INGOT.item()});
}
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/ZotOverloader.java b/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/ZotOverloader.java
index 48dfa87..e947f50 100644
--- a/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/ZotOverloader.java
+++ b/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/ZotOverloader.java
@@ -62,23 +62,23 @@ public class ZotOverloader extends SimpleSlimefunItem implements TE
33, 34, 35,
};
private final ItemStack[] allowedSlotsItems = {
- ZOT_UP,
- ZOT_DOWN,
- ZOT_LEFT,
- ZOT_RIGHT
+ ZOT_UP.item(),
+ ZOT_DOWN.item(),
+ ZOT_LEFT.item(),
+ ZOT_RIGHT.item()
};
private final ItemStack[] allowedInputItems = {
- QUIRP_UP,
- QUIRP_DOWN,
- QUIRP_LEFT,
- QUIRP_RIGHT
+ QUIRP_UP.item(),
+ QUIRP_DOWN.item(),
+ QUIRP_LEFT.item(),
+ QUIRP_RIGHT.item()
};
public ZotOverloader() {
super(TEItems.transcendence, TEItems.ZOT_OVERLOADER, TERecipeType.NANOBOT_CRAFTER,
- new ItemStack[] {TEItems.QUIRP_CONDENSATE, TEItems.QUIRP_UP, TEItems.QUIRP_CONDENSATE,
- TEItems.QUIRP_LEFT, TEItems.STABLE_BLOCK, TEItems.QUIRP_RIGHT,
- TEItems.QUIRP_CONDENSATE, TEItems.QUIRP_DOWN, TEItems.QUIRP_CONDENSATE});
+ new ItemStack[] {TEItems.QUIRP_CONDENSATE.item(), TEItems.QUIRP_UP.item(), TEItems.QUIRP_CONDENSATE.item(),
+ TEItems.QUIRP_LEFT.item(), TEItems.STABLE_BLOCK.item(), TEItems.QUIRP_RIGHT.item(),
+ TEItems.QUIRP_CONDENSATE.item(), TEItems.QUIRP_DOWN.item(), TEItems.QUIRP_CONDENSATE.item()});
createPreset(this, this::constructMenu);
addItemHandler(onBreak());
@@ -86,15 +86,15 @@ public ZotOverloader() {
private void constructMenu(BlockMenuPreset preset) {
for (int i : border) {
- preset.addItem(i, new CustomItemStack(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "),
+ preset.addItem(i, CustomItemStack.create(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "),
ChestMenuUtils.getEmptyClickHandler());
}
for (int i : inputBorder) {
- preset.addItem(i, new CustomItemStack(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "),
+ preset.addItem(i, CustomItemStack.create(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "),
ChestMenuUtils.getEmptyClickHandler());
}
for (int i : slotsBorder) {
- preset.addItem(i, new CustomItemStack(new ItemStack(Material.RED_STAINED_GLASS_PANE), " "),
+ preset.addItem(i, CustomItemStack.create(new ItemStack(Material.RED_STAINED_GLASS_PANE), " "),
ChestMenuUtils.getEmptyClickHandler());
}
}
@@ -215,13 +215,13 @@ private boolean isAllowed(ItemStack item, ItemStack[] allowed) {
private ItemStack getZot(String zotSpin) {
if (zotSpin.compareTo("Up") == 0) {
- return ZOT_UP_2;
+ return ZOT_UP_2.item();
} else if (zotSpin.compareTo("Down") == 0) {
- return ZOT_DOWN_2;
+ return ZOT_DOWN_2.item();
} else if (zotSpin.compareTo("Left") == 0) {
- return ZOT_LEFT_2;
+ return ZOT_LEFT_2.item();
}
- return ZOT_RIGHT_2;
+ return ZOT_RIGHT_2.item();
}
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/items/multiblocks/NanobotCrafter.java b/src/main/java/me/sfiguz7/transcendence/implementation/items/multiblocks/NanobotCrafter.java
index e647300..db17450 100644
--- a/src/main/java/me/sfiguz7/transcendence/implementation/items/multiblocks/NanobotCrafter.java
+++ b/src/main/java/me/sfiguz7/transcendence/implementation/items/multiblocks/NanobotCrafter.java
@@ -68,7 +68,7 @@ private void craft(Inventory inv, Block dispenser, Player p, Block b, ItemStack
for (int j = 0; j < 9; j++) {
if (inv.getContents()[j].getType() != Material.AIR) {
if (inv.getContents()[j].getAmount() > 1)
- inv.setItem(j, new CustomItemStack(inv.getContents()[j], inv.getContents()[j].getAmount() - 1));
+ inv.setItem(j, CustomItemStack.create(inv.getContents()[j], inv.getContents()[j].getAmount() - 1));
else inv.setItem(j, null);
}
}
@@ -120,7 +120,7 @@ protected Inventory createVirtualInventory(Inventory inv) {
for (int j = 0; j < inv.getContents().length; j++) {
ItemStack stack = inv.getContents()[j].getAmount() > 1 ?
- new CustomItemStack(inv.getContents()[j], inv.getContents()[j].getAmount() - 1) : null;
+ CustomItemStack.create(inv.getContents()[j], inv.getContents()[j].getAmount() - 1) : null;
fakeInv.setItem(j, stack);
}
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/listeners/DaxiDeathListener.java b/src/main/java/me/sfiguz7/transcendence/implementation/listeners/DaxiDeathListener.java
index f92dace..e560916 100644
--- a/src/main/java/me/sfiguz7/transcendence/implementation/listeners/DaxiDeathListener.java
+++ b/src/main/java/me/sfiguz7/transcendence/implementation/listeners/DaxiDeathListener.java
@@ -47,7 +47,7 @@ public void onPlayerDeath(PlayerDeathEvent e) {
// To work around this, we try to add the stable blocks to the player's inventory, and if that fails
// we drop them directly.
int howMany = activePlayers.get(uuid).size();
- HashMap notFitting = p.getInventory().addItem(new CustomItemStack(TEItems.STABLE_BLOCK, 8*howMany));
+ HashMap notFitting = p.getInventory().addItem(CustomItemStack.create(TEItems.STABLE_BLOCK.item(), 8*howMany));
if (!notFitting.isEmpty()) {
p.getWorld().dropItem(p.getLocation(), notFitting.get(0));
}
@@ -55,4 +55,4 @@ public void onPlayerDeath(PlayerDeathEvent e) {
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/me/sfiguz7/transcendence/lists/TEItems.java b/src/main/java/me/sfiguz7/transcendence/lists/TEItems.java
index a293338..0078c25 100644
--- a/src/main/java/me/sfiguz7/transcendence/lists/TEItems.java
+++ b/src/main/java/me/sfiguz7/transcendence/lists/TEItems.java
@@ -30,7 +30,7 @@ public final class TEItems {
/* Category */
public static final ItemGroup transcendence = new ItemGroup(new NamespacedKey(TranscEndence.getInstance(),
"transcendence"),
- new CustomItemStack(Material.PURPUR_BLOCK, "&5TranscEndence")
+ CustomItemStack.create(Material.PURPUR_BLOCK, "&5TranscEndence")
);
/* Items */
public static final SlimefunItemStack QUIRP_UP = new SlimefunItemStack("QUIRP_UP",
diff --git a/src/main/java/me/sfiguz7/transcendence/lists/TERecipeType.java b/src/main/java/me/sfiguz7/transcendence/lists/TERecipeType.java
index 3d3d0e3..ae57c4f 100644
--- a/src/main/java/me/sfiguz7/transcendence/lists/TERecipeType.java
+++ b/src/main/java/me/sfiguz7/transcendence/lists/TERecipeType.java
@@ -11,20 +11,20 @@ public class TERecipeType {
static final TranscEndence instance = TranscEndence.getInstance();
public static final RecipeType QUIRP_OSCILLATOR = new RecipeType(new NamespacedKey(instance, "quirp_oscillator"),
- new CustomItemStack(Material.PURPUR_BLOCK, "&9Quirp Oscillator", "&a&oUse a Quirps Oscillator to obtain this Item")
+ CustomItemStack.create(Material.PURPUR_BLOCK, "&9Quirp Oscillator", "&a&oUse a Quirps Oscillator to obtain this Item")
);
public static final RecipeType QUIRP_ANNIHILATOR = new RecipeType(new NamespacedKey(instance, "quirp_annihilator"),
- new CustomItemStack(Material.YELLOW_CONCRETE, "&9Quirp Annihilator", "&a&oUse a Quirps Annihilator to obtain this " +
+ CustomItemStack.create(Material.YELLOW_CONCRETE, "&9Quirp Annihilator", "&a&oUse a Quirps Annihilator to obtain this " +
"Item")
);
public static final RecipeType STABILIZER = new RecipeType(new NamespacedKey(instance, "stabilizer"),
- new CustomItemStack(Material.BLACK_CONCRETE, "&9Stabilizer", "&a&oUse a Stabilizer to obtain this Item")
+ CustomItemStack.create(Material.BLACK_CONCRETE, "&9Stabilizer", "&a&oUse a Stabilizer to obtain this Item")
);
public static final RecipeType NANOBOT_CRAFTER = new RecipeType(new NamespacedKey(instance, "nanobot_crafter"),
TEItems.NANOBOT_CRAFTER, new String[0]
);
public static final RecipeType ZOT_OVERLOADER = new RecipeType(new NamespacedKey(instance, "zot_overloader"),
- new CustomItemStack(Material.WHITE_CONCRETE, "&9Zot Overloader", "Charge a zot to the maximum", "to obtain this " +
+ CustomItemStack.create(Material.WHITE_CONCRETE, "&9Zot Overloader", "Charge a zot to the maximum", "to obtain this " +
"Item")
);
}