Skip to content

Commit 68d4686

Browse files
VexatosVexatos
committedMay 1, 2016
Ported the mod to MC 1.9.
1 parent ade4979 commit 68d4686

15 files changed

+180
-143
lines changed
 

Diff for: ‎build.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
minecraft.version=1.8.9
2-
forge.version=11.15.1.1722
3-
mappings=stable_20
1+
minecraft.version=1.9
2+
forge.version=12.16.0.1867-1.9
3+
mappings=snapshot_20160428
44

55
conventional.version=0.0.5
66

Diff for: ‎src/main/java/vexatos/conventional/Conventional.java

+27-26
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import net.minecraftforge.common.config.Configuration;
88
import net.minecraftforge.common.util.FakePlayer;
99
import net.minecraftforge.event.entity.player.AttackEntityEvent;
10-
import net.minecraftforge.event.entity.player.EntityInteractEvent;
1110
import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed;
1211
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
1312
import net.minecraftforge.event.world.BlockEvent.BreakEvent;
@@ -89,22 +88,22 @@ public void onServerStopping(FMLServerStoppingEvent e) {
8988

9089
@SubscribeEvent(priority = EventPriority.LOWEST)
9190
public void onPlace(PlaceEvent event) {
92-
if(isAdventureMode(event.player) && !config.mayRightclick(event.itemInHand)) {
91+
if(isAdventureMode(event.getPlayer()) && !config.mayRightclick(event.getItemInHand())) {
9392
event.setCanceled(true);
9493
}
9594
}
9695

9796
@SubscribeEvent(priority = EventPriority.LOWEST)
9897
public void onBreakSpeed(BreakSpeed event) {
99-
if(isAdventureMode(event.entityPlayer) && !config.mayBreak(event.entityPlayer.worldObj, event.pos)) {
98+
if(isAdventureMode(event.getEntityPlayer()) && !config.mayBreak(event.getEntityPlayer().worldObj, event.getPos())) {
10099
//event.setCanceled(true);
101-
event.newSpeed = Float.MIN_VALUE;
100+
event.setNewSpeed(Float.MIN_VALUE);
102101
}
103102
}
104103

105104
@SubscribeEvent(priority = EventPriority.LOWEST)
106105
public void onBreak(BreakEvent event) {
107-
if(isAdventureMode(event.getPlayer()) && !config.mayBreak(event.world, event.pos)) {
106+
if(isAdventureMode(event.getPlayer()) && !config.mayBreak(event.getWorld(), event.getPos())) {
108107
event.setCanceled(true);
109108
}
110109
}
@@ -114,27 +113,36 @@ public void onInteract(PlayerInteractEvent event) {
114113
if(event.isCanceled()) {
115114
return;
116115
}
117-
if(isAdventureMode(event.entityPlayer)) {
118-
if(event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK) {
119-
if(!config.mayLeftclick(event.world, event.pos)) {
116+
if(isAdventureMode(event.getEntityPlayer())) {
117+
if(event instanceof PlayerInteractEvent.LeftClickBlock) {
118+
if(!config.mayLeftclick(event.getWorld(), event.getPos())) {
120119
event.setCanceled(true);
121120
}
122-
} else if(event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
121+
} else if(event instanceof PlayerInteractEvent.RightClickBlock) {
122+
final PlayerInteractEvent.RightClickBlock rcevent = (PlayerInteractEvent.RightClickBlock) event;
123123
final boolean
124-
validBlock = config.mayRightclick(event.world, event.pos),
125-
validItem = config.mayRightclick(event.entityPlayer.getHeldItem());
124+
validBlock = config.mayRightclick(rcevent.getWorld(), rcevent.getPos()),
125+
validItem = config.mayRightclick(rcevent.getItemStack());
126126
if(validBlock && validItem) {
127127
// Just return.
128128
} else if(!validBlock && !validItem) {
129-
event.setCanceled(true);
129+
rcevent.setCanceled(true);
130130
} else if(validBlock) {
131-
event.useBlock = Result.ALLOW;
132-
event.useItem = Result.DENY;
131+
rcevent.setUseBlock(Result.ALLOW);
132+
rcevent.setUseItem(Result.DENY);
133133
} else {
134-
event.useBlock = Result.DENY;
135-
event.useItem = Result.ALLOW;
134+
rcevent.setUseBlock(Result.DENY);
135+
rcevent.setUseItem(Result.ALLOW);
136+
}
137+
} else if(event instanceof PlayerInteractEvent.EntityInteract) {
138+
if(isAdventureMode(event.getEntityPlayer()) && !config.mayRightclick(((PlayerInteractEvent.EntityInteract) event).getTarget())) {
139+
event.setCanceled(true);
140+
}
141+
} else if(event instanceof PlayerInteractEvent.EntityInteractSpecific) {
142+
if(isAdventureMode(event.getEntityPlayer()) && !config.mayRightclick(((PlayerInteractEvent.EntityInteractSpecific) event).getTarget())) {
143+
event.setCanceled(true);
136144
}
137-
} else if(!config.mayRightclick(event.entityPlayer.getHeldItem())) {
145+
} else if(!config.mayRightclick(event.getItemStack())) {
138146
event.setCanceled(true);
139147
}
140148
}
@@ -146,7 +154,7 @@ private boolean isAdventureMode(EntityPlayer player) {
146154
return isAdventureMode_Client(player);
147155
}*/
148156
//return !player.worldObj.isRemote && ((EntityPlayerMP) player).theItemInWorldManager.getGameType().isAdventure();
149-
return !(player instanceof FakePlayer) && !player.worldObj.isRemote && ((EntityPlayerMP) player).theItemInWorldManager.getGameType() != GameType.CREATIVE /* && !player.canCommandSenderUseCommand(2, "cv")*/;
157+
return !(player instanceof FakePlayer) && !player.worldObj.isRemote && ((EntityPlayerMP) player).interactionManager.getGameType() != GameType.CREATIVE /* && !player.canCommandSenderUseCommand(2, "cv")*/;
150158
}
151159

152160
/*private boolean isAdventureMode_Client(EntityPlayer player) {
@@ -163,16 +171,9 @@ public void logEvent(Event e) {
163171
log.info(Thread.currentThread().getName() + ": " + e.toString());
164172
}*/
165173

166-
@SubscribeEvent
167-
public void onEntityRightclick(EntityInteractEvent event) {
168-
if(isAdventureMode(event.entityPlayer) && !config.mayRightclick(event.target)) {
169-
event.setCanceled(true);
170-
}
171-
}
172-
173174
@SubscribeEvent
174175
public void onEntityLeftclick(AttackEntityEvent event) {
175-
if(isAdventureMode(event.entityPlayer) && !config.mayLeftclick(event.target)) {
176+
if(isAdventureMode(event.getEntityPlayer()) && !config.mayLeftclick(event.getTarget())) {
176177
event.setCanceled(true);
177178
}
178179
}

Diff for: ‎src/main/java/vexatos/conventional/command/CommandAddBlock.java

+14-13
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
import net.minecraft.command.ICommandSender;
88
import net.minecraft.command.WrongUsageException;
99
import net.minecraft.entity.player.EntityPlayerMP;
10-
import net.minecraft.util.BlockPos;
11-
import net.minecraft.util.ChatComponentText;
12-
import net.minecraft.util.MovingObjectPosition;
13-
import net.minecraft.util.MovingObjectPosition.MovingObjectType;
10+
import net.minecraft.server.MinecraftServer;
11+
import net.minecraft.util.math.BlockPos;
12+
import net.minecraft.util.math.RayTraceResult;
13+
import net.minecraft.util.text.TextComponentString;
1414
import org.apache.commons.lang3.tuple.Pair;
1515
import vexatos.conventional.Conventional;
1616
import vexatos.conventional.reference.Config;
1717
import vexatos.conventional.util.RayTracer;
18+
import vexatos.conventional.util.RegistryUtil;
1819

1920
import java.util.List;
2021

@@ -28,7 +29,7 @@ public CommandAddBlock() {
2829
}
2930

3031
@Override
31-
public void processCommand(ICommandSender sender, String[] args) throws CommandException {
32+
public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
3233
if(!(sender instanceof EntityPlayerMP)) {
3334
throw new WrongUsageException("cannot process unless called from a player on the server side");
3435
}
@@ -40,14 +41,14 @@ public void processCommand(ICommandSender sender, String[] args) throws CommandE
4041
Conventional.config.blocksAllowLeftclick : Conventional.config.blocksAllowBreak;
4142
EntityPlayerMP player = (EntityPlayerMP) sender;
4243
RayTracer.instance().fire(player, 10);
43-
MovingObjectPosition mop = RayTracer.instance().getTarget();
44-
if(mop.typeOfHit != MovingObjectType.BLOCK) {
44+
RayTraceResult result = RayTracer.instance().getTarget();
45+
if(result.typeOfHit != RayTraceResult.Type.BLOCK) {
4546
throw new WrongUsageException("the player is not looking at any block");
4647
}
47-
IBlockState state = player.worldObj.getBlockState(mop.getBlockPos());
48+
IBlockState state = player.worldObj.getBlockState(result.getBlockPos());
4849
Block block = state.getBlock();
49-
if(!block.isAir(player.worldObj, mop.getBlockPos())) {
50-
String uid = block.getRegistryName();
50+
if(!block.isAir(state, player.worldObj, result.getBlockPos())) {
51+
final String uid = RegistryUtil.getRegistryName(block);
5152
if(uid == null) {
5253
throw new WrongUsageException("unable to find identifier for block: " + block.getUnlocalizedName());
5354
}
@@ -56,7 +57,7 @@ public void processCommand(ICommandSender sender, String[] args) throws CommandE
5657
throw new WrongUsageException("block is already in the whitelist.");
5758
}
5859
list.add(pair);
59-
sender.addChatMessage(new ChatComponentText(String.format("Block '%s' added!", uid)));
60+
sender.addChatMessage(new TextComponentString(String.format("Block '%s' added!", uid)));
6061
Conventional.config.save();
6162
}
6263
}
@@ -67,12 +68,12 @@ public String getUsage(ICommandSender sender) {
6768
}
6869

6970
@Override
70-
public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
71+
public List<String> getTabCompletionOptions(MinecraftServer server, ICommandSender sender, String[] args, BlockPos pos) {
7172
if(args.length <= 1) {
7273
return CommandBase.getListOfStringsMatchingLastWord(args, "left", "right", "break");
7374
} else if(args.length == 2) {
7475
return CommandBase.getListOfStringsMatchingLastWord(args, "ignore");
7576
}
76-
return super.addTabCompletionOptions(sender, args, pos);
77+
return super.getTabCompletionOptions(server, sender, args, pos);
7778
}
7879
}

Diff for: ‎src/main/java/vexatos/conventional/command/CommandAddEntity.java

+11-10
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
import net.minecraft.command.WrongUsageException;
77
import net.minecraft.entity.Entity;
88
import net.minecraft.entity.player.EntityPlayerMP;
9-
import net.minecraft.util.BlockPos;
10-
import net.minecraft.util.ChatComponentText;
11-
import net.minecraft.util.MovingObjectPosition;
9+
import net.minecraft.server.MinecraftServer;
10+
import net.minecraft.util.math.BlockPos;
11+
import net.minecraft.util.math.RayTraceResult;
12+
import net.minecraft.util.text.TextComponentString;
1213
import vexatos.conventional.Conventional;
1314
import vexatos.conventional.reference.Config;
1415
import vexatos.conventional.util.RayTracer;
@@ -30,7 +31,7 @@ public String getUsage(ICommandSender sender) {
3031
}
3132

3233
@Override
33-
public void processCommand(ICommandSender sender, String[] args) throws CommandException {
34+
public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
3435
if(!(sender instanceof EntityPlayerMP)) {
3536
throw new WrongUsageException("cannot process unless called from a player on the server side");
3637
}
@@ -40,27 +41,27 @@ public void processCommand(ICommandSender sender, String[] args) throws CommandE
4041
Config.EntityList list = args[0].equalsIgnoreCase("right") ? Conventional.config.entitiesAllowRightclick : Conventional.config.entitiesAllowLeftclick;
4142
EntityPlayerMP player = (EntityPlayerMP) sender;
4243
RayTracer.instance().fire(player, 10);
43-
MovingObjectPosition mop = RayTracer.instance().getTarget();
44-
if(mop.typeOfHit != MovingObjectPosition.MovingObjectType.ENTITY || mop.entityHit == null) {
44+
RayTraceResult result = RayTracer.instance().getTarget();
45+
if(result.typeOfHit != RayTraceResult.Type.ENTITY || result.entityHit == null) {
4546
throw new WrongUsageException("the player is not looking at any entity");
4647
}
47-
Entity entity = mop.entityHit;
48+
Entity entity = result.entityHit;
4849
if(!entity.isDead) {
4950
String name = entity.getClass().getCanonicalName();
5051
if(list.contains(name)) {
5152
throw new WrongUsageException("entity is already in the whitelist.");
5253
}
5354
list.add(name);
54-
sender.addChatMessage(new ChatComponentText(String.format("Entity '%s' added!", name)));
55+
sender.addChatMessage(new TextComponentString(String.format("Entity '%s' added!", name)));
5556
Conventional.config.save();
5657
}
5758
}
5859

5960
@Override
60-
public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
61+
public List<String> getTabCompletionOptions(MinecraftServer server, ICommandSender sender, String[] args, BlockPos pos) {
6162
if(args.length <= 1) {
6263
return CommandBase.getListOfStringsMatchingLastWord(args, "left", "right");
6364
}
64-
return super.addTabCompletionOptions(sender, args, pos);
65+
return super.getTabCompletionOptions(server, sender, args, pos);
6566
}
6667
}

Diff for: ‎src/main/java/vexatos/conventional/command/CommandAddItem.java

+11-8
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77
import net.minecraft.entity.player.EntityPlayerMP;
88
import net.minecraft.item.Item;
99
import net.minecraft.item.ItemStack;
10-
import net.minecraft.util.BlockPos;
11-
import net.minecraft.util.ChatComponentText;
10+
import net.minecraft.server.MinecraftServer;
11+
import net.minecraft.util.EnumHand;
12+
import net.minecraft.util.math.BlockPos;
13+
import net.minecraft.util.text.TextComponentString;
1214
import org.apache.commons.lang3.tuple.Pair;
1315
import vexatos.conventional.Conventional;
1416
import vexatos.conventional.reference.Config;
17+
import vexatos.conventional.util.RegistryUtil;
1518

1619
import java.util.List;
1720

@@ -25,15 +28,15 @@ public CommandAddItem() {
2528
}
2629

2730
@Override
28-
public void processCommand(ICommandSender sender, String[] args) throws CommandException {
31+
public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
2932
if(!(sender instanceof EntityPlayerMP)) {
3033
throw new WrongUsageException("cannot process unless called from a player on the server side");
3134
}
3235
Config.ItemList list = Conventional.config.itemsAllowRightclick;
3336
EntityPlayerMP player = (EntityPlayerMP) sender;
34-
ItemStack stack = player.getHeldItem();
37+
ItemStack stack = player.getHeldItem(EnumHand.MAIN_HAND);
3538
if(stack != null && stack.getItem() != null) {
36-
String uid = stack.getItem().getRegistryName();
39+
final String uid = RegistryUtil.getRegistryName(stack.getItem());
3740
if(uid == null) {
3841
throw new WrongUsageException("unable to find identifier for item: " + stack.getUnlocalizedName());
3942
}
@@ -42,7 +45,7 @@ public void processCommand(ICommandSender sender, String[] args) throws CommandE
4245
throw new WrongUsageException("item is already in the whitelist.");
4346
}
4447
list.add(pair);
45-
sender.addChatMessage(new ChatComponentText(String.format("Item '%s' added!", uid)));
48+
sender.addChatMessage(new TextComponentString(String.format("Item '%s' added!", uid)));
4649
Conventional.config.save();
4750
}
4851
}
@@ -53,10 +56,10 @@ public String getUsage(ICommandSender sender) {
5356
}
5457

5558
@Override
56-
public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
59+
public List<String> getTabCompletionOptions(MinecraftServer server, ICommandSender sender, String[] args, BlockPos pos) {
5760
if(args.length <= 1) {
5861
return CommandBase.getListOfStringsMatchingLastWord(args, "ignore");
5962
}
60-
return super.addTabCompletionOptions(sender, args, pos);
63+
return super.getTabCompletionOptions(server, sender, args, pos);
6164
}
6265
}

Diff for: ‎src/main/java/vexatos/conventional/command/CommandList.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import net.minecraft.command.CommandException;
66
import net.minecraft.command.ICommandSender;
77
import net.minecraft.command.WrongUsageException;
8-
import net.minecraft.util.BlockPos;
9-
import net.minecraft.util.ChatComponentText;
8+
import net.minecraft.server.MinecraftServer;
9+
import net.minecraft.util.math.BlockPos;
10+
import net.minecraft.util.text.TextComponentString;
1011
import vexatos.conventional.Conventional;
1112
import vexatos.conventional.reference.Config;
1213

@@ -32,7 +33,7 @@ public String getUsage(ICommandSender sender) {
3233
}
3334

3435
@Override
35-
public void processCommand(ICommandSender sender, String[] args) throws CommandException {
36+
public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
3637
if(args.length < 1 || (!args[0].equalsIgnoreCase("block") && !args[0].equalsIgnoreCase("item") && !args[0].equalsIgnoreCase("entity"))) {
3738
throw new WrongUsageException("second argument needs to be 'block' or 'item' or 'entity'.");
3839
}
@@ -57,23 +58,23 @@ public void processCommand(ICommandSender sender, String[] args) throws CommandE
5758
Config.ItemList list = Conventional.config.itemsAllowRightclick;
5859
uids = Conventional.config.getUIDs(list);
5960
}
60-
sender.addChatMessage(new ChatComponentText("Entries in the list:"));
61+
sender.addChatMessage(new TextComponentString("Entries in the list:"));
6162
Arrays.sort(uids, String.CASE_INSENSITIVE_ORDER);
6263
ArrayList<String> line = new ArrayList<String>(5);
6364
for(String uid : uids) {
6465
line.add(uid);
6566
if(line.size() >= 5) {
66-
sender.addChatMessage(new ChatComponentText(joiner.join(line)));
67+
sender.addChatMessage(new TextComponentString(joiner.join(line)));
6768
line.clear();
6869
}
6970
}
7071
if(!line.isEmpty()) {
71-
sender.addChatMessage(new ChatComponentText(joiner.join(line)));
72+
sender.addChatMessage(new TextComponentString(joiner.join(line)));
7273
}
7374
}
7475

7576
@Override
76-
public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
77+
public List<String> getTabCompletionOptions(MinecraftServer server, ICommandSender sender, String[] args, BlockPos pos) {
7778
if(args.length <= 1) {
7879
return CommandBase.getListOfStringsMatchingLastWord(args, "block", "item", "entity");
7980
} else if(args.length == 2) {
@@ -83,6 +84,6 @@ public List<String> addTabCompletionOptions(ICommandSender sender, String[] args
8384
return CommandBase.getListOfStringsMatchingLastWord(args, "left", "right");
8485
}
8586
}
86-
return super.addTabCompletionOptions(sender, args, pos);
87+
return super.getTabCompletionOptions(server, sender, args, pos);
8788
}
8889
}

Diff for: ‎src/main/java/vexatos/conventional/command/CommandReload.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
import net.minecraft.command.CommandException;
44
import net.minecraft.command.ICommandSender;
5-
import net.minecraft.util.ChatComponentText;
5+
import net.minecraft.server.MinecraftServer;
6+
import net.minecraft.util.text.TextComponentString;
67
import vexatos.conventional.Conventional;
78

89
/**
@@ -20,9 +21,9 @@ public String getUsage(ICommandSender sender) {
2021
}
2122

2223
@Override
23-
public void processCommand(ICommandSender sender, String[] args) throws CommandException {
24+
public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
2425
Conventional.config.reload();
2526
Conventional.config.save();
26-
sender.addChatMessage(new ChatComponentText("Whitelists reloaded!"));
27+
sender.addChatMessage(new TextComponentString("Whitelists reloaded!"));
2728
}
2829
}

0 commit comments

Comments
 (0)
Please sign in to comment.