Ask Dueris

build.gradle.kts

@@ -76,7 +76,7 @@ tasks {
 
 tasks.register<Jar>("makePublisher") {
     dependsOn(tasks.shadowJar)
-    archiveFileName.set("genesis-v1.0.0-SNAPSHOT.jar")
+    archiveFileName.set("genesis-v1.0.1-SNAPSHOT.jar")
     from(sourceSets.main.get().output)
 }
 
@@ -105,7 +105,7 @@ publishing {
         artifact(tasks.getByName("makePublisher")) {
             groupId = "io.github.dueris"
             artifactId = "genesis"
-            version = "v1.0.0-SNAPSHOT"
+            version = "v1.0.1-SNAPSHOT"
         }
     }
     repositories {

origins/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = "me.dueris"
-version = "mc1.20-v1.0.0"
+version = "mc1.20-v1.0.1"
 description = "Bringing the Origins Mod to PaperMC"
 
 dependencies {
@@ -56,7 +56,7 @@ tasks {
 
 tasks.register<Jar>("makePublisher") {
     dependsOn(tasks.shadowJar)
-    archiveFileName.set("genesis-v1.0.0-SNAPSHOT.jar")
+    archiveFileName.set("genesis-v1.0.1-SNAPSHOT.jar")
     from(sourceSets.main.get().output)
 }
 
@@ -65,7 +65,7 @@ publishing {
         artifact(tasks.getByName("makePublisher")) {
             groupId = "io.github.dueris"
             artifactId = "genesis"
-            version = "v1.0.0-SNAPSHOT"
+            version = "v1.0.1-SNAPSHOT"
         }
     }
     repositories {

origins/src/main/java/me/dueris/genesismc/Bootstrap.java

@@ -2,7 +2,6 @@
 
 import io.papermc.paper.plugin.bootstrap.BootstrapContext;
 import io.papermc.paper.plugin.bootstrap.PluginBootstrap;
-import me.dueris.genesismc.content.enchantment.WaterProtectionEnchantment;
 import me.dueris.genesismc.registry.nms.OriginLootCondition;
 import me.dueris.genesismc.registry.nms.PowerLootCondition;
 import me.dueris.genesismc.util.Util;
@@ -33,8 +32,8 @@
 import java.util.zip.ZipInputStream;
 
 // TODO: MachineMaker PluginDatapacks
+// TODO: WaterProtection Enchantment - 1.21
 public class Bootstrap implements PluginBootstrap {
-	public static WaterProtectionEnchantment waterProtection;
 	public static ArrayList<String> oldDV = new ArrayList<>();
 
 	static {
@@ -46,10 +45,6 @@ public class Bootstrap implements PluginBootstrap {
 		oldDV.add("Origins-GenesisMC[0_2_6]");
 	}
 
-	public static void registerEnchantment(String name, Enchantment enchantment) {
-		Registry.register(BuiltInRegistries.ENCHANTMENT, new ResourceLocation("origins", name), enchantment);
-	}
-
 	public static void deleteDirectory(Path directory, boolean ignoreErrors) throws IOException {
 		if (Files.exists(directory)) {
 			Files.walk(directory)
@@ -153,15 +148,6 @@ public void bootstrap(@NotNull BootstrapContext context) {
 		} catch (Exception e) {
 			// ignore
 		}
-		// hurt by water damage type
-		EquipmentSlot[] slots = {EquipmentSlot.CHEST, EquipmentSlot.FEET, EquipmentSlot.HEAD, EquipmentSlot.LEGS};
-		WaterProtectionEnchantment waterProtection = new WaterProtectionEnchantment(
-			Enchantment.definition(
-				TagKey.create(Registries.ITEM, CraftNamespacedKey.toMinecraft(NamespacedKey.fromString("trimmable_armor"))),
-				1, 4, Enchantment.dynamicCost(1, 1), Enchantment.dynamicCost(1, 4), 4, slots
-			));
-		registerEnchantment("water_protection", waterProtection);
-		Bootstrap.waterProtection = waterProtection;
 		Registry.register(BuiltInRegistries.LOOT_CONDITION_TYPE, new ResourceLocation("apoli", "power"), PowerLootCondition.TYPE);
 		Registry.register(BuiltInRegistries.LOOT_CONDITION_TYPE, new ResourceLocation("origins", "origin"), OriginLootCondition.TYPE);
 	}

origins/src/main/java/me/dueris/genesismc/GenesisMC.java

@@ -12,11 +12,6 @@
 import me.dueris.genesismc.command.PowerCommand;
 import me.dueris.genesismc.content.ContentTicker;
 import me.dueris.genesismc.content.OrbOfOrigins;
-import me.dueris.genesismc.content.WaterProtBook;
-import me.dueris.genesismc.content.enchantment.AnvilHandler;
-import me.dueris.genesismc.content.enchantment.EnchantTableHandler;
-import me.dueris.genesismc.content.enchantment.generation.StructureGeneration;
-import me.dueris.genesismc.content.enchantment.generation.VillagerTradeHook;
 import me.dueris.genesismc.factory.CraftApoli;
 import me.dueris.genesismc.factory.actions.Actions;
 import me.dueris.genesismc.factory.actions.types.BiEntityActions;
@@ -89,7 +84,7 @@ public final class GenesisMC extends JavaPlugin implements Listener {
 	public static OriginScheduler.MainTickerThread scheduler = null;
 	public static String version = Bukkit.getVersion().split("\\(MC: ")[1].replace(")", "");
 	public static boolean isCompatible = false;
-	public static String pluginVersion = "v1.0.0";
+	public static String pluginVersion = "v1.0.1";
 	public static String world_container;
 	public static ExecutorService loaderThreadPool;
 	public static ArrayList<String> versions = new ArrayList<>();
@@ -293,7 +288,6 @@ public void run() {
 				GenesisMC.scheduler.tickAsyncScheduler();
 			}
 		}.runTaskTimerAsynchronously(GenesisMC.getPlugin(), 0, 1);
-		WaterProtBook.init();
 		start();
 		patchPowers();
 		debug(Component.text("  - Power thread starting with {originScheduler}".replace("originScheduler", GenesisMC.scheduler.toString())));
@@ -335,17 +329,13 @@ public void debug(Component component) {
 	private void start() {
 		getServer().getPluginManager().registerEvents(this, this);
 		getServer().getPluginManager().registerEvents(new PlayerManager(), this);
-		getServer().getPluginManager().registerEvents(new EnchantTableHandler(), this);
-		getServer().getPluginManager().registerEvents(new AnvilHandler(), this);
 		getServer().getPluginManager().registerEvents(new ScreenNavigator(), this);
 		getServer().getPluginManager().registerEvents(new OriginCommand(), this);
 		getServer().getPluginManager().registerEvents(new ContentTicker(), this);
 		getServer().getPluginManager().registerEvents(new LogoutBugWorkaround(), this);
 		getServer().getPluginManager().registerEvents(new BounceSlimeBlock(), this);
 		getServer().getPluginManager().registerEvents(new BiEntityConditions(), this);
-		getServer().getPluginManager().registerEvents(new VillagerTradeHook(), this);
 		getServer().getPluginManager().registerEvents(new OriginScheduler.MainTickerThread(), this);
-		getServer().getPluginManager().registerEvents(new StructureGeneration(), this);
 		getServer().getPluginManager().registerEvents(new KeybindUtil(), this);
 		getServer().getPluginManager().registerEvents(new AsyncUpgradeTracker(), this);
 		getServer().getPluginManager().registerEvents(new PowerHolderComponent(), this);

origins/src/main/java/me/dueris/genesismc/command/OriginCommand.java

@@ -7,7 +7,6 @@
 import javassist.NotFoundException;
 import me.dueris.genesismc.GenesisMC;
 import me.dueris.genesismc.content.OrbOfOrigins;
-import me.dueris.genesismc.content.enchantment.AnvilHandler;
 import me.dueris.genesismc.event.OriginChangeEvent;
 import me.dueris.genesismc.factory.CraftApoli;
 import me.dueris.genesismc.factory.powers.apoli.RecipePower;
@@ -53,17 +52,12 @@
 public class OriginCommand extends BukkitRunnable implements Listener {
 
 	public static final HashMap<Player, Integer> playerPage = new HashMap<>();
-	public static EnumSet<Material> wearable;
 	@SuppressWarnings("FieldMayBeFinal")
 	public static HashMap<Player, ArrayList<Origin>> playerOrigins = new HashMap<>();
 	public static List<Origin> commandProvidedOrigins = new ArrayList<>();
 	public static List<Layer> commandProvidedLayers = new ArrayList<>();
 	public static List<PowerType> commandProvidedPowers = new ArrayList<>();
 
-	static {
-		wearable = EnumSet.of(Material.ENCHANTED_BOOK, Material.BOOK, Material.PUMPKIN, Material.CARVED_PUMPKIN, Material.ELYTRA, Material.TURTLE_HELMET, Material.LEATHER_CHESTPLATE, Material.LEATHER_BOOTS, Material.LEATHER_LEGGINGS, Material.LEATHER_HELMET, Material.CHAINMAIL_BOOTS, Material.CHAINMAIL_CHESTPLATE, Material.CHAINMAIL_HELMET, Material.CHAINMAIL_LEGGINGS, Material.IRON_HELMET, Material.IRON_CHESTPLATE, Material.IRON_LEGGINGS, Material.IRON_BOOTS, Material.GOLDEN_HELMET, Material.GOLDEN_CHESTPLATE, Material.GOLDEN_LEGGINGS, Material.GOLDEN_BOOTS, Material.DIAMOND_HELMET, Material.DIAMOND_CHESTPLATE, Material.DIAMOND_LEGGINGS, Material.DIAMOND_BOOTS, Material.NETHERITE_HELMET, Material.NETHERITE_CHESTPLATE, Material.NETHERITE_LEGGINGS, Material.NETHERITE_BOOTS);
-	}
-
 	public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
 		dispatcher.register(
 			literal("origin")
@@ -283,21 +277,6 @@ public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
 							)
 						)
 					)
-				).then(literal("enchant").requires(source -> source.hasPermission(2))
-					.then(argument("targets", EntityArgument.players())
-						.then(literal("origins:water_protection")
-							.executes(context -> {
-								enchant(context.getSource(), EntityArgument.getPlayers(context, "targets").stream().toList(), 1);
-								return SINGLE_SUCCESS;
-							})
-							.then(argument("level", IntegerArgumentType.integer(1, 4))
-								.executes(context -> {
-									enchant(context.getSource(), EntityArgument.getPlayers(context, "targets").stream().toList(), IntegerArgumentType.getInteger(context, "level"));
-									return SINGLE_SUCCESS;
-								})
-							)
-						)
-					)
 				)
 		);
 	}
@@ -318,26 +297,6 @@ public static void give(CommandContext<CommandSourceStack> context, int amt) thr
 
 	}
 
-	public static void enchant(CommandSourceStack sender, List<ServerPlayer> targets, int level) {
-		targets.removeIf(Objects::isNull);
-		for (ServerPlayer entity : targets) {
-			Player p = entity.getBukkitEntity();
-			if (!OriginCommand.wearable.contains(p.getInventory().getItemInMainHand().getType())) {
-				continue;
-			}
-
-			String romanLevel = AnvilHandler.numberToRomanNum(level);
-			ItemMeta meta = p.getInventory().getItemInMainHand().getItemMeta();
-			meta.setCustomModelData(level);
-			p.getInventory().getItemInMainHand().setLore(List.of(ChatColor.GRAY + "Water Protection " + romanLevel));
-			p.getInventory().getItemInMainHand().addEnchantment(AnvilHandler.bukkitEnchantment, level);
-			sender.getBukkitSender().sendMessage("Applied enchantment " +
-				ChatColor.GRAY + "{water_prot}".replace("{water_prot}", "Water Protection " + AnvilHandler.numberToRomanNum(level)) +
-				ChatColor.WHITE + " to {target}'s item".replace("{target}", p.getName())
-			);
-		}
-	}
-
 	@EventHandler
 	public void stopStealingInfo(InventoryClickEvent e) {
 		if (e.getView().getTitle().startsWith("Info")) e.setCancelled(true);