Skip to content

Commit b336d97

Browse files
tal5tal5
committed
26.1 part 3: handle import versions
1 parent 3bb9efd commit b336d97

50 files changed

Lines changed: 244 additions & 244 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/Handler.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.denizenscript.denizen.nms.v1_21;
1+
package com.denizenscript.denizen.nms.v26_1;
22

33
import com.denizenscript.denizen.Denizen;
44
import com.denizenscript.denizen.nms.NMSHandler;
@@ -7,11 +7,11 @@
77
import com.denizenscript.denizen.nms.abstracts.ProfileEditor;
88
import com.denizenscript.denizen.nms.abstracts.Sidebar;
99
import com.denizenscript.denizen.nms.util.PlayerProfile;
10-
import com.denizenscript.denizen.nms.v1_21.helpers.*;
11-
import com.denizenscript.denizen.nms.v1_21.impl.BiomeNMSImpl;
12-
import com.denizenscript.denizen.nms.v1_21.impl.ProfileEditorImpl;
13-
import com.denizenscript.denizen.nms.v1_21.impl.SidebarImpl;
14-
import com.denizenscript.denizen.nms.v1_21.impl.blocks.BlockLightImpl;
10+
import com.denizenscript.denizen.nms.v26_1.helpers.*;
11+
import com.denizenscript.denizen.nms.v26_1.impl.BiomeNMSImpl;
12+
import com.denizenscript.denizen.nms.v26_1.impl.ProfileEditorImpl;
13+
import com.denizenscript.denizen.nms.v26_1.impl.SidebarImpl;
14+
import com.denizenscript.denizen.nms.v26_1.impl.blocks.BlockLightImpl;
1515
import com.denizenscript.denizen.objects.ItemTag;
1616
import com.denizenscript.denizen.objects.LocationTag;
1717
import com.denizenscript.denizen.objects.MaterialTag;
@@ -67,19 +67,19 @@
6767
import org.bukkit.World;
6868
import org.bukkit.block.Block;
6969
import org.bukkit.boss.BossBar;
70-
import org.bukkit.craftbukkit.v1_21_R7.CraftRegistry;
71-
import org.bukkit.craftbukkit.v1_21_R7.CraftServer;
72-
import org.bukkit.craftbukkit.v1_21_R7.CraftWorld;
73-
import org.bukkit.craftbukkit.v1_21_R7.block.data.CraftBlockData;
74-
import org.bukkit.craftbukkit.v1_21_R7.boss.CraftBossBar;
75-
import org.bukkit.craftbukkit.v1_21_R7.entity.CraftPlayer;
76-
import org.bukkit.craftbukkit.v1_21_R7.inventory.CraftInventory;
77-
import org.bukkit.craftbukkit.v1_21_R7.inventory.CraftInventoryCustom;
78-
import org.bukkit.craftbukkit.v1_21_R7.inventory.CraftInventoryView;
79-
import org.bukkit.craftbukkit.v1_21_R7.inventory.CraftItemStack;
80-
import org.bukkit.craftbukkit.v1_21_R7.legacy.FieldRename;
81-
import org.bukkit.craftbukkit.v1_21_R7.persistence.CraftPersistentDataContainer;
82-
import org.bukkit.craftbukkit.v1_21_R7.util.*;
70+
import org.bukkit.craftbukkit.CraftRegistry;
71+
import org.bukkit.craftbukkit.CraftServer;
72+
import org.bukkit.craftbukkit.CraftWorld;
73+
import org.bukkit.craftbukkit.block.data.CraftBlockData;
74+
import org.bukkit.craftbukkit.boss.CraftBossBar;
75+
import org.bukkit.craftbukkit.entity.CraftPlayer;
76+
import org.bukkit.craftbukkit.inventory.CraftInventory;
77+
import org.bukkit.craftbukkit.inventory.CraftInventoryCustom;
78+
import org.bukkit.craftbukkit.inventory.CraftInventoryView;
79+
import org.bukkit.craftbukkit.inventory.CraftItemStack;
80+
import org.bukkit.craftbukkit.legacy.FieldRename;
81+
import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
82+
import org.bukkit.craftbukkit.util.*;
8383
import org.bukkit.entity.Player;
8484
import org.bukkit.inventory.Inventory;
8585
import org.bukkit.inventory.InventoryView;

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/ReflectionMappingsInfo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.denizenscript.denizen.nms.v1_21;
1+
package com.denizenscript.denizen.nms.v26_1;
22

33
public class ReflectionMappingsInfo {
44

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/AdvancementHelperImpl.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.denizenscript.denizen.nms.v1_21.helpers;
1+
package com.denizenscript.denizen.nms.v26_1.helpers;
22

33
import com.denizenscript.denizen.nms.interfaces.AdvancementHelper;
4-
import com.denizenscript.denizen.nms.v1_21.Handler;
4+
import com.denizenscript.denizen.nms.v26_1.Handler;
55
import com.denizenscript.denizen.utilities.FormattedTextHelper;
66
import com.google.common.collect.ImmutableMap;
77
import net.md_5.bungee.api.ChatColor;
@@ -14,10 +14,10 @@
1414
import net.minecraft.server.ServerAdvancementManager;
1515
import net.minecraft.server.level.ServerPlayer;
1616
import org.bukkit.Bukkit;
17-
import org.bukkit.craftbukkit.v1_21_R7.CraftServer;
18-
import org.bukkit.craftbukkit.v1_21_R7.entity.CraftPlayer;
19-
import org.bukkit.craftbukkit.v1_21_R7.inventory.CraftItemStack;
20-
import org.bukkit.craftbukkit.v1_21_R7.util.CraftNamespacedKey;
17+
import org.bukkit.craftbukkit.CraftServer;
18+
import org.bukkit.craftbukkit.entity.CraftPlayer;
19+
import org.bukkit.craftbukkit.inventory.CraftItemStack;
20+
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
2121
import org.bukkit.entity.Player;
2222

2323
import java.util.*;

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/AnimationHelperImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.denizenscript.denizen.nms.v1_21.helpers;
1+
package com.denizenscript.denizen.nms.v26_1.helpers;
22

33
import com.denizenscript.denizen.nms.abstracts.AnimationHelper;
44
import net.minecraft.world.entity.Entity;
5-
import org.bukkit.craftbukkit.v1_21_R7.entity.CraftEntity;
6-
import org.bukkit.craftbukkit.v1_21_R7.entity.CraftHorse;
7-
import org.bukkit.craftbukkit.v1_21_R7.entity.CraftPolarBear;
5+
import org.bukkit.craftbukkit.entity.CraftEntity;
6+
import org.bukkit.craftbukkit.entity.CraftHorse;
7+
import org.bukkit.craftbukkit.entity.CraftPolarBear;
88
import org.bukkit.entity.EntityType;
99
import org.bukkit.entity.Horse;
1010
import org.bukkit.entity.IronGolem;

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/BlockHelperImpl.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.denizenscript.denizen.nms.v1_21.helpers;
1+
package com.denizenscript.denizen.nms.v26_1.helpers;
22

33
import com.denizenscript.denizen.nms.interfaces.BlockHelper;
44
import com.denizenscript.denizen.nms.util.PlayerProfile;
5-
import com.denizenscript.denizen.nms.v1_21.Handler;
6-
import com.denizenscript.denizen.nms.v1_21.ReflectionMappingsInfo;
7-
import com.denizenscript.denizen.nms.v1_21.impl.ProfileEditorImpl;
5+
import com.denizenscript.denizen.nms.v26_1.Handler;
6+
import com.denizenscript.denizen.nms.v26_1.ReflectionMappingsInfo;
7+
import com.denizenscript.denizen.nms.v26_1.impl.ProfileEditorImpl;
88
import com.denizenscript.denizen.objects.EntityTag;
99
import com.denizenscript.denizencore.objects.Mechanism;
1010
import com.denizenscript.denizencore.utilities.ReflectionHelper;
@@ -34,17 +34,17 @@
3434
import org.bukkit.block.Block;
3535
import org.bukkit.block.CreatureSpawner;
3636
import org.bukkit.block.Skull;
37-
import org.bukkit.craftbukkit.v1_21_R7.CraftChunk;
38-
import org.bukkit.craftbukkit.v1_21_R7.CraftRegistry;
39-
import org.bukkit.craftbukkit.v1_21_R7.CraftWorld;
40-
import org.bukkit.craftbukkit.v1_21_R7.block.CraftBlock;
41-
import org.bukkit.craftbukkit.v1_21_R7.block.CraftBlockEntityState;
42-
import org.bukkit.craftbukkit.v1_21_R7.block.CraftCreatureSpawner;
43-
import org.bukkit.craftbukkit.v1_21_R7.block.CraftSkull;
44-
import org.bukkit.craftbukkit.v1_21_R7.entity.CraftEntity;
45-
import org.bukkit.craftbukkit.v1_21_R7.inventory.CraftItemStack;
46-
import org.bukkit.craftbukkit.v1_21_R7.util.CraftLocation;
47-
import org.bukkit.craftbukkit.v1_21_R7.util.CraftMagicNumbers;
37+
import org.bukkit.craftbukkit.CraftChunk;
38+
import org.bukkit.craftbukkit.CraftRegistry;
39+
import org.bukkit.craftbukkit.CraftWorld;
40+
import org.bukkit.craftbukkit.block.CraftBlock;
41+
import org.bukkit.craftbukkit.block.CraftBlockEntityState;
42+
import org.bukkit.craftbukkit.block.CraftCreatureSpawner;
43+
import org.bukkit.craftbukkit.block.CraftSkull;
44+
import org.bukkit.craftbukkit.entity.CraftEntity;
45+
import org.bukkit.craftbukkit.inventory.CraftItemStack;
46+
import org.bukkit.craftbukkit.util.CraftLocation;
47+
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
4848

4949
import java.lang.invoke.MethodHandle;
5050
import java.lang.reflect.Field;

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/ChunkHelperImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.denizenscript.denizen.nms.v1_21.helpers;
1+
package com.denizenscript.denizen.nms.v26_1.helpers;
22

33
import com.denizenscript.denizen.nms.abstracts.BiomeNMS;
44
import com.denizenscript.denizen.nms.interfaces.ChunkHelper;
5-
import com.denizenscript.denizen.nms.v1_21.impl.BiomeNMSImpl;
5+
import com.denizenscript.denizen.nms.v26_1.impl.BiomeNMSImpl;
66
import com.denizenscript.denizencore.tags.TagManager;
77
import com.denizenscript.denizencore.utilities.ReflectionHelper;
88
import com.denizenscript.denizencore.utilities.debugging.Debug;
@@ -20,8 +20,8 @@
2020
import net.minecraft.world.level.levelgen.Heightmap;
2121
import org.bukkit.Chunk;
2222
import org.bukkit.World;
23-
import org.bukkit.craftbukkit.v1_21_R7.CraftChunk;
24-
import org.bukkit.craftbukkit.v1_21_R7.CraftWorld;
23+
import org.bukkit.craftbukkit.CraftChunk;
24+
import org.bukkit.craftbukkit.CraftWorld;
2525

2626
import java.lang.invoke.MethodHandle;
2727
import java.lang.reflect.Field;

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/CustomEntityHelperImpl.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package com.denizenscript.denizen.nms.v1_21.helpers;
1+
package com.denizenscript.denizen.nms.v26_1.helpers;
22

33
import com.denizenscript.denizen.nms.NMSHandler;
44
import com.denizenscript.denizen.nms.interfaces.CustomEntityHelper;
55
import com.denizenscript.denizen.nms.interfaces.FakeArrow;
66
import com.denizenscript.denizen.nms.interfaces.FakePlayer;
77
import com.denizenscript.denizen.nms.interfaces.ItemProjectile;
88
import com.denizenscript.denizen.nms.util.PlayerProfile;
9-
import com.denizenscript.denizen.nms.v1_21.impl.ProfileEditorImpl;
10-
import com.denizenscript.denizen.nms.v1_21.impl.entities.CraftFakePlayerImpl;
11-
import com.denizenscript.denizen.nms.v1_21.impl.entities.EntityFakeArrowImpl;
12-
import com.denizenscript.denizen.nms.v1_21.impl.entities.EntityFakePlayerImpl;
13-
import com.denizenscript.denizen.nms.v1_21.impl.entities.EntityItemProjectileImpl;
9+
import com.denizenscript.denizen.nms.v26_1.impl.ProfileEditorImpl;
10+
import com.denizenscript.denizen.nms.v26_1.impl.entities.CraftFakePlayerImpl;
11+
import com.denizenscript.denizen.nms.v26_1.impl.entities.EntityFakeArrowImpl;
12+
import com.denizenscript.denizen.nms.v26_1.impl.entities.EntityFakePlayerImpl;
13+
import com.denizenscript.denizen.nms.v26_1.impl.entities.EntityItemProjectileImpl;
1414
import com.denizenscript.denizen.utilities.BukkitImplDeprecations;
1515
import com.denizenscript.denizencore.utilities.CoreUtilities;
1616
import com.denizenscript.denizencore.utilities.debugging.Debug;
@@ -20,8 +20,8 @@
2020
import org.bukkit.Bukkit;
2121
import org.bukkit.ChatColor;
2222
import org.bukkit.Location;
23-
import org.bukkit.craftbukkit.v1_21_R7.CraftWorld;
24-
import org.bukkit.craftbukkit.v1_21_R7.inventory.CraftItemStack;
23+
import org.bukkit.craftbukkit.CraftWorld;
24+
import org.bukkit.craftbukkit.inventory.CraftItemStack;
2525
import org.bukkit.event.entity.CreatureSpawnEvent;
2626
import org.bukkit.inventory.ItemStack;
2727
import org.bukkit.scoreboard.Scoreboard;

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/EnchantmentHelperImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.denizenscript.denizen.nms.v1_21.helpers;
1+
package com.denizenscript.denizen.nms.v26_1.helpers;
22

33
import com.denizenscript.denizen.nms.interfaces.EnchantmentHelper;
44

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/EntityDataNameMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.denizenscript.denizen.nms.v1_21.helpers;
1+
package com.denizenscript.denizen.nms.v26_1.helpers;
22

33

44
import com.denizenscript.denizencore.objects.ArgumentHelper;

‎v26_1/src/main/java/com/denizenscript/denizen/nms/v26_1/helpers/EntityHelperImpl.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.denizenscript.denizen.nms.v1_21.helpers;
1+
package com.denizenscript.denizen.nms.v26_1.helpers;
22

33
import com.denizenscript.denizen.Denizen;
44
import com.denizenscript.denizen.nms.NMSHandler;
55
import com.denizenscript.denizen.nms.interfaces.EntityHelper;
6-
import com.denizenscript.denizen.nms.v1_21.Handler;
7-
import com.denizenscript.denizen.nms.v1_21.ReflectionMappingsInfo;
8-
import com.denizenscript.denizen.nms.v1_21.impl.network.handlers.DenizenNetworkManagerImpl;
6+
import com.denizenscript.denizen.nms.v26_1.Handler;
7+
import com.denizenscript.denizen.nms.v26_1.ReflectionMappingsInfo;
8+
import com.denizenscript.denizen.nms.v26_1.impl.network.handlers.DenizenNetworkManagerImpl;
99
import com.denizenscript.denizen.objects.EntityTag;
1010
import com.denizenscript.denizen.objects.properties.entity.EntityState;
1111
import com.denizenscript.denizen.utilities.Utilities;
@@ -69,14 +69,14 @@
6969
import org.bukkit.attribute.AttributeInstance;
7070
import org.bukkit.block.CreatureSpawner;
7171
import org.bukkit.block.data.BlockData;
72-
import org.bukkit.craftbukkit.v1_21_R7.CraftServer;
73-
import org.bukkit.craftbukkit.v1_21_R7.CraftWorld;
74-
import org.bukkit.craftbukkit.v1_21_R7.block.CraftBlock;
75-
import org.bukkit.craftbukkit.v1_21_R7.block.CraftCreatureSpawner;
76-
import org.bukkit.craftbukkit.v1_21_R7.block.data.CraftBlockData;
77-
import org.bukkit.craftbukkit.v1_21_R7.entity.*;
78-
import org.bukkit.craftbukkit.v1_21_R7.inventory.CraftItemStack;
79-
import org.bukkit.craftbukkit.v1_21_R7.util.CraftLocation;
72+
import org.bukkit.craftbukkit.CraftServer;
73+
import org.bukkit.craftbukkit.CraftWorld;
74+
import org.bukkit.craftbukkit.block.CraftBlock;
75+
import org.bukkit.craftbukkit.block.CraftCreatureSpawner;
76+
import org.bukkit.craftbukkit.block.data.CraftBlockData;
77+
import org.bukkit.craftbukkit.entity.*;
78+
import org.bukkit.craftbukkit.inventory.CraftItemStack;
79+
import org.bukkit.craftbukkit.util.CraftLocation;
8080
import org.bukkit.entity.*;
8181
import org.bukkit.event.entity.EntityDamageEvent;
8282
import org.bukkit.inventory.EquipmentSlot;

0 commit comments

Comments
 (0)