Skip to content

Commit 0c0ad34

Browse files
eygwieygwi
committed
Support Slimefun experimental and mc version 1.21.4
1 parent c133bfd commit 0c0ad34

18 files changed

Lines changed: 29 additions & 87 deletions

File tree

‎.vscode/settings.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,15 @@
88
<version>1.0.0</version>
99

1010
<properties>
11-
<maven.compiler.source>1.8</maven.compiler.source>
12-
<maven.compiler.target>1.8</maven.compiler.target>
11+
<maven.compiler.source>21</maven.compiler.source>
12+
<maven.compiler.target>21</maven.compiler.target>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
</properties>
1515

1616
<repositories>
1717
<repository>
18-
<id>paper-repo</id>
19-
<url>https://repo.destroystokyo.com/repository/maven-public/</url>
20-
</repository>
21-
22-
<repository>
23-
<id>spigot-repo</id>
24-
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
18+
<id>papermc</id>
19+
<url>https://repo.papermc.io/repository/maven-public/</url>
2520
</repository>
2621

2722
<repository>
@@ -48,9 +43,9 @@
4843

4944
<dependencies>
5045
<dependency>
51-
<groupId>org.spigotmc</groupId>
52-
<artifactId>spigot-api</artifactId>
53-
<version>1.17.1-R0.1-SNAPSHOT</version>
46+
<groupId>io.papermc.paper</groupId>
47+
<artifactId>paper-api</artifactId>
48+
<version>1.21.4-R0.1-SNAPSHOT</version>
5449
<scope>provided</scope>
5550
</dependency>
5651

@@ -69,8 +64,8 @@
6964

7065
<dependency>
7166
<groupId>net.guizhanss</groupId>
72-
<artifactId>GuizhanLib-slimefun</artifactId>
73-
<version>1.2.2</version>
67+
<artifactId>guizhanlib-all</artifactId>
68+
<version>2.3.0</version>
7469
</dependency>
7570

7671
<dependency>
@@ -83,7 +78,7 @@
8378
<dependency>
8479
<groupId>com.github.Slimefun</groupId>
8580
<artifactId>Slimefun4</artifactId>
86-
<version>RC-33</version>
81+
<version>experimental-SNAPSHOT</version>
8782
<scope>provided</scope>
8883
<exclusions>
8984
<exclusion>
@@ -93,12 +88,6 @@
9388
</exclusions>
9489
</dependency>
9590

96-
<dependency>
97-
<groupId>com.github.baked-libs.dough</groupId>
98-
<artifactId>dough-api</artifactId>
99-
<version>39856a32c4</version>
100-
<scope>compile</scope>
101-
</dependency>
10291
<dependency>
10392
<groupId>io.papermc</groupId>
10493
<artifactId>paperlib</artifactId>

‎src/main/java/me/pranavverma/advancedtech/AdvancedTech.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,18 @@ public void onEnable() {
8383

8484

8585

86-
ItemStack advanced_tech_define = new CustomItemStack(PlayerHead.getItemStack(PlayerSkin.fromBase64("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2I4NTg5ZTY3YTNhM2QxMmJmYzljOTgyMTBiMTAyYTM3MWQwNTIwNzk4YWU3MDBiMzYzMzVlOTlmNjkzMzc4ZCJ9fX0=")), "&4Advanced Tech", "The Most Advanced Tech in all of SF.", "&a> Click to open");
86+
ItemStack advanced_tech_define = CustomItemStack.create(PlayerHead.getItemStack(PlayerSkin.fromBase64("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2I4NTg5ZTY3YTNhM2QxMmJmYzljOTgyMTBiMTAyYTM3MWQwNTIwNzk4YWU3MDBiMzYzMzVlOTlmNjkzMzc4ZCJ9fX0=")), "&4Advanced Tech", "The Most Advanced Tech in all of SF.", "&a> Click to open");
8787
NamespacedKey advanced_tech_id = new NamespacedKey(this, "advanced_tech");
8888
ItemGroup advanced_tech_category = new ItemGroup(advanced_tech_id, advanced_tech_define);
8989

9090

91-
ItemStack[] boosted_carbonado_recipe = { SlimefunItems.CARBONADO, SlimefunItems.CARBONADO, null, SlimefunItems.CARBONADO, SlimefunItems.CARBONADO, null, null, null, null };
91+
ItemStack[] boosted_carbonado_recipe = { SlimefunItems.CARBONADO.item(), SlimefunItems.CARBONADO.item(), null, SlimefunItems.CARBONADO.item(), SlimefunItems.CARBONADO.item(), null, null, null, null };
9292
boosted_carbonado boosted_carbonado = new boosted_carbonado(advanced_tech_category, BaseItems.boosted_carbonado_, RecipeType.ENHANCED_CRAFTING_TABLE, boosted_carbonado_recipe);
9393

94-
ItemStack[] framed_uranium_recipe = { SlimefunItems.CARBONADO, SlimefunItems.URANIUM, SlimefunItems.CARBONADO, SlimefunItems.URANIUM, SlimefunItems.BOOSTED_URANIUM, SlimefunItems.URANIUM, SlimefunItems.CARBONADO, SlimefunItems.URANIUM, SlimefunItems.CARBONADO };
94+
ItemStack[] framed_uranium_recipe = { SlimefunItems.CARBONADO.item(), SlimefunItems.URANIUM.item(), SlimefunItems.CARBONADO.item(), SlimefunItems.URANIUM.item(), SlimefunItems.BOOSTED_URANIUM.item(), SlimefunItems.URANIUM.item(), SlimefunItems.CARBONADO.item(), SlimefunItems.URANIUM.item(), SlimefunItems.CARBONADO.item() };
9595
framed_uranium framed_uranium = new framed_uranium(advanced_tech_category, BaseItems.framed_uranium_, RecipeType.ENHANCED_CRAFTING_TABLE, framed_uranium_recipe);
9696

97-
ItemStack[] fire_cake_recipe = { null, SlimefunItems.TINY_URANIUM, null, null, new ItemStack(Material.CAKE), null, null, new ItemStack(Material.FLINT_AND_STEEL), null };
97+
ItemStack[] fire_cake_recipe = { null, SlimefunItems.TINY_URANIUM.item(), null, null, new ItemStack(Material.CAKE), null, null, new ItemStack(Material.FLINT_AND_STEEL), null };
9898
FireCake fire__cake = new FireCake(advanced_tech_category, BaseItems.fire_cake, RecipeType.MAGIC_WORKBENCH, fire_cake_recipe);
9999

100100
boosted_carbonado.register(this);
@@ -103,11 +103,11 @@ public void onEnable() {
103103

104104

105105

106-
ItemStack[] command_hub_recipe = { framed_uranium.getItem(), SlimefunItems.ANDROID_MEMORY_CORE, boosted_carbonado.getItem(), SlimefunItems.LARGE_CAPACITOR, SlimefunItems.POWER_CRYSTAL, SlimefunItems.NUCLEAR_REACTOR, boosted_carbonado.getItem(), SlimefunItems.ENERGY_CONNECTOR, framed_uranium.getItem() };
106+
ItemStack[] command_hub_recipe = { framed_uranium.getItem(), SlimefunItems.ANDROID_MEMORY_CORE.item(), boosted_carbonado.getItem(), SlimefunItems.LARGE_CAPACITOR.item(), SlimefunItems.POWER_CRYSTAL.item(), SlimefunItems.NUCLEAR_REACTOR.item(), boosted_carbonado.getItem(), SlimefunItems.ENERGY_CONNECTOR.item(), framed_uranium.getItem() };
107107

108108
command_hub command_hub = new command_hub(advanced_tech_category, BaseItems.command_hub_, RecipeType.ENHANCED_CRAFTING_TABLE, command_hub_recipe);
109109

110-
ItemStack[] command_engine_recipe = { framed_uranium.getItem(), SlimefunItems.BATTERY, framed_uranium.getItem(), SlimefunItems.ENERGY_CONNECTOR, SlimefunItems.POWER_CRYSTAL, SlimefunItems.ELECTRIC_MOTOR, framed_uranium.getItem(), boosted_carbonado.getItem(), framed_uranium.getItem() };
110+
ItemStack[] command_engine_recipe = { framed_uranium.getItem(), SlimefunItems.BATTERY.item(), framed_uranium.getItem(), SlimefunItems.ENERGY_CONNECTOR.item(), SlimefunItems.POWER_CRYSTAL.item(), SlimefunItems.ELECTRIC_MOTOR.item(), framed_uranium.getItem(), boosted_carbonado.getItem(), framed_uranium.getItem() };
111111
command_engine command_engine = new command_engine(advanced_tech_category, BaseItems.command_engine_, RecipeType.ENHANCED_CRAFTING_TABLE, command_engine_recipe);
112112

113113

@@ -117,13 +117,13 @@ public void onEnable() {
117117

118118

119119

120-
ItemStack[] handheld_digger_1_recipe = { SlimefunItems.BATTERY, SlimefunItems.ALUMINUM_BRONZE_INGOT, SlimefunItems.BATTERY, SlimefunItems.EXPLOSIVE_PICKAXE, SlimefunItems.POWER_CRYSTAL, SlimefunItems.EXPLOSIVE_PICKAXE, SlimefunItems.BATTERY, SlimefunItems.ALUMINUM_BRONZE_INGOT, SlimefunItems.BATTERY };
120+
ItemStack[] handheld_digger_1_recipe = { SlimefunItems.BATTERY.item(), SlimefunItems.ALUMINUM_BRONZE_INGOT.item(), SlimefunItems.BATTERY.item(), SlimefunItems.EXPLOSIVE_PICKAXE.item(), SlimefunItems.POWER_CRYSTAL.item(), SlimefunItems.EXPLOSIVE_PICKAXE.item(), SlimefunItems.BATTERY.item(), SlimefunItems.ALUMINUM_BRONZE_INGOT.item(), SlimefunItems.BATTERY.item() };
121121
handheld_digger_1 basic_handheld_power_digger = new handheld_digger_1(advanced_tech_category, BaseItems.handheld_digger_1_, RecipeType.ENHANCED_CRAFTING_TABLE, handheld_digger_1_recipe);
122122

123-
ItemStack[] handheld_digger_2_recipe = { SlimefunItems.BATTERY, SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.BATTERY, basic_handheld_power_digger.getItem(), SlimefunItems.POWER_CRYSTAL, basic_handheld_power_digger.getItem(), SlimefunItems.BATTERY, SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.BATTERY };
123+
ItemStack[] handheld_digger_2_recipe = { SlimefunItems.BATTERY.item(), SlimefunItems.BLISTERING_INGOT_3.item(), SlimefunItems.BATTERY.item(), basic_handheld_power_digger.getItem(), SlimefunItems.POWER_CRYSTAL.item(), basic_handheld_power_digger.getItem(), SlimefunItems.BATTERY.item(), SlimefunItems.BLISTERING_INGOT_3.item(), SlimefunItems.BATTERY.item() };
124124
handheld_digger_2 advanced_handheld_power_digger = new handheld_digger_2(advanced_tech_category, BaseItems.handheld_digger_2_, RecipeType.ENHANCED_CRAFTING_TABLE, handheld_digger_2_recipe);
125125

126-
ItemStack[] handheld_digger_3_recipe = { boosted_carbonado.getItem(), framed_uranium.getItem(), boosted_carbonado.getItem(), advanced_handheld_power_digger.getItem(), SlimefunItems.POWER_CRYSTAL, advanced_handheld_power_digger.getItem(), boosted_carbonado.getItem(), framed_uranium.getItem(), boosted_carbonado.getItem() };
126+
ItemStack[] handheld_digger_3_recipe = { boosted_carbonado.getItem(), framed_uranium.getItem(), boosted_carbonado.getItem(), advanced_handheld_power_digger.getItem(), SlimefunItems.POWER_CRYSTAL.item(), advanced_handheld_power_digger.getItem(), boosted_carbonado.getItem(), framed_uranium.getItem(), boosted_carbonado.getItem() };
127127
handheld_digger_3 carbonado_handheld_power_digger = new handheld_digger_3(advanced_tech_category, BaseItems.handheld_digger_3_, RecipeType.ENHANCED_CRAFTING_TABLE, handheld_digger_3_recipe);
128128

129129

@@ -137,7 +137,7 @@ public void onEnable() {
137137

138138

139139

140-
ItemStack[] advanced_solar_gen_recipe = {SlimefunItems.SOLAR_GENERATOR_2, SlimefunItems.SOLAR_GENERATOR_2, SlimefunItems.SOLAR_GENERATOR_2, null, boosted_carbonado.getItem(), null, null, SlimefunItems.POWER_CRYSTAL, null};
140+
ItemStack[] advanced_solar_gen_recipe = {SlimefunItems.SOLAR_GENERATOR_2.item(), SlimefunItems.SOLAR_GENERATOR_2.item(), SlimefunItems.SOLAR_GENERATOR_2.item(), null, boosted_carbonado.getItem(), null, null, SlimefunItems.POWER_CRYSTAL.item(), null};
141141
AdvancedSolarGen advanced_solar_gen = new AdvancedSolarGen(advanced_tech_category, BaseItems.advanced_solar_gen, RecipeType.ENHANCED_CRAFTING_TABLE, advanced_solar_gen_recipe, BaseItems.advanced_solar_gen_power_day, BaseItems.advanced_solar_gen_power_night);
142142

143143
advanced_solar_gen.register(this);

‎src/main/java/me/pranavverma/advancedtech/general/items/commanders/command_hub/command_hub.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@
1212
import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler;
1313
import io.github.thebusybiscuit.slimefun4.libraries.dough.skins.PlayerHead;
1414
import io.github.thebusybiscuit.slimefun4.libraries.dough.skins.PlayerSkin;
15-
import lombok.Getter;
1615
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
1716
import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
1817
import me.mrCookieSlime.Slimefun.api.BlockStorage;
1918
import me.pranavverma.advancedtech.general.BaseItems;
20-
import me.pranavverma.advancedtech.general.items.solargen.AdvancedSolarGen.AdvancedSolarGen;
21-
import net.guizhanss.guizhanlib.slimefun.machines.TickingMenuBlock;
2219
import me.pranavverma.advancedtech.AdvancedTech;
2320
import org.bukkit.ChatColor;
2421
import org.bukkit.Material;
@@ -44,22 +41,6 @@
4441
import org.bukkit.Location;
4542

4643

47-
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
48-
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
49-
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
50-
import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler;
51-
import me.mrCookieSlime.Slimefun.api.BlockStorage;
52-
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
53-
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
54-
import org.bukkit.Location;
55-
import org.bukkit.block.Block;
56-
import org.bukkit.event.block.BlockBreakEvent;
57-
import org.bukkit.event.block.BlockPlaceEvent;
58-
import org.bukkit.inventory.ItemStack;
59-
60-
import javax.annotation.ParametersAreNonnullByDefault;
61-
62-
6344
public class command_hub extends SlimefunItem implements HologramOwner, Listener {
6445

6546
public static boolean readyToUse = false;

‎src/main/java/me/pranavverma/advancedtech/general/items/diggers/handheld_digger_2.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33

44
import javax.annotation.ParametersAreNonnullByDefault;
55

6-
import org.bukkit.Material;
7-
import org.bukkit.event.EventHandler;
8-
import org.bukkit.event.Listener;
9-
import org.bukkit.event.player.PlayerItemDamageEvent;
106
import org.bukkit.inventory.ItemStack;
117

128
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;

‎src/main/java/me/pranavverma/advancedtech/general/items/diggers/handheld_digger_3.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
66
import me.pranavverma.advancedtech.general.items.diggers.lib.carbonado.ExplosiveTool7x7;
77

8-
import org.bukkit.Material;
9-
import org.bukkit.event.EventHandler;
10-
import org.bukkit.event.Listener;
11-
import org.bukkit.event.player.PlayerItemDamageEvent;
128
import org.bukkit.inventory.ItemStack;
139

1410
import javax.annotation.ParametersAreNonnullByDefault;

‎src/main/java/me/pranavverma/advancedtech/general/items/diggers/lib/advanced/ExplosiveTool5x5.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import me.mrCookieSlime.Slimefun.api.BlockStorage;
1717
import org.bukkit.Bukkit;
1818
import org.bukkit.Effect;
19+
import org.bukkit.ExplosionResult;
1920
import org.bukkit.Material;
2021
import org.bukkit.Sound;
2122
import org.bukkit.block.Block;
@@ -60,7 +61,7 @@ private void breakBlocks(BlockBreakEvent e, Player p, ItemStack item, Block b, L
6061
List<Block> blocksToDestroy = new ArrayList<>();
6162

6263
if (callExplosionEvent.getValue()) {
63-
BlockExplodeEvent blockExplodeEvent = new BlockExplodeEvent(b, blocks, 0);
64+
BlockExplodeEvent blockExplodeEvent = new BlockExplodeEvent(b, b.getState(), blocks, 0.0F, ExplosionResult.DESTROY);
6465
Bukkit.getServer().getPluginManager().callEvent(blockExplodeEvent);
6566

6667
if (!blockExplodeEvent.isCancelled()) {

‎src/main/java/me/pranavverma/advancedtech/general/items/diggers/lib/advanced/ExplosiveToolBreakBlocksEvent5x5.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.pranavverma.advancedtech.general.items.diggers.lib.advanced;
22

3-
import org.apache.commons.lang.Validate;
3+
import org.apache.commons.lang3.Validate;
44
import org.bukkit.block.Block;
55
import org.bukkit.entity.Player;
66
import org.bukkit.event.Cancellable;

‎src/main/java/me/pranavverma/advancedtech/general/items/diggers/lib/basic/ExplosiveTool4x4.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import me.mrCookieSlime.Slimefun.api.BlockStorage;
1717
import org.bukkit.Bukkit;
1818
import org.bukkit.Effect;
19+
import org.bukkit.ExplosionResult;
1920
import org.bukkit.Material;
2021
import org.bukkit.Sound;
2122
import org.bukkit.block.Block;
@@ -60,7 +61,7 @@ private void breakBlocks(BlockBreakEvent e, Player p, ItemStack item, Block b, L
6061
List<Block> blocksToDestroy = new ArrayList<>();
6162

6263
if (callExplosionEvent.getValue()) {
63-
BlockExplodeEvent blockExplodeEvent = new BlockExplodeEvent(b, blocks, 0);
64+
BlockExplodeEvent blockExplodeEvent = new BlockExplodeEvent(b, b.getState(), blocks, 0.0F, ExplosionResult.DESTROY);
6465
Bukkit.getServer().getPluginManager().callEvent(blockExplodeEvent);
6566

6667
if (!blockExplodeEvent.isCancelled()) {

‎src/main/java/me/pranavverma/advancedtech/general/items/diggers/lib/basic/ExplosiveToolBreakBlocksEvent4x4.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import javax.annotation.Nonnull;
66
import javax.annotation.ParametersAreNonnullByDefault;
77

8-
import org.apache.commons.lang.Validate;
8+
import org.apache.commons.lang3.Validate;
99
import org.bukkit.block.Block;
1010
import org.bukkit.entity.Player;
1111
import org.bukkit.event.Cancellable;

0 commit comments

Comments
 (0)