Backport for CB 1.8 pieced together by looking through the upgrade co…

…mmits. There is no guarantee this will work. Requires at minimum ProtocolLib 3.5.0.
lishid · Apr 22, 2016 · 93363e8 · 93363e8
1 parent 1e1456a
commit 93363e8
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 26 deletions.
diff --git a/README b/README
@@ -1,4 +1,4 @@
-This is a tagged release version for CraftBukkit 1.8.3. No support is guaranteed.
+This is a tagged release version for CraftBukkit 1.8. No support is guaranteed.
 
 Copyright (C) 2011-2015 lishid.  All rights reserved.
 

diff --git a/pom.xml b/pom.xml
@@ -4,9 +4,9 @@
   <groupId>com.lishid</groupId>
   <artifactId>orebfuscator</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.6-R2</version>
+  <version>3.0.6-R1</version>
   <name>Orebfuscator</name>
-  <description>This release is appropriate for CraftBukkit 1.8.3</description>
+  <description>This release is appropriate for CraftBukkit 1.8</description>
   <url>http://dev.bukkit.org/server-mods/orebfuscator/</url>
 
   <properties>
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
-      <version>1.8.3-R0.1-SNAPSHOT</version>
+      <version>1.8-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/src/main/java/com/lishid/orebfuscator/hook/ProtocolLibHook.java b/src/main/java/com/lishid/orebfuscator/hook/ProtocolLibHook.java
@@ -25,7 +25,7 @@
 import com.lishid.orebfuscator.hithack.BlockHitManager;
 import com.lishid.orebfuscator.internal.Packet51;
 import com.lishid.orebfuscator.obfuscation.Calculations;
-import net.minecraft.server.v1_8_R2.PacketPlayInBlockDig.EnumPlayerDigType;
+import net.minecraft.server.v1_8_R1.EnumPlayerDigType;
 import org.bukkit.plugin.Plugin;
 
 public class ProtocolLibHook {

diff --git a/src/main/java/com/lishid/orebfuscator/internal/ChunkCache.java b/src/main/java/com/lishid/orebfuscator/internal/ChunkCache.java
@@ -25,7 +25,7 @@
 import com.lishid.orebfuscator.OrebfuscatorConfig;
 
 //Volatile
-import net.minecraft.server.v1_8_R2.*;
+import net.minecraft.server.v1_8_R1.*;
 
 public class ChunkCache {
     private static final HashMap<File, RegionFile> cachedRegionFiles = new HashMap<File, RegionFile>();

diff --git a/src/main/java/com/lishid/orebfuscator/internal/ChunkData.java b/src/main/java/com/lishid/orebfuscator/internal/ChunkData.java
@@ -16,7 +16,7 @@
 
 package com.lishid.orebfuscator.internal;
 
-import net.minecraft.server.v1_8_R2.PacketPlayOutMapChunk.ChunkMap;
+import net.minecraft.server.v1_8_R1.ChunkMap;
 
 public class ChunkData {
     public int x;

diff --git a/src/main/java/com/lishid/orebfuscator/internal/ChunkQueue.java b/src/main/java/com/lishid/orebfuscator/internal/ChunkQueue.java
@@ -23,8 +23,8 @@
 import com.lishid.orebfuscator.obfuscation.MinecraftBlock;
 import com.lishid.orebfuscator.obfuscation.ProximityHider;
 import io.netty.channel.Channel;
-import net.minecraft.server.v1_8_R2.*;
-import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
+import net.minecraft.server.v1_8_R1.*;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;

diff --git a/src/main/java/com/lishid/orebfuscator/internal/MinecraftInternals.java b/src/main/java/com/lishid/orebfuscator/internal/MinecraftInternals.java
@@ -18,16 +18,16 @@
 
 import com.lishid.orebfuscator.Orebfuscator;
 import com.lishid.orebfuscator.utils.ReflectionHelper;
-import net.minecraft.server.v1_8_R2.*;
-import org.bukkit.craftbukkit.v1_8_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
+import net.minecraft.server.v1_8_R1.*;
+import org.bukkit.craftbukkit.v1_8_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 //Volatile
 
 public class MinecraftInternals {
     public static boolean isBlockTransparent(int id) {
-        return Block.getById(id).u();
+        return Block.getById(id).s();
     }
 
     public static void updateBlockTileEntity(org.bukkit.block.Block block, Player player) {

diff --git a/src/main/java/com/lishid/orebfuscator/internal/NBT.java b/src/main/java/com/lishid/orebfuscator/internal/NBT.java
@@ -16,8 +16,8 @@
 
 package com.lishid.orebfuscator.internal;
 
-import net.minecraft.server.v1_8_R2.NBTCompressedStreamTools;
-import net.minecraft.server.v1_8_R2.NBTTagCompound;
+import net.minecraft.server.v1_8_R1.NBTCompressedStreamTools;
+import net.minecraft.server.v1_8_R1.NBTTagCompound;
 
 import java.io.DataInput;
 import java.io.DataInputStream;

diff --git a/src/main/java/com/lishid/orebfuscator/internal/Packet51.java b/src/main/java/com/lishid/orebfuscator/internal/Packet51.java
@@ -17,8 +17,8 @@
 package com.lishid.orebfuscator.internal;
 
 import com.lishid.orebfuscator.utils.ReflectionHelper;
-import net.minecraft.server.v1_8_R2.PacketPlayOutMapChunk;
-import net.minecraft.server.v1_8_R2.PacketPlayOutMapChunk.ChunkMap;
+import net.minecraft.server.v1_8_R1.PacketPlayOutMapChunk;
+import net.minecraft.server.v1_8_R1.ChunkMap;
 
 public class Packet51 {
     private static Class<PacketPlayOutMapChunk> packetClass = PacketPlayOutMapChunk.class;

diff --git a/src/main/java/com/lishid/orebfuscator/internal/Packet56.java b/src/main/java/com/lishid/orebfuscator/internal/Packet56.java
@@ -17,8 +17,8 @@
 package com.lishid.orebfuscator.internal;
 
 import com.lishid.orebfuscator.utils.ReflectionHelper;
-import net.minecraft.server.v1_8_R2.PacketPlayOutMapChunk.ChunkMap;
-import net.minecraft.server.v1_8_R2.PacketPlayOutMapChunkBulk;
+import net.minecraft.server.v1_8_R1.ChunkMap;
+import net.minecraft.server.v1_8_R1.PacketPlayOutMapChunkBulk;
 
 //Volatile
 

diff --git a/src/main/java/com/lishid/orebfuscator/internal/PlayerHook.java b/src/main/java/com/lishid/orebfuscator/internal/PlayerHook.java
@@ -21,11 +21,11 @@
 import com.lishid.orebfuscator.obfuscation.Calculations;
 import com.lishid.orebfuscator.utils.ReflectionHelper;
 import io.netty.channel.*;
-import net.minecraft.server.v1_8_R2.PacketPlayInBlockDig.EnumPlayerDigType;
-import net.minecraft.server.v1_8_R2.NetworkManager;
-import net.minecraft.server.v1_8_R2.PacketPlayInBlockDig;
-import net.minecraft.server.v1_8_R2.PacketPlayOutMapChunk;
-import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
+import net.minecraft.server.v1_8_R1.EnumPlayerDigType;
+import net.minecraft.server.v1_8_R1.NetworkManager;
+import net.minecraft.server.v1_8_R1.PacketPlayInBlockDig;
+import net.minecraft.server.v1_8_R1.PacketPlayOutMapChunk;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 import java.lang.reflect.Field;

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,11 +1,11 @@
 name: Orebfuscator3
 main: com.lishid.orebfuscator.Orebfuscator
-version: 3.0.6-R2
+version: 3.0.6-R1
 author: lishid
 softdepend: [ProtocolLib]
 load: startup
 description: >
-             The most powerful and efficient Anti Xray for CraftBukkit 1.8.3
+             The most powerful and efficient Anti Xray for CraftBukkit 1.8
 commands:
   ofc:
     description: Manage Orebfuscator.