Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated forge code to 1.6.2.

Browse Source 
Note that this is untested (although it compiles) since
I don't currently have a 1.6 forge installation set up.
This commit is contained in:
wizjany 2013-08-12 21:26:17 -04:00
parent 60f44be298
commit bfd13a4140
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/forge/java/com/sk89q/worldedit/forge/ForgePlayer.java
View File

@ -3,6 +3,7 @@ package com.sk89q.worldedit.forge;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.util.ChatMessageComponent;
import com.sk89q.util.StringUtil; import com.sk89q.util.StringUtil;
import com.sk89q.worldedit.LocalPlayer; import com.sk89q.worldedit.LocalPlayer;
@ -60,23 +61,27 @@ public class ForgePlayer extends LocalPlayer {
} }
public void printRaw(String msg) { public void printRaw(String msg) {
for (String part : msg.split("\n")) for (String part : msg.split("\n")) {
this.player.sendChatToPlayer(msg); this.player.sendChatToPlayer(ChatMessageComponent.func_111077_e(msg));
}
} }
public void printDebug(String msg) { public void printDebug(String msg) {
for (String part : msg.split("\n")) for (String part : msg.split("\n")) {
this.player.sendChatToPlayer("\u00a77" + part); this.player.sendChatToPlayer(ChatMessageComponent.func_111077_e("\u00a77" + part));
}
} }
public void print(String msg) { public void print(String msg) {
for (String part : msg.split("\n")) for (String part : msg.split("\n")) {
this.player.sendChatToPlayer("\u00a7d" + part); this.player.sendChatToPlayer(ChatMessageComponent.func_111077_e("\u00a7d" + part));
}
} }
public void printError(String msg) { public void printError(String msg) {
for (String part : msg.split("\n")) for (String part : msg.split("\n")) {
this.player.sendChatToPlayer("\u00a7c" + part); this.player.sendChatToPlayer(ChatMessageComponent.func_111077_e("\u00a7c" + part));
}
} }
public void setPosition(Vector pos, float pitch, float yaw) { public void setPosition(Vector pos, float pitch, float yaw) {

4
src/forge/java/com/sk89q/worldedit/forge/ForgeServerInterface.java
View File

@ -71,6 +71,10 @@ public class ForgeServerInterface extends ServerInterface {
public void processCommand(ICommandSender var1, String[] var2) { public void processCommand(ICommandSender var1, String[] var2) {
} }
public String getCommandUsage(ICommandSender icommandsender) {
return null;
}
}); });
} }
} }

8
src/forge/java/com/sk89q/worldedit/forge/ForgeWorld.java
View File

@ -227,13 +227,15 @@ public class ForgeWorld extends LocalWorld {
return true; return true;
} }
/*
if (block instanceof MobSpawnerBlock) { if (block instanceof MobSpawnerBlock) {
// Mob spawners // Mob spawners
TileEntityMobSpawner spawner = new TileEntityMobSpawner(); TileEntityMobSpawner spawner = new TileEntityMobSpawner();
spawner.func_98049_a().setMobID(((MobSpawnerBlock) block).getMobType()); spawner.getSpawnerLogic().setMobID(((MobSpawnerBlock) block).getMobType());
world.setBlockTileEntity(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ(), spawner); world.setBlockTileEntity(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ(), spawner);
return true; return true;
} }
*/
if (block instanceof NoteBlock) { if (block instanceof NoteBlock) {
// Note block // Note block
@ -371,10 +373,6 @@ public class ForgeWorld extends LocalWorld {
} }
EntityLiving ent = (EntityLiving) obj; EntityLiving ent = (EntityLiving) obj;
if (ent instanceof EntityPlayer) {
continue;
}
if (!killAnimals && ent instanceof EntityAnimal) { if (!killAnimals && ent instanceof EntityAnimal) {
continue; continue;
} }