Skip to content

Commit

Permalink
and now it actually works again
Browse files Browse the repository at this point in the history
  • Loading branch information
mcmonkey4eva committed Aug 16, 2019
1 parent 3e38726 commit 73e6fe9
Show file tree
Hide file tree
Showing 127 changed files with 240 additions and 235 deletions.
6 changes: 3 additions & 3 deletions dist/pom.xml
Expand Up @@ -28,19 +28,19 @@
</dependency>
<dependency>
<groupId>com.denizenscript</groupId>
<artifactId>denizen-v1_12_R1</artifactId>
<artifactId>denizen-v1_12</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.denizenscript</groupId>
<artifactId>denizen-v1_13_R2</artifactId>
<artifactId>denizen-v1_13</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.denizenscript</groupId>
<artifactId>denizen-v1_14_R1</artifactId>
<artifactId>denizen-v1_14</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
Expand Down
Expand Up @@ -35,6 +35,11 @@ public abstract class NMSHandler {
public static boolean initialize(JavaPlugin plugin) {
javaPlugin = plugin;
String packageName = javaPlugin.getServer().getClass().getPackage().getName();
int indexOfSubRevision = packageName.indexOf('R');
if (indexOfSubRevision > 0) {
// "v1_14_R1" should become "v1_14"
packageName = packageName.substring(0, indexOfSubRevision - 1);
}
try {
// Check if we support this MC version
version = NMSVersion.valueOf(packageName.substring(packageName.lastIndexOf('.') + 1));
Expand Down
@@ -1,13 +1,13 @@
package com.denizenscript.denizen.v1_12;
package com.denizenscript.denizen.nms.v1_12;

import com.denizenscript.denizen.nms.NMSHandler;
import com.denizenscript.denizen.v1_12.impl.BiomeNMSImpl;
import com.denizenscript.denizen.v1_12.impl.ProfileEditorImpl;
import com.denizenscript.denizen.v1_12.impl.SidebarImpl;
import com.denizenscript.denizen.v1_12.impl.blocks.BlockLightImpl;
import com.denizenscript.denizen.v1_12.impl.jnbt.CompoundTagImpl;
import com.denizenscript.denizen.v1_12.impl.packets.handlers.DenizenPacketListenerImpl;
import com.denizenscript.denizen.v1_12.helpers.*;
import com.denizenscript.denizen.nms.v1_12.helpers.*;
import com.denizenscript.denizen.nms.v1_12.impl.BiomeNMSImpl;
import com.denizenscript.denizen.nms.v1_12.impl.packets.handlers.DenizenPacketListenerImpl;
import com.denizenscript.denizen.nms.v1_12.impl.ProfileEditorImpl;
import com.denizenscript.denizen.nms.v1_12.impl.SidebarImpl;
import com.denizenscript.denizen.nms.v1_12.impl.blocks.BlockLightImpl;
import com.denizenscript.denizen.nms.v1_12.impl.jnbt.CompoundTagImpl;
import com.google.common.collect.Iterables;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.helpers;
package com.denizenscript.denizen.nms.v1_12.helpers;

import com.denizenscript.denizen.nms.interfaces.AdvancementHelper;
import com.denizenscript.denizen.nms.util.ReflectionHelper;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.helpers;
package com.denizenscript.denizen.nms.v1_12.helpers;

import com.denizenscript.denizen.nms.abstracts.AnimationHelper;
import com.denizenscript.denizen.nms.interfaces.EntityAnimation;
Expand Down
@@ -1,10 +1,10 @@
package com.denizenscript.denizen.v1_12.helpers;
package com.denizenscript.denizen.nms.v1_12.helpers;

import com.denizenscript.denizen.nms.v1_12.impl.blocks.BlockDataImpl;
import com.denizenscript.denizen.nms.v1_12.impl.jnbt.CompoundTagImpl;
import com.google.common.collect.Iterables;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import com.denizenscript.denizen.v1_12.impl.blocks.BlockDataImpl;
import com.denizenscript.denizen.v1_12.impl.jnbt.CompoundTagImpl;
import com.denizenscript.denizen.nms.interfaces.BlockData;
import com.denizenscript.denizen.nms.interfaces.BlockHelper;
import com.denizenscript.denizen.nms.util.PlayerProfile;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.helpers;
package com.denizenscript.denizen.nms.v1_12.helpers;

import com.denizenscript.denizen.nms.interfaces.ChunkHelper;
import net.minecraft.server.v1_12_R1.EntityPlayer;
Expand Down
@@ -1,12 +1,12 @@
package com.denizenscript.denizen.v1_12.helpers;
package com.denizenscript.denizen.nms.v1_12.helpers;

import com.denizenscript.denizen.v1_12.impl.entities.CraftFakePlayerImpl;
import com.denizenscript.denizen.v1_12.impl.entities.EntityFakeArrowImpl;
import com.denizenscript.denizen.v1_12.impl.entities.EntityFakePlayerImpl;
import com.denizenscript.denizen.nms.v1_12.impl.entities.CraftFakePlayerImpl;
import com.denizenscript.denizen.nms.v1_12.impl.entities.EntityFakeArrowImpl;
import com.denizenscript.denizen.nms.v1_12.impl.entities.EntityFakePlayerImpl;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import com.denizenscript.denizen.nms.NMSHandler;
import com.denizenscript.denizen.v1_12.impl.entities.EntityItemProjectileImpl;
import com.denizenscript.denizen.nms.v1_12.impl.entities.EntityItemProjectileImpl;
import com.denizenscript.denizen.nms.interfaces.CustomEntityHelper;
import com.denizenscript.denizen.nms.interfaces.FakeArrow;
import com.denizenscript.denizen.nms.interfaces.FakePlayer;
Expand Down
@@ -1,7 +1,7 @@
package com.denizenscript.denizen.v1_12.helpers;
package com.denizenscript.denizen.nms.v1_12.helpers;

import com.denizenscript.denizen.nms.NMSHandler;
import com.denizenscript.denizen.v1_12.impl.jnbt.CompoundTagImpl;
import com.denizenscript.denizen.nms.v1_12.impl.jnbt.CompoundTagImpl;
import com.denizenscript.denizen.nms.interfaces.EntityHelper;
import com.denizenscript.denizen.nms.util.BoundingBox;
import com.denizenscript.denizen.nms.util.Utilities;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.helpers;
package com.denizenscript.denizen.nms.v1_12.helpers;

import com.denizenscript.denizen.nms.interfaces.FishingHelper;
import net.minecraft.server.v1_12_R1.*;
Expand Down
@@ -1,10 +1,10 @@
package com.denizenscript.denizen.v1_12.helpers;
package com.denizenscript.denizen.nms.v1_12.helpers;

import com.denizenscript.denizen.nms.util.jnbt.*;
import com.denizenscript.denizen.nms.v1_12.impl.jnbt.CompoundTagImpl;
import com.google.common.collect.Iterables;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import com.denizenscript.denizen.v1_12.impl.jnbt.CompoundTagImpl;
import com.denizenscript.denizen.nms.interfaces.ItemHelper;
import com.denizenscript.denizen.nms.util.PlayerProfile;
import net.minecraft.server.v1_12_R1.GameProfileSerializer;
Expand Down
@@ -1,8 +1,8 @@
package com.denizenscript.denizen.v1_12.helpers;
package com.denizenscript.denizen.nms.v1_12.helpers;

import com.denizenscript.denizen.nms.v1_12.impl.jnbt.CompoundTagImpl;
import io.netty.buffer.Unpooled;
import com.denizenscript.denizen.nms.NMSHandler;
import com.denizenscript.denizen.v1_12.impl.jnbt.CompoundTagImpl;
import com.denizenscript.denizen.nms.interfaces.PacketHelper;
import com.denizenscript.denizen.nms.util.ReflectionHelper;
import com.denizenscript.denizen.nms.util.jnbt.CompoundTag;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.helpers;
package com.denizenscript.denizen.nms.v1_12.helpers;

import com.denizenscript.denizen.nms.abstracts.ParticleHelper;
import org.bukkit.Effect;
Expand Down
@@ -1,7 +1,7 @@
package com.denizenscript.denizen.v1_12.helpers;
package com.denizenscript.denizen.nms.v1_12.helpers;

import com.denizenscript.denizen.v1_12.impl.ImprovedOfflinePlayerImpl;
import com.denizenscript.denizen.v1_12.impl.packets.handlers.AbstractListenerPlayInImpl;
import com.denizenscript.denizen.nms.v1_12.impl.ImprovedOfflinePlayerImpl;
import com.denizenscript.denizen.nms.v1_12.impl.packets.handlers.AbstractListenerPlayInImpl;
import com.mojang.authlib.GameProfile;
import com.denizenscript.denizen.nms.abstracts.ImprovedOfflinePlayer;
import com.denizenscript.denizen.nms.interfaces.PlayerHelper;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.helpers;
package com.denizenscript.denizen.nms.v1_12.helpers;

import com.denizenscript.denizen.nms.interfaces.SoundHelper;
import org.bukkit.Sound;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.helpers;
package com.denizenscript.denizen.nms.v1_12.helpers;

import com.denizenscript.denizen.nms.interfaces.WorldAccess;
import com.denizenscript.denizen.nms.interfaces.WorldHelper;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl;
package com.denizenscript.denizen.nms.v1_12.impl;

import com.denizenscript.denizen.nms.abstracts.BiomeNMS;
import com.denizenscript.denizen.nms.util.ReflectionHelper;
Expand Down
@@ -1,6 +1,6 @@
package com.denizenscript.denizen.v1_12.impl;
package com.denizenscript.denizen.nms.v1_12.impl;

import com.denizenscript.denizen.v1_12.impl.jnbt.CompoundTagImpl;
import com.denizenscript.denizen.nms.v1_12.impl.jnbt.CompoundTagImpl;
import com.denizenscript.denizen.nms.abstracts.ImprovedOfflinePlayer;
import com.denizenscript.denizencore.utilities.debugging.Debug;
import net.minecraft.server.v1_12_R1.*;
Expand Down
@@ -1,6 +1,6 @@
package com.denizenscript.denizen.v1_12.impl;
package com.denizenscript.denizen.nms.v1_12.impl;

import com.denizenscript.denizen.v1_12.helpers.PacketHelperImpl;
import com.denizenscript.denizen.nms.v1_12.helpers.PacketHelperImpl;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import com.denizenscript.denizen.nms.NMSHandler;
Expand Down
@@ -1,6 +1,6 @@
package com.denizenscript.denizen.v1_12.impl;
package com.denizenscript.denizen.nms.v1_12.impl;

import com.denizenscript.denizen.v1_12.helpers.PacketHelperImpl;
import com.denizenscript.denizen.nms.v1_12.helpers.PacketHelperImpl;
import com.denizenscript.denizen.nms.abstracts.Sidebar;
import net.minecraft.server.v1_12_R1.*;
import org.bukkit.entity.Player;
Expand Down
@@ -1,6 +1,6 @@
package com.denizenscript.denizen.v1_12.impl.blocks;
package com.denizenscript.denizen.nms.v1_12.impl.blocks;

import com.denizenscript.denizen.v1_12.impl.jnbt.CompoundTagImpl;
import com.denizenscript.denizen.nms.v1_12.impl.jnbt.CompoundTagImpl;
import com.denizenscript.denizen.nms.interfaces.BlockData;
import com.denizenscript.denizen.nms.util.jnbt.CompoundTag;
import com.denizenscript.denizen.nms.util.jnbt.CompoundTagBuilder;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.blocks;
package com.denizenscript.denizen.nms.v1_12.impl.blocks;

import com.denizenscript.denizen.nms.NMSHandler;
import com.denizenscript.denizen.nms.abstracts.BlockLight;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.entities;
package com.denizenscript.denizen.nms.v1_12.impl.entities;

import com.denizenscript.denizen.nms.interfaces.FakeArrow;
import net.minecraft.server.v1_12_R1.EntityArrow;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.entities;
package com.denizenscript.denizen.nms.v1_12.impl.entities;

import com.denizenscript.denizen.nms.NMSHandler;
import com.denizenscript.denizen.nms.interfaces.FakePlayer;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.entities;
package com.denizenscript.denizen.nms.v1_12.impl.entities;

import com.denizenscript.denizen.nms.interfaces.ItemProjectile;
import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.entities;
package com.denizenscript.denizen.nms.v1_12.impl.entities;

import net.minecraft.server.v1_12_R1.EntitySpectralArrow;
import net.minecraft.server.v1_12_R1.ItemStack;
Expand Down
@@ -1,8 +1,8 @@
package com.denizenscript.denizen.v1_12.impl.entities;
package com.denizenscript.denizen.nms.v1_12.impl.entities;

import com.denizenscript.denizen.nms.v1_12.impl.network.FakeNetworkManagerImpl;
import com.denizenscript.denizen.nms.v1_12.impl.network.FakePlayerConnectionImpl;
import com.mojang.authlib.GameProfile;
import com.denizenscript.denizen.v1_12.impl.network.FakeNetworkManagerImpl;
import com.denizenscript.denizen.v1_12.impl.network.FakePlayerConnectionImpl;
import net.minecraft.server.v1_12_R1.*;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.entities;
package com.denizenscript.denizen.nms.v1_12.impl.entities;

import net.minecraft.server.v1_12_R1.*;
import org.bukkit.Bukkit;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.jnbt;
package com.denizenscript.denizen.nms.v1_12.impl.jnbt;

import com.denizenscript.denizen.nms.util.jnbt.*;
import net.minecraft.server.v1_12_R1.*;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_14.impl.network;
package com.denizenscript.denizen.nms.v1_12.impl.network;

import io.netty.channel.*;

Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.network;
package com.denizenscript.denizen.nms.v1_12.impl.network;

import com.denizenscript.denizencore.utilities.debugging.Debug;
import net.minecraft.server.v1_12_R1.EnumProtocolDirection;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.network;
package com.denizenscript.denizen.nms.v1_12.impl.network;

import net.minecraft.server.v1_12_R1.EntityPlayer;
import net.minecraft.server.v1_12_R1.MinecraftServer;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.packets;
package com.denizenscript.denizen.nms.v1_12.impl.packets;

import com.denizenscript.denizen.nms.interfaces.packets.PacketInResourcePackStatus;
import net.minecraft.server.v1_12_R1.PacketPlayInResourcePackStatus;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.packets;
package com.denizenscript.denizen.nms.v1_12.impl.packets;

import com.denizenscript.denizen.nms.interfaces.packets.PacketInSteerVehicle;
import net.minecraft.server.v1_12_R1.PacketPlayInSteerVehicle;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.packets;
package com.denizenscript.denizen.nms.v1_12.impl.packets;

import com.denizenscript.denizen.nms.interfaces.packets.PacketOutChat;
import com.denizenscript.denizen.nms.util.ReflectionHelper;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.packets;
package com.denizenscript.denizen.nms.v1_12.impl.packets;

import com.denizenscript.denizen.nms.interfaces.packets.PacketOutEntityMetadata;
import com.denizenscript.denizen.nms.util.ReflectionHelper;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.packets;
package com.denizenscript.denizen.nms.v1_12.impl.packets;

import com.denizenscript.denizen.nms.interfaces.packets.PacketOutSetSlot;
import com.denizenscript.denizen.nms.util.ReflectionHelper;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.packets;
package com.denizenscript.denizen.nms.v1_12.impl.packets;

import com.denizenscript.denizen.nms.interfaces.packets.PacketOutSpawnEntity;
import com.denizenscript.denizen.nms.util.ReflectionHelper;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.packets;
package com.denizenscript.denizen.nms.v1_12.impl.packets;

import io.netty.buffer.Unpooled;
import com.denizenscript.denizen.nms.interfaces.packets.PacketOutTradeList;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.packets;
package com.denizenscript.denizen.nms.v1_12.impl.packets;

import com.denizenscript.denizen.nms.interfaces.packets.PacketOutWindowItems;
import com.denizenscript.denizen.nms.util.ReflectionHelper;
Expand Down
@@ -1,4 +1,4 @@
package com.denizenscript.denizen.v1_12.impl.packets.handlers;
package com.denizenscript.denizen.nms.v1_12.impl.packets.handlers;

import net.minecraft.server.v1_12_R1.*;
import org.bukkit.Location;
Expand Down
@@ -1,18 +1,18 @@
package com.denizenscript.denizen.v1_12.impl.packets.handlers;
package com.denizenscript.denizen.nms.v1_12.impl.packets.handlers;

import com.denizenscript.denizen.v1_12.impl.packets.PacketOutSetSlotImpl;
import com.denizenscript.denizen.v1_12.impl.entities.EntityFakePlayerImpl;
import com.denizenscript.denizen.nms.v1_12.impl.packets.PacketOutSetSlotImpl;
import com.denizenscript.denizen.nms.v1_12.impl.entities.EntityFakePlayerImpl;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import com.denizenscript.denizen.nms.NMSHandler;
import com.denizenscript.denizen.v1_12.impl.ProfileEditorImpl;
import com.denizenscript.denizen.v1_12.impl.packets.PacketOutChatImpl;
import com.denizenscript.denizen.v1_12.impl.packets.PacketOutEntityMetadataImpl;
import com.denizenscript.denizen.v1_12.impl.packets.PacketOutSpawnEntityImpl;
import com.denizenscript.denizen.v1_12.impl.packets.PacketOutTradeListImpl;
import com.denizenscript.denizen.v1_12.impl.packets.PacketOutWindowItemsImpl;
import com.denizenscript.denizen.nms.v1_12.impl.ProfileEditorImpl;
import com.denizenscript.denizen.nms.v1_12.impl.packets.PacketOutChatImpl;
import com.denizenscript.denizen.nms.v1_12.impl.packets.PacketOutEntityMetadataImpl;
import com.denizenscript.denizen.nms.v1_12.impl.packets.PacketOutSpawnEntityImpl;
import com.denizenscript.denizen.nms.v1_12.impl.packets.PacketOutTradeListImpl;
import com.denizenscript.denizen.nms.v1_12.impl.packets.PacketOutWindowItemsImpl;
import com.denizenscript.denizen.nms.interfaces.packets.PacketHandler;
import com.denizenscript.denizen.nms.interfaces.packets.PacketOutSpawnEntity;
import com.denizenscript.denizen.nms.util.ReflectionHelper;
Expand Down
@@ -1,8 +1,8 @@
package com.denizenscript.denizen.v1_12.impl.packets.handlers;
package com.denizenscript.denizen.nms.v1_12.impl.packets.handlers;

import com.denizenscript.denizen.nms.NMSHandler;
import com.denizenscript.denizen.v1_12.impl.packets.PacketInResourcePackStatusImpl;
import com.denizenscript.denizen.v1_12.impl.packets.PacketInSteerVehicleImpl;
import com.denizenscript.denizen.nms.v1_12.impl.packets.PacketInResourcePackStatusImpl;
import com.denizenscript.denizen.nms.v1_12.impl.packets.PacketInSteerVehicleImpl;
import com.denizenscript.denizen.nms.interfaces.packets.PacketHandler;
import net.minecraft.server.v1_12_R1.EntityPlayer;
import net.minecraft.server.v1_12_R1.NetworkManager;
Expand Down

0 comments on commit 73e6fe9

Please sign in to comment.