Merge pull request #1 from Morphan1/master

Update NMS stuff
DenizenScript · Nov 29, 2014 · bff740f · bff740f
2 parents fb50c77 + abf2a91
commit bff740f
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 32 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java
@@ -257,13 +257,8 @@ private void reel() {
     public ItemStack getFishingResult() {
         if (catchType == CatchType.DEFAULT) {
             float f = nmsworld.random.nextFloat();
-            /*
-            int i = EnchantmentManager.getLuckEnchantmentLevel(fishHook.owner);
-            int j = EnchantmentManager.getLureEnchantmentLevel(fishHook.owner);
-            */
-            // TODO: 1.8 UPDATE
-            int i = 0;
-            int j = 0;
+            int i = EnchantmentManager.g(fishHook.owner);
+            int j = EnchantmentManager.h(fishHook.owner);
             float f1 = 0.1F - (float) i * 0.025F - (float) j * 0.01F;
             float f2 = 0.05F + (float) i * 0.01F - (float) j * 0.01F;
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -2168,9 +2168,9 @@ else if (isLivingEntity()) {
             dList list = dList.valueOf(value.asString());
             if (list.size() > 1) {
                 if (list.get(0).equalsIgnoreCase("true"))
-                    ((CraftAnimals)getLivingEntity()).getHandle().a((EntityHuman) null); // TODO: 1.8 UPDATE - is this right?
+                    ((CraftAnimals)getLivingEntity()).getHandle().a((EntityHuman) null);
                 else
-                    ((CraftAnimals)getLivingEntity()).getHandle().cf();
+                    ((CraftAnimals)getLivingEntity()).getHandle().cq();
             }
         }
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dItem.java b/src/main/java/net/aufdemrand/denizen/objects/dItem.java
@@ -720,7 +720,7 @@ public String getAttribute(Attribute attribute) {
         // {'text':'Item','color':'white','hoverEvent':{'action':'show_item','value':'{<player.item_in_hand.json>}'}}]}"
         // -->
         if (attribute.startsWith("json")) {
-            String JSON = CraftItemStack.asNMSCopy(item).C().getChatModifier().toString(); // TODO: 1.8 UPDATE: Is this correct?
+            String JSON = CraftItemStack.asNMSCopy(item).C().getChatModifier().toString();
             return new Element(JSON.substring(176, JSON.length() - 154))
                     .getAttribute(attribute.fulfill(1));
         }

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/AnimateChestCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/AnimateChestCommand.java
@@ -2,7 +2,9 @@
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;
+import net.minecraft.server.v1_8_R1.Block;
 import net.minecraft.server.v1_8_R1.PacketPlayOutBlockAction;
+import net.minecraft.server.v1_8_R1.BlockPosition;
 import org.bukkit.Sound;
 
 import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
@@ -76,26 +78,25 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
                                           + sound.debug()
                                           + aH.debugObj("players", players.toString()));
 
+        BlockPosition blockPosition = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ());
+        Block block = ((CraftWorld) location.getWorld()).getHandle().getType(blockPosition).getBlock();
+
         switch (ChestAction.valueOf(action.asString().toUpperCase())) {
-            /*
             case OPEN:
                 for (dPlayer player: players) {
                     if (sound.asBoolean()) player.getPlayerEntity().playSound(location, Sound.CHEST_OPEN, 1, 1);
                     ((CraftPlayer)player.getPlayerEntity()).getHandle().playerConnection.sendPacket(
-                            new PacketPlayOutBlockAction(location.getBlockX(), location.getBlockY(), location.getBlockZ(),
-                            ((CraftWorld) location.getWorld()).getHandle().getType(location.getBlockX(), location.getBlockY(), location.getBlockZ()), 1, 1));
+                            new PacketPlayOutBlockAction(blockPosition, block, 1, 1));
                 }
                 break;
 
             case CLOSE:
                 for (dPlayer player: players) {
                     if (sound.asBoolean()) player.getPlayerEntity().getWorld().playSound(location, Sound.CHEST_CLOSE, 1, 1);
                     ((CraftPlayer)player.getPlayerEntity()).getHandle().playerConnection.sendPacket(
-                            new PacketPlayOutBlockAction(location.getBlockX(), location.getBlockY(), location.getBlockZ(),
-                            ((CraftWorld)location.getWorld()).getHandle().getType(location.getBlockX(), location.getBlockY(), location.getBlockZ()), 1, 0));
+                            new PacketPlayOutBlockAction(blockPosition, block, 1, 0));
                 }
-                break;*/
-            // TODO: 1.8 UPDATE
+                break;
         }
     }
 }
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ModifyBlockCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ModifyBlockCommand.java
@@ -23,6 +23,8 @@
 import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -187,25 +189,38 @@ boolean preSetup(List<dObject> locations) {
         if (locations.size() == 0)
             return false;
         // Freeze the first world in the list.
+        // TODO: make this do all worlds from the locations in the list
         CraftWorld craftWorld = (CraftWorld)((dLocation)locations.get(0)).getWorld();
-        /*
         boolean was_static = craftWorld.getHandle().isStatic;
         if (no_physics)
-            craftWorld.getHandle().isStatic = true;
+            setWorldIsStatic(((dLocation)locations.get(0)).getWorld(), true);
         return was_static;
-            */
-        // TODO: 1.8 UPDATE
-        return false;
     }
 
     void postComplete(Location loc, boolean was_static) {
         // Unfreeze the first world in the list.
-        CraftWorld craftWorld = (CraftWorld)loc.getWorld();
-        /*
+        // TODO: make this do all worlds from the locations in the list
         if (no_physics)
-            craftWorld.getHandle().isStatic = was_static;
-        no_physics = false;*/
-        // TODO: 1.8 UPDATE
+            setWorldIsStatic(loc.getWorld(), was_static);
+        no_physics = false;
+    }
+
+    private static Field isStaticField = null;
+
+    void setWorldIsStatic(World world, boolean isStatic) {
+        try {
+            CraftWorld craftWorld = (CraftWorld) world;
+            if (isStaticField == null) {
+                    isStaticField = craftWorld.getHandle().getClass().getField("isStatic");
+                    isStaticField.setAccessible(true);
+                    Field modifiersField = Field.class.getDeclaredField("modifiers");
+                    modifiersField.setAccessible(true);
+                    modifiersField.setInt(isStaticField, isStaticField.getModifiers() & ~Modifier.FINAL);
+            }
+            isStaticField.set(craftWorld.getHandle(), isStatic);
+        } catch (Exception e) {
+            dB.echoError(e);
+        }
     }
 
     void handleLocation(dLocation location, int index, List<dMaterial> materialList, boolean doPhysics,

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/entity/Rotation.java b/src/main/java/net/aufdemrand/denizen/utilities/entity/Rotation.java
@@ -66,12 +66,10 @@ private static void look(Entity entity, float yaw, float pitch) {
                 while(yaw >= 180.0F) {
                     yaw -= 360.0F;
                 }
-                /*
-                livingHandle.aO = yaw;
+                livingHandle.aI = yaw;
                 if(!(handle instanceof EntityHuman))
-                    livingHandle.aM = yaw;
-                livingHandle.aP = yaw;*/
-                // TODO: 1.8 UPDATE
+                    livingHandle.aG = yaw;
+                livingHandle.aJ = yaw;
             }
             handle.pitch = pitch;
         }