Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ jobs:
if: startsWith(github.event.head_commit.message, '[CI skip]') == false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.5.3
- name: Set up JDK 16
uses: actions/setup-java@v3.11.0
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: 16
distribution: temurin
java-version: '21'
distribution: 'temurin'
cache: 'maven'
- name: Build with Maven
run: mvn package --file pom.xml
run: mvn package --file pom.xml
4 changes: 0 additions & 4 deletions .vscode/settings.json

This file was deleted.

33 changes: 11 additions & 22 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,15 @@
<version>1.0.0</version>

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

<repositories>
<repository>
<id>paper-repo</id>
<url>https://repo.destroystokyo.com/repository/maven-public/</url>
</repository>

<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
<id>papermc</id>
<url>https://repo.papermc.io/repository/maven-public/</url>
</repository>

<repository>
Expand All @@ -48,9 +43,9 @@

<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.17.1-R0.1-SNAPSHOT</version>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.21.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

Expand All @@ -69,8 +64,8 @@

<dependency>
<groupId>net.guizhanss</groupId>
<artifactId>GuizhanLib-slimefun</artifactId>
<version>1.2.2</version>
<artifactId>guizhanlib-all</artifactId>
<version>2.3.0</version>
</dependency>

<dependency>
Expand All @@ -83,7 +78,7 @@
<dependency>
<groupId>com.github.Slimefun</groupId>
<artifactId>Slimefun4</artifactId>
<version>RC-33</version>
<version>experimental-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand All @@ -93,12 +88,6 @@
</exclusions>
</dependency>

<dependency>
<groupId>com.github.baked-libs.dough</groupId>
<artifactId>dough-api</artifactId>
<version>39856a32c4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.papermc</groupId>
<artifactId>paperlib</artifactId>
Expand Down Expand Up @@ -148,7 +137,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>RELEASE</version>
<version>1.18.42</version>
<scope>compile</scope>
</dependency>

Expand Down
20 changes: 10 additions & 10 deletions src/main/java/me/pranavverma/advancedtech/AdvancedTech.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,18 @@ public void onEnable() {



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");
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");
NamespacedKey advanced_tech_id = new NamespacedKey(this, "advanced_tech");
ItemGroup advanced_tech_category = new ItemGroup(advanced_tech_id, advanced_tech_define);


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

ItemStack[] framed_uranium_recipe = { SlimefunItems.CARBONADO, SlimefunItems.URANIUM, SlimefunItems.CARBONADO, SlimefunItems.URANIUM, SlimefunItems.BOOSTED_URANIUM, SlimefunItems.URANIUM, SlimefunItems.CARBONADO, SlimefunItems.URANIUM, SlimefunItems.CARBONADO };
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() };
framed_uranium framed_uranium = new framed_uranium(advanced_tech_category, BaseItems.framed_uranium_, RecipeType.ENHANCED_CRAFTING_TABLE, framed_uranium_recipe);

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

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



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() };
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() };

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

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() };
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() };
command_engine command_engine = new command_engine(advanced_tech_category, BaseItems.command_engine_, RecipeType.ENHANCED_CRAFTING_TABLE, command_engine_recipe);


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



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 };
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() };
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);

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 };
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() };
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);

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() };
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() };
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);


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



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};
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};
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);

advanced_solar_gen.register(this);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,10 @@
import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler;
import io.github.thebusybiscuit.slimefun4.libraries.dough.skins.PlayerHead;
import io.github.thebusybiscuit.slimefun4.libraries.dough.skins.PlayerSkin;
import lombok.Getter;
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.pranavverma.advancedtech.general.BaseItems;
import me.pranavverma.advancedtech.general.items.solargen.AdvancedSolarGen.AdvancedSolarGen;
import net.guizhanss.guizhanlib.slimefun.machines.TickingMenuBlock;
import me.pranavverma.advancedtech.AdvancedTech;
import org.bukkit.ChatColor;
import org.bukkit.Material;
Expand All @@ -44,22 +41,6 @@
import org.bukkit.Location;


import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.inventory.ItemStack;

import javax.annotation.ParametersAreNonnullByDefault;


public class command_hub extends SlimefunItem implements HologramOwner, Listener {

public static boolean readyToUse = false;
Expand Down Expand Up @@ -252,23 +233,23 @@ public void onInventoryClick(InventoryClickEvent event) {
HumanEntity human = event.getWhoClicked();
Inventory inventory = event.getClickedInventory();

if (human instanceof Player && inventory != null && inventory.getSize() == 9 && inventory.getItem(0).hasItemMeta() && inventory.getItem(8).getType() == Material.BLACK_STAINED_GLASS && inventory.getItem(7).getType() == Material.BLACK_STAINED_GLASS && inventory.getItem(6).getType() == Material.BLACK_STAINED_GLASS) {
if (inventory.getItem(0) == null) {

}
if (!(human instanceof Player) || inventory == null || inventory.getSize() != 9) {
return;
}

if (inventory.getItem(6) == null) {

}

if (inventory.getItem(7) == null) {

}
ItemStack item0 = inventory.getItem(0);
ItemStack item6 = inventory.getItem(6);
ItemStack item7 = inventory.getItem(7);
ItemStack item8 = inventory.getItem(8);

if (inventory.getItem(8) == null) {
}
if (item0 == null || item6 == null || item7 == null || item8 == null) {
return;
}

if (item0.hasItemMeta() &&
item8.getType() == Material.BLACK_STAINED_GLASS_PANE &&
item7.getType() == Material.BLACK_STAINED_GLASS_PANE &&
item6.getType() == Material.BLACK_STAINED_GLASS_PANE) {

event.setResult(Result.DENY); // Cancel the click event
event.setCancelled(true);
Expand All @@ -280,10 +261,25 @@ public void onInventoryClick(InventoryClickEvent event) {
public void onInventoryDrag(InventoryDragEvent event) {
HumanEntity human = event.getWhoClicked();
Inventory inventory = event.getInventory();



if (human instanceof Player && inventory != null && inventory.getSize() == 9 && inventory.getItem(0).hasItemMeta() && inventory.getItem(8).getType() == Material.BLACK_STAINED_GLASS && inventory.getItem(7).getType() == Material.BLACK_STAINED_GLASS && inventory.getItem(6).getType() == Material.BLACK_STAINED_GLASS) {
if (!(human instanceof Player) || inventory == null || inventory.getSize() != 9) {
return;
}

ItemStack item0 = inventory.getItem(0);
ItemStack item6 = inventory.getItem(6);
ItemStack item7 = inventory.getItem(7);
ItemStack item8 = inventory.getItem(8);

if (item0 == null || item6 == null || item7 == null || item8 == null) {
return;
}

if (item0.hasItemMeta() &&
item8.getType() == Material.BLACK_STAINED_GLASS_PANE &&
item7.getType() == Material.BLACK_STAINED_GLASS_PANE &&
item6.getType() == Material.BLACK_STAINED_GLASS_PANE) {

event.setCancelled(true); // Cancel the drag event
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@

import javax.annotation.ParametersAreNonnullByDefault;

import org.bukkit.Material;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerItemDamageEvent;
import org.bukkit.inventory.ItemStack;

import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
import me.pranavverma.advancedtech.general.items.diggers.lib.carbonado.ExplosiveTool7x7;

import org.bukkit.Material;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerItemDamageEvent;
import org.bukkit.inventory.ItemStack;

import javax.annotation.ParametersAreNonnullByDefault;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import org.bukkit.Bukkit;
import org.bukkit.Effect;
import org.bukkit.ExplosionResult;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.block.Block;
Expand Down Expand Up @@ -60,7 +61,7 @@ private void breakBlocks(BlockBreakEvent e, Player p, ItemStack item, Block b, L
List<Block> blocksToDestroy = new ArrayList<>();

if (callExplosionEvent.getValue()) {
BlockExplodeEvent blockExplodeEvent = new BlockExplodeEvent(b, blocks, 0);
BlockExplodeEvent blockExplodeEvent = new BlockExplodeEvent(b, b.getState(), blocks, 0.0F, ExplosionResult.DESTROY);
Bukkit.getServer().getPluginManager().callEvent(blockExplodeEvent);

if (!blockExplodeEvent.isCancelled()) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.pranavverma.advancedtech.general.items.diggers.lib.advanced;

import org.apache.commons.lang.Validate;
import org.apache.commons.lang3.Validate;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import org.bukkit.Bukkit;
import org.bukkit.Effect;
import org.bukkit.ExplosionResult;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.block.Block;
Expand Down Expand Up @@ -60,7 +61,7 @@ private void breakBlocks(BlockBreakEvent e, Player p, ItemStack item, Block b, L
List<Block> blocksToDestroy = new ArrayList<>();

if (callExplosionEvent.getValue()) {
BlockExplodeEvent blockExplodeEvent = new BlockExplodeEvent(b, blocks, 0);
BlockExplodeEvent blockExplodeEvent = new BlockExplodeEvent(b, b.getState(), blocks, 0.0F, ExplosionResult.DESTROY);
Bukkit.getServer().getPluginManager().callEvent(blockExplodeEvent);

if (!blockExplodeEvent.isCancelled()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import javax.annotation.Nonnull;
import javax.annotation.ParametersAreNonnullByDefault;

import org.apache.commons.lang.Validate;
import org.apache.commons.lang3.Validate;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import org.bukkit.Bukkit;
import org.bukkit.Effect;
import org.bukkit.ExplosionResult;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.block.Block;
Expand Down Expand Up @@ -70,7 +71,7 @@ private void breakBlocks(BlockBreakEvent e, Player p, ItemStack item, Block b, L
List<Block> blocksToDestroy = new ArrayList<>();

if (callExplosionEvent.getValue().booleanValue()) {
BlockExplodeEvent blockExplodeEvent = new BlockExplodeEvent(b, blocks, 0);
BlockExplodeEvent blockExplodeEvent = new BlockExplodeEvent(b, b.getState(), blocks, 0.0F, ExplosionResult.DESTROY);
Bukkit.getServer().getPluginManager().callEvent(blockExplodeEvent);

if (!blockExplodeEvent.isCancelled()) {
Expand Down
Loading