Remove modern base layer to match version

NathanWolf · NathanWolf · commit 6669a19abd8d · 2025-04-28T15:39:20.000-07:00
diff --git a/CompatibilityLib/base_v1_21_4/src/main/java/com/elmakers/mine/bukkit/utility/platform/base_v1_21_4/Modern2CompatibilityUtils.java b/CompatibilityLib/base_v1_21_4/src/main/java/com/elmakers/mine/bukkit/utility/platform/base_v1_21_4/Modern2CompatibilityUtils.java
@@ -1,4 +1,4 @@
-package com.elmakers.mine.bukkit.utility.platform.modern2;
+package com.elmakers.mine.bukkit.utility.platform.base_v1_21_4;
 
 import java.util.UUID;
 
diff --git a/CompatibilityLib/base_v1_21_4/src/main/java/com/elmakers/mine/bukkit/utility/platform/base_v1_21_4/Modern2ItemUtils.java b/CompatibilityLib/base_v1_21_4/src/main/java/com/elmakers/mine/bukkit/utility/platform/base_v1_21_4/Modern2ItemUtils.java
@@ -1,4 +1,4 @@
-package com.elmakers.mine.bukkit.utility.platform.modern2;
+package com.elmakers.mine.bukkit.utility.platform.base_v1_21_4;
 
 import java.util.List;
 
diff --git a/CompatibilityLib/v1_21_4/src/main/java/com/elmakers/mine/bukkit/utility/platform/v1_21_4/CompatibilityUtils.java b/CompatibilityLib/v1_21_4/src/main/java/com/elmakers/mine/bukkit/utility/platform/v1_21_4/CompatibilityUtils.java
@@ -66,7 +66,7 @@
 import com.elmakers.mine.bukkit.utility.ReflectionUtils;
 import com.elmakers.mine.bukkit.utility.platform.ItemUtils;
 import com.elmakers.mine.bukkit.utility.platform.Platform;
-import com.elmakers.mine.bukkit.utility.platform.modern2.Modern2CompatibilityUtils;
+import com.elmakers.mine.bukkit.utility.platform.base_v1_21_4.Modern2CompatibilityUtils;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/CompatibilityLib/v1_21_4/src/main/java/com/elmakers/mine/bukkit/utility/platform/v1_21_4/ItemUtils.java b/CompatibilityLib/v1_21_4/src/main/java/com/elmakers/mine/bukkit/utility/platform/v1_21_4/ItemUtils.java
@@ -13,7 +13,7 @@
 import com.elmakers.mine.bukkit.utility.CompatibilityConstants;
 import com.elmakers.mine.bukkit.utility.ReflectionUtils;
 import com.elmakers.mine.bukkit.utility.platform.Platform;
-import com.elmakers.mine.bukkit.utility.platform.modern2.Modern2ItemUtils;
+import com.elmakers.mine.bukkit.utility.platform.base_v1_21_4.Modern2ItemUtils;
 
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.nbt.CompoundTag;
diff --git a/CompatibilityLib/v1_21_5/src/main/java/com/elmakers/mine/bukkit/utility/platform/v1_21_5/CompatibilityUtils.java b/CompatibilityLib/v1_21_5/src/main/java/com/elmakers/mine/bukkit/utility/platform/v1_21_5/CompatibilityUtils.java
@@ -69,7 +69,7 @@
 import com.elmakers.mine.bukkit.utility.platform.ItemUtils;
 import com.elmakers.mine.bukkit.utility.platform.Platform;
 import com.elmakers.mine.bukkit.utility.platform.SpigotUtils;
-import com.elmakers.mine.bukkit.utility.platform.modern2.Modern2CompatibilityUtils;
+import com.elmakers.mine.bukkit.utility.platform.base_v1_21_4.Modern2CompatibilityUtils;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/CompatibilityLib/v1_21_5/src/main/java/com/elmakers/mine/bukkit/utility/platform/v1_21_5/ItemUtils.java b/CompatibilityLib/v1_21_5/src/main/java/com/elmakers/mine/bukkit/utility/platform/v1_21_5/ItemUtils.java
@@ -13,7 +13,7 @@
 
 import com.elmakers.mine.bukkit.utility.ReflectionUtils;
 import com.elmakers.mine.bukkit.utility.platform.Platform;
-import com.elmakers.mine.bukkit.utility.platform.modern2.Modern2ItemUtils;
+import com.elmakers.mine.bukkit.utility.platform.base_v1_21_4.Modern2ItemUtils;
 
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.nbt.CompoundTag;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.elmakers.mine.bukkit.utility.platform.modern2;`
	`1`	`+package com.elmakers.mine.bukkit.utility.platform.base_v1_21_4;`
`2`	`2`
`3`	`3`	`import java.util.UUID;`
`4`	`4`