mirror of
https://github.com/GTNewHorizons/CraftTweaker.git
synced 2026-11-22 04:52:21 +00:00
- Added /mt blocks and /mt entities commands
- Further preparation of event manager for the event update - Can now request all blocks and entities using the global game variable - Improved automatic handling of version numbers
This commit is contained in:
1 parent
b50a88227b
commit
56b8c9355c
81 files changed
+751
-506
No files matched your search
@@ -11,11 +11,10 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
import static minetweaker.MineTweakerAPI.server;
|
||||
import minetweaker.api.block.IBlock;
|
||||
import minetweaker.api.block.IBlockDefinition;
|
||||
import minetweaker.api.data.IData;
|
||||
import minetweaker.api.entity.IEntityDefinition;
|
||||
import minetweaker.api.event.IEventHandle;
|
||||
import minetweaker.api.event.IPlayerInteractEventHandler;
|
||||
import minetweaker.api.event.IPlayerLoggedInEventHandler;
|
||||
import minetweaker.api.event.IPlayerLoggedOutEventHandler;
|
||||
import minetweaker.api.event.MTEventManager;
|
||||
import minetweaker.api.event.PlayerInteractEvent;
|
||||
import minetweaker.api.event.PlayerLoggedInEvent;
|
||||
@@ -53,6 +52,9 @@ public class MineTweakerImplementationAPI {
|
||||
|
||||
private static final Comparator<IItemDefinition> ITEM_COMPARATOR = new ItemComparator();
|
||||
private static final Comparator<ILiquidDefinition> LIQUID_COMPARATOR = new LiquidComparator();
|
||||
private static final Comparator<IBlockDefinition> BLOCK_COMPARATOR = new BlockComparator();
|
||||
private static final Comparator<IEntityDefinition> ENTITY_COMPARATOR = new EntityComparator();
|
||||
|
||||
private static final ListenPlayerLoggedIn LISTEN_LOGIN = new ListenPlayerLoggedIn();
|
||||
private static final ListenPlayerLoggedOut LISTEN_LOGOUT = new ListenPlayerLoggedOut();
|
||||
private static final ListenBlockInfo LISTEN_BLOCK_INFO = new ListenBlockInfo();
|
||||
@@ -85,7 +87,7 @@ public class MineTweakerImplementationAPI {
|
||||
List<IItemDefinition> items = MineTweakerAPI.game.getItems();
|
||||
Collections.sort(items, ITEM_COMPARATOR);
|
||||
for (IItemDefinition item : items) {
|
||||
String displayName = "";
|
||||
String displayName;
|
||||
|
||||
try {
|
||||
displayName = " -- " + item.makeStack(0).getDisplayName();
|
||||
@@ -114,10 +116,10 @@ public class MineTweakerImplementationAPI {
|
||||
@Override
|
||||
public void execute(String[] arguments, IPlayer player) {
|
||||
List<ILiquidDefinition> liquids = MineTweakerAPI.game.getLiquids();
|
||||
System.out.println("Liquids: " + liquids.size());
|
||||
Collections.sort(liquids, LIQUID_COMPARATOR);
|
||||
|
||||
MineTweakerAPI.logCommand("Liquids:");
|
||||
for (ILiquidDefinition liquid : liquids) {
|
||||
System.out.println("Liquid " + liquid.getName());
|
||||
MineTweakerAPI.logCommand("<" + liquid.getName() + "> -- " + liquid.getDisplayName());
|
||||
}
|
||||
|
||||
@@ -127,6 +129,50 @@ public class MineTweakerImplementationAPI {
|
||||
}
|
||||
}));
|
||||
|
||||
minetweakerCommands.put("blocks", new MineTweakerCommand(
|
||||
"blocks",
|
||||
new String[] {
|
||||
"/minetweaker blocks",
|
||||
" Outputs a list of all blocks in the game to the minetweaker log"
|
||||
}, new ICommandFunction() {
|
||||
@Override
|
||||
public void execute(String[] arguments, IPlayer player) {
|
||||
List<IBlockDefinition> blocks = MineTweakerAPI.game.getBlocks();
|
||||
Collections.sort(blocks, BLOCK_COMPARATOR);
|
||||
|
||||
MineTweakerAPI.logCommand("Blocks:");
|
||||
for (IBlockDefinition block : blocks) {
|
||||
MineTweakerAPI.logCommand("<block:" + block.getId() + "> -- " + block.getDisplayName());
|
||||
}
|
||||
|
||||
if (player != null) {
|
||||
player.sendChat("List generated; see minetweaker.log in your minecraft dir");
|
||||
}
|
||||
}
|
||||
}));
|
||||
|
||||
minetweakerCommands.put("entities", new MineTweakerCommand(
|
||||
"entities",
|
||||
new String[] {
|
||||
"/minetweaker entities",
|
||||
" Outputs a list of all entity definitions in the game to the minetweaker log"
|
||||
}, new ICommandFunction() {
|
||||
@Override
|
||||
public void execute(String[] arguments, IPlayer player) {
|
||||
List<IEntityDefinition> entities = MineTweakerAPI.game.getEntities();
|
||||
Collections.sort(entities, ENTITY_COMPARATOR);
|
||||
|
||||
MineTweakerAPI.logCommand("Entities:");
|
||||
for (IEntityDefinition entity : entities) {
|
||||
MineTweakerAPI.logCommand(entity.getId() + " -- " + entity.getName());
|
||||
}
|
||||
|
||||
if (player != null) {
|
||||
player.sendChat("List generated; see minetweaker.log in your minecraft dir");
|
||||
}
|
||||
}
|
||||
}));
|
||||
|
||||
minetweakerCommands.put("inventory", new MineTweakerCommand(
|
||||
"inventory",
|
||||
new String[] {
|
||||
@@ -546,7 +592,21 @@ public class MineTweakerImplementationAPI {
|
||||
}
|
||||
}
|
||||
|
||||
private static class ListenPlayerLoggedIn implements IPlayerLoggedInEventHandler {
|
||||
private static class BlockComparator implements Comparator<IBlockDefinition> {
|
||||
@Override
|
||||
public int compare(IBlockDefinition o1, IBlockDefinition o2) {
|
||||
return o1.getId().compareTo(o2.getId());
|
||||
}
|
||||
}
|
||||
|
||||
private static class EntityComparator implements Comparator<IEntityDefinition> {
|
||||
@Override
|
||||
public int compare(IEntityDefinition o1, IEntityDefinition o2) {
|
||||
return o1.getId().compareTo(o2.getId());
|
||||
}
|
||||
}
|
||||
|
||||
private static class ListenPlayerLoggedIn implements IEventHandler<PlayerLoggedInEvent> {
|
||||
@Override
|
||||
public void handle(PlayerLoggedInEvent event) {
|
||||
if (MineTweakerAPI.server != null && MineTweakerAPI.server.isOp(event.getPlayer())) {
|
||||
@@ -555,14 +615,14 @@ public class MineTweakerImplementationAPI {
|
||||
}
|
||||
}
|
||||
|
||||
private static class ListenPlayerLoggedOut implements IPlayerLoggedOutEventHandler {
|
||||
private static class ListenPlayerLoggedOut implements IEventHandler<PlayerLoggedOutEvent> {
|
||||
@Override
|
||||
public void handle(PlayerLoggedOutEvent event) {
|
||||
logger.removePlayer(event.getPlayer());
|
||||
}
|
||||
}
|
||||
|
||||
private static class ListenBlockInfo implements IPlayerInteractEventHandler {
|
||||
private static class ListenBlockInfo implements IEventHandler<PlayerInteractEvent> {
|
||||
@Override
|
||||
public void handle(PlayerInteractEvent event) {
|
||||
if (blockInfoPlayers.contains(event.getPlayer())) {
|
||||
|
||||
@@ -12,4 +12,7 @@ import stanhebben.zenscript.annotations.ZenGetter;
|
||||
public interface IBlockDefinition {
|
||||
@ZenGetter("id")
|
||||
public String getId();
|
||||
|
||||
@ZenGetter("displayName")
|
||||
public String getDisplayName();
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.entity;
|
||||
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
import stanhebben.zenscript.annotations.ZenGetter;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan Hebben
|
||||
*/
|
||||
@ZenClass("minetweaker.entity.IEntityDefinition")
|
||||
public interface IEntityDefinition {
|
||||
@ZenGetter("id")
|
||||
public String getId();
|
||||
|
||||
@ZenGetter("name")
|
||||
public String getName();
|
||||
}
|
||||
@@ -1,48 +1,54 @@
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
|
||||
/**
|
||||
* 37 kinds of event handlers!
|
||||
*
|
||||
* NOTE: not all of these are implemented yet, but will be later on.
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
public interface IEventManager {
|
||||
public IEventHandle onPlayerCrafted(IPlayerCraftedEventHandler ev);
|
||||
// implemented
|
||||
public IEventHandle onPlayerCrafted(IEventHandler<PlayerCraftedEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerSmelted(IPlayerSmeltedEventHandler ev);
|
||||
// implemented
|
||||
public IEventHandle onPlayerSmelted(IEventHandler<PlayerSmeltedEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerChangedDimension(IPlayerChangedDimensionEventHandler ev);
|
||||
public IEventHandle onPlayerChangedDimension(IEventHandler<PlayerChangedDimensionEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerRespawn(IPlayerRespawnEventHandler ev);
|
||||
public IEventHandle onPlayerRespawn(IEventHandler<PlayerRespawnEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerAttackEntity(IPlayerAttackEntityEventHandler ev);
|
||||
public IEventHandle onPlayerAttackEntity(IEventHandler<PlayerAttackEntityEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerBonemeal(IPlayerBonemealEventHandler ev);
|
||||
public IEventHandle onPlayerBonemeal(IEventHandler<PlayerBonemealEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerInteractEntity(IPlayerInteractEntityEventHandler ev);
|
||||
public IEventHandle onPlayerInteractEntity(IEventHandler<PlayerInteractEntityEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerPickup(IPlayerPickupEventHandler ev);
|
||||
public IEventHandle onPlayerPickup(IEventHandler<PlayerPickupEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerPickupItem(IPlayerPickupItemEventHandler ev);
|
||||
public IEventHandle onPlayerPickupItem(IEventHandler<PlayerPickupItemEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerFillBucket(IPlayerFillBucketEventHandler ev);
|
||||
public IEventHandle onPlayerFillBucket(IEventHandler<PlayerFillBucketEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerDeathDrops(IPlayerDeathDropsEventHandler ev);
|
||||
public IEventHandle onPlayerDeathDrops(IEventHandler<PlayerDeathDropsEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerInteract(IPlayerInteractEventHandler ev);
|
||||
public IEventHandle onPlayerInteract(IEventHandler<PlayerInteractEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerOpenContainer(IPlayerOpenContainerEventHandler ev);
|
||||
public IEventHandle onPlayerOpenContainer(IEventHandler<PlayerOpenContainerEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerPickupXp(IPlayerPickupXpEventHandler ev);
|
||||
public IEventHandle onPlayerPickupXp(IEventHandler<PlayerPickupXpEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerSleepInBed(IPlayerSleepInBedEventHandler ev);
|
||||
public IEventHandle onPlayerSleepInBed(IEventHandler<PlayerSleepInBedEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerUseHoe(IPlayerUseHoeEventHandler ev);
|
||||
public IEventHandle onPlayerUseHoe(IEventHandler<PlayerUseHoeEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerUseItemStart(IPlayerUseItemStartEventHandler ev);
|
||||
public IEventHandle onPlayerUseItemStart(IEventHandler<PlayerUseItemStartEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerUseItemTick(IPlayerUseItemTickEventHandler ev);
|
||||
public IEventHandle onPlayerUseItemTick(IEventHandler<PlayerUseItemTickEvent> ev);
|
||||
|
||||
/*public IEventHandle onPlayerUseItemStop(IPlayerUseItemStopEventHandler ev);
|
||||
/*public IEventHandle onPlayerUseItemStop(IEventHandler<PlayerUseItemStopEvent> ev);
|
||||
|
||||
public IEventHandle onPlayerUseItemFinish(IPlayerUserItemFinishEventHandler ev);
|
||||
|
||||
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerAttackEntityEventHandler")
|
||||
public interface IPlayerAttackEntityEventHandler extends IEventHandler<PlayerAttackEntityEvent> {
|
||||
@Override
|
||||
public void handle(PlayerAttackEntityEvent event);
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerBonemealEventHandler")
|
||||
public interface IPlayerBonemealEventHandler extends IEventHandler<PlayerBonemealEvent> {
|
||||
@Override
|
||||
public void handle(PlayerBonemealEvent event);
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerChangedDimensionEventHandler")
|
||||
public interface IPlayerChangedDimensionEventHandler extends IEventHandler<PlayerChangedDimensionEvent> {
|
||||
@Override
|
||||
public void handle(PlayerChangedDimensionEvent event);
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerCraftedEventHandler")
|
||||
public interface IPlayerCraftedEventHandler extends IEventHandler<PlayerCraftedEvent> {
|
||||
@Override
|
||||
public void handle(PlayerCraftedEvent ev);
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerDeathDropsEventHandler")
|
||||
public interface IPlayerDeathDropsEventHandler extends IEventHandler<PlayerDeathDropsEvent> {
|
||||
@Override
|
||||
public void handle(PlayerDeathDropsEvent event);
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerFillBucketEventHandler")
|
||||
public interface IPlayerFillBucketEventHandler extends IEventHandler<PlayerFillBucketEvent> {
|
||||
@Override
|
||||
public void handle(PlayerFillBucketEvent event);
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerInteractEntityEventHandler")
|
||||
public interface IPlayerInteractEntityEventHandler extends IEventHandler<PlayerInteractEntityEvent> {
|
||||
@Override
|
||||
public void handle(PlayerInteractEntityEvent event);
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerInteractEventHandler")
|
||||
public interface IPlayerInteractEventHandler extends IEventHandler<PlayerInteractEvent> {
|
||||
@Override
|
||||
public void handle(PlayerInteractEvent event);
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerLoggedInEventHandler")
|
||||
public interface IPlayerLoggedInEventHandler extends IEventHandler<PlayerLoggedInEvent> {
|
||||
@Override
|
||||
public void handle(PlayerLoggedInEvent event);
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerLoggedOutEventHandler")
|
||||
public interface IPlayerLoggedOutEventHandler extends IEventHandler<PlayerLoggedOutEvent> {
|
||||
@Override
|
||||
public void handle(PlayerLoggedOutEvent event);
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerOpenContainerEventHandler")
|
||||
public interface IPlayerOpenContainerEventHandler extends IEventHandler<PlayerOpenContainerEvent> {
|
||||
@Override
|
||||
public void handle(PlayerOpenContainerEvent event);
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerPickupEventHandler")
|
||||
public interface IPlayerPickupEventHandler extends IEventHandler<PlayerPickupEvent> {
|
||||
@Override
|
||||
public void handle(PlayerPickupEvent event);
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerPickupItemEventHandler")
|
||||
public interface IPlayerPickupItemEventHandler extends IEventHandler<PlayerPickupItemEvent> {
|
||||
@Override
|
||||
public void handle(PlayerPickupItemEvent event);
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerPickupXpEventHandler")
|
||||
public interface IPlayerPickupXpEventHandler extends IEventHandler<PlayerPickupXpEvent> {
|
||||
@Override
|
||||
public void handle(PlayerPickupXpEvent event);
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerRespawnEventHandler")
|
||||
public interface IPlayerRespawnEventHandler extends IEventHandler<PlayerRespawnEvent> {
|
||||
@Override
|
||||
public void handle(PlayerRespawnEvent event);
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerSleepInBedEventHandler")
|
||||
public interface IPlayerSleepInBedEventHandler extends IEventHandler<PlayerSleepInBedEvent> {
|
||||
@Override
|
||||
public void handle(PlayerSleepInBedEvent event);
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerSmeltedEventHandler")
|
||||
public interface IPlayerSmeltedEventHandler extends IEventHandler<PlayerSmeltedEvent> {
|
||||
@Override
|
||||
public void handle(PlayerSmeltedEvent event);
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerUseHoeEventHandler")
|
||||
public interface IPlayerUseHoeEventHandler extends IEventHandler<PlayerUseHoeEvent> {
|
||||
@Override
|
||||
public void handle(PlayerUseHoeEvent event);
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerUseItemStartEventHandler")
|
||||
public interface IPlayerUseItemStartEventHandler extends IEventHandler<PlayerUseItemStartEvent> {
|
||||
@Override
|
||||
public void handle(PlayerUseItemStartEvent event);
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.event.IPlayerUseItemTickEventHandler")
|
||||
public interface IPlayerUseItemTickEventHandler extends IEventHandler<PlayerUseItemTickEvent> {
|
||||
@Override
|
||||
public void handle(PlayerUseItemTickEvent event);
|
||||
}
|
||||
@@ -7,6 +7,7 @@
|
||||
package minetweaker.api.event;
|
||||
|
||||
import minetweaker.util.EventList;
|
||||
import minetweaker.util.IEventHandler;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -43,7 +44,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerCraftedEvent> elPlayerCrafted = new EventList<PlayerCraftedEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerCrafted(IPlayerCraftedEventHandler ev) {
|
||||
public IEventHandle onPlayerCrafted(IEventHandler<PlayerCraftedEvent> ev) {
|
||||
return elPlayerCrafted.add(ev);
|
||||
}
|
||||
|
||||
@@ -62,7 +63,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerSmeltedEvent> elPlayerSmelted = new EventList<PlayerSmeltedEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerSmelted(IPlayerSmeltedEventHandler ev) {
|
||||
public IEventHandle onPlayerSmelted(IEventHandler<PlayerSmeltedEvent> ev) {
|
||||
return elPlayerSmelted.add(ev);
|
||||
}
|
||||
|
||||
@@ -81,7 +82,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerChangedDimensionEvent> elPlayerChangedDimension = new EventList<PlayerChangedDimensionEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerChangedDimension(IPlayerChangedDimensionEventHandler ev) {
|
||||
public IEventHandle onPlayerChangedDimension(IEventHandler<PlayerChangedDimensionEvent> ev) {
|
||||
return elPlayerChangedDimension.add(ev);
|
||||
}
|
||||
|
||||
@@ -99,7 +100,7 @@ public class MTEventManager implements IEventManager {
|
||||
|
||||
private final EventList<PlayerLoggedInEvent> elPlayerLoggedIn = new EventList<PlayerLoggedInEvent>();
|
||||
|
||||
public IEventHandle onPlayerLoggedIn(IPlayerLoggedInEventHandler ev) {
|
||||
public IEventHandle onPlayerLoggedIn(IEventHandler<PlayerLoggedInEvent> ev) {
|
||||
return elPlayerLoggedIn.add(ev);
|
||||
}
|
||||
|
||||
@@ -117,7 +118,7 @@ public class MTEventManager implements IEventManager {
|
||||
|
||||
private final EventList<PlayerLoggedOutEvent> elPlayerLoggedOut = new EventList<PlayerLoggedOutEvent>();
|
||||
|
||||
public IEventHandle onPlayerLoggedOut(IPlayerLoggedOutEventHandler ev) {
|
||||
public IEventHandle onPlayerLoggedOut(IEventHandler<PlayerLoggedOutEvent> ev) {
|
||||
return elPlayerLoggedOut.add(ev);
|
||||
}
|
||||
|
||||
@@ -136,7 +137,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerRespawnEvent> elPlayerRespawn = new EventList<PlayerRespawnEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerRespawn(IPlayerRespawnEventHandler ev) {
|
||||
public IEventHandle onPlayerRespawn(IEventHandler<PlayerRespawnEvent> ev) {
|
||||
return elPlayerRespawn.add(ev);
|
||||
}
|
||||
|
||||
@@ -155,7 +156,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerAttackEntityEvent> elPlayerAttackEntity = new EventList<PlayerAttackEntityEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerAttackEntity(IPlayerAttackEntityEventHandler ev) {
|
||||
public IEventHandle onPlayerAttackEntity(IEventHandler<PlayerAttackEntityEvent> ev) {
|
||||
return elPlayerAttackEntity.add(ev);
|
||||
}
|
||||
|
||||
@@ -174,7 +175,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerBonemealEvent> elPlayerBonemeal = new EventList<PlayerBonemealEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerBonemeal(IPlayerBonemealEventHandler ev) {
|
||||
public IEventHandle onPlayerBonemeal(IEventHandler<PlayerBonemealEvent> ev) {
|
||||
return elPlayerBonemeal.add(ev);
|
||||
}
|
||||
|
||||
@@ -193,7 +194,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerInteractEntityEvent> elPlayerInteractEntity = new EventList<PlayerInteractEntityEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerInteractEntity(IPlayerInteractEntityEventHandler ev) {
|
||||
public IEventHandle onPlayerInteractEntity(IEventHandler<PlayerInteractEntityEvent> ev) {
|
||||
return elPlayerInteractEntity.add(ev);
|
||||
}
|
||||
|
||||
@@ -212,7 +213,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerPickupEvent> elPlayerPickup = new EventList<PlayerPickupEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerPickup(IPlayerPickupEventHandler ev) {
|
||||
public IEventHandle onPlayerPickup(IEventHandler<PlayerPickupEvent> ev) {
|
||||
return elPlayerPickup.add(ev);
|
||||
}
|
||||
|
||||
@@ -231,7 +232,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerPickupItemEvent> elPlayerPickupItem = new EventList<PlayerPickupItemEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerPickupItem(IPlayerPickupItemEventHandler ev) {
|
||||
public IEventHandle onPlayerPickupItem(IEventHandler<PlayerPickupItemEvent> ev) {
|
||||
return elPlayerPickupItem.add(ev);
|
||||
}
|
||||
|
||||
@@ -250,7 +251,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerFillBucketEvent> elPlayerFillBucket = new EventList<PlayerFillBucketEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerFillBucket(IPlayerFillBucketEventHandler ev) {
|
||||
public IEventHandle onPlayerFillBucket(IEventHandler<PlayerFillBucketEvent> ev) {
|
||||
return elPlayerFillBucket.add(ev);
|
||||
}
|
||||
|
||||
@@ -269,7 +270,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerDeathDropsEvent> elPlayerDeathDrops = new EventList<PlayerDeathDropsEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerDeathDrops(IPlayerDeathDropsEventHandler ev) {
|
||||
public IEventHandle onPlayerDeathDrops(IEventHandler<PlayerDeathDropsEvent> ev) {
|
||||
return elPlayerDeathDrops.add(ev);
|
||||
}
|
||||
|
||||
@@ -288,7 +289,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerInteractEvent> elPlayerInteract = new EventList<PlayerInteractEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerInteract(IPlayerInteractEventHandler ev) {
|
||||
public IEventHandle onPlayerInteract(IEventHandler<PlayerInteractEvent> ev) {
|
||||
return elPlayerInteract.add(ev);
|
||||
}
|
||||
|
||||
@@ -307,7 +308,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerOpenContainerEvent> elPlayerOpenContainer = new EventList<PlayerOpenContainerEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerOpenContainer(IPlayerOpenContainerEventHandler ev) {
|
||||
public IEventHandle onPlayerOpenContainer(IEventHandler<PlayerOpenContainerEvent> ev) {
|
||||
return elPlayerOpenContainer.add(ev);
|
||||
}
|
||||
|
||||
@@ -326,7 +327,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerPickupXpEvent> elPlayerPickupXp = new EventList<PlayerPickupXpEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerPickupXp(IPlayerPickupXpEventHandler ev) {
|
||||
public IEventHandle onPlayerPickupXp(IEventHandler<PlayerPickupXpEvent> ev) {
|
||||
return elPlayerPickupXp.add(ev);
|
||||
}
|
||||
|
||||
@@ -345,7 +346,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerSleepInBedEvent> elPlayerSleepInBed = new EventList<PlayerSleepInBedEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerSleepInBed(IPlayerSleepInBedEventHandler ev) {
|
||||
public IEventHandle onPlayerSleepInBed(IEventHandler<PlayerSleepInBedEvent> ev) {
|
||||
return elPlayerSleepInBed.add(ev);
|
||||
}
|
||||
|
||||
@@ -364,7 +365,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerUseHoeEvent> elPlayerUseHoe = new EventList<PlayerUseHoeEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerUseHoe(IPlayerUseHoeEventHandler ev) {
|
||||
public IEventHandle onPlayerUseHoe(IEventHandler<PlayerUseHoeEvent> ev) {
|
||||
return elPlayerUseHoe.add(ev);
|
||||
}
|
||||
|
||||
@@ -383,7 +384,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerUseItemStartEvent> elPlayerUseItemStart = new EventList<PlayerUseItemStartEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerUseItemStart(IPlayerUseItemStartEventHandler ev) {
|
||||
public IEventHandle onPlayerUseItemStart(IEventHandler<PlayerUseItemStartEvent> ev) {
|
||||
return elPlayerUseItemStart.add(ev);
|
||||
}
|
||||
|
||||
@@ -402,7 +403,7 @@ public class MTEventManager implements IEventManager {
|
||||
private final EventList<PlayerUseItemTickEvent> elPlayerUseItemTick = new EventList<PlayerUseItemTickEvent>();
|
||||
|
||||
@Override
|
||||
public IEventHandle onPlayerUseItemTick(IPlayerUseItemTickEventHandler ev) {
|
||||
public IEventHandle onPlayerUseItemTick(IEventHandler<PlayerUseItemTickEvent> ev) {
|
||||
return elPlayerUseItemTick.add(ev);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package minetweaker.api.game;
|
||||
|
||||
import java.util.List;
|
||||
import minetweaker.api.block.IBlockDefinition;
|
||||
import minetweaker.api.entity.IEntityDefinition;
|
||||
import minetweaker.api.item.IItemDefinition;
|
||||
import minetweaker.api.liquid.ILiquidDefinition;
|
||||
import minetweaker.api.world.IBiome;
|
||||
@@ -15,13 +17,21 @@ import stanhebben.zenscript.annotations.ZenGetter;
|
||||
@ZenClass("minetweaker.game.IGame")
|
||||
public interface IGame {
|
||||
/**
|
||||
* Retrieves the items in this game.
|
||||
* Retrieves the item definitions in this game.
|
||||
*
|
||||
* @return game items
|
||||
*/
|
||||
@ZenGetter("items")
|
||||
public List<IItemDefinition> getItems();
|
||||
|
||||
/**
|
||||
* Retrieves the block definitions in this game.
|
||||
*
|
||||
* @return block definitions
|
||||
*/
|
||||
@ZenGetter("blocks")
|
||||
public List<IBlockDefinition> getBlocks();
|
||||
|
||||
/**
|
||||
* Retrieves the liquids in this game.
|
||||
*
|
||||
@@ -35,6 +45,14 @@ public interface IGame {
|
||||
*
|
||||
* @return game biomes
|
||||
*/
|
||||
@ZenGetter("Biomes")
|
||||
@ZenGetter("biomes")
|
||||
public List<IBiome> getBiomes();
|
||||
|
||||
/**
|
||||
* Retrieves the entities in this game.
|
||||
*
|
||||
* @return game entities
|
||||
*/
|
||||
@ZenGetter("entities")
|
||||
public List<IEntityDefinition> getEntities();
|
||||
}
|
||||
@@ -2,8 +2,9 @@ package minetweaker.api.server;
|
||||
|
||||
import minetweaker.MineTweakerImplementationAPI;
|
||||
import minetweaker.api.event.IEventHandle;
|
||||
import minetweaker.api.event.IPlayerLoggedInEventHandler;
|
||||
import minetweaker.api.event.IPlayerLoggedOutEventHandler;
|
||||
import minetweaker.api.event.PlayerLoggedInEvent;
|
||||
import minetweaker.api.event.PlayerLoggedOutEvent;
|
||||
import minetweaker.util.IEventHandler;
|
||||
|
||||
/**
|
||||
* Abstract server implementation. Implements call of which the implementation is
|
||||
@@ -18,12 +19,12 @@ public abstract class AbstractServer implements IServer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public final IEventHandle onPlayerLoggedIn(IPlayerLoggedInEventHandler ev) {
|
||||
public final IEventHandle onPlayerLoggedIn(IEventHandler<PlayerLoggedInEvent> ev) {
|
||||
return MineTweakerImplementationAPI.events.onPlayerLoggedIn(ev);
|
||||
}
|
||||
|
||||
@Override
|
||||
public final IEventHandle onPlayerLoggedOut(IPlayerLoggedOutEventHandler ev) {
|
||||
public final IEventHandle onPlayerLoggedOut(IEventHandler<PlayerLoggedOutEvent> ev) {
|
||||
return MineTweakerImplementationAPI.events.onPlayerLoggedOut(ev);
|
||||
}
|
||||
}
|
||||
@@ -7,9 +7,10 @@
|
||||
package minetweaker.api.server;
|
||||
|
||||
import minetweaker.api.event.IEventHandle;
|
||||
import minetweaker.api.event.IPlayerLoggedInEventHandler;
|
||||
import minetweaker.api.event.IPlayerLoggedOutEventHandler;
|
||||
import minetweaker.api.event.PlayerLoggedInEvent;
|
||||
import minetweaker.api.event.PlayerLoggedOutEvent;
|
||||
import minetweaker.api.player.IPlayer;
|
||||
import minetweaker.util.IEventHandler;
|
||||
import stanhebben.zenscript.annotations.Optional;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
import stanhebben.zenscript.annotations.ZenMethod;
|
||||
@@ -39,8 +40,8 @@ public interface IServer {
|
||||
public boolean isOp(IPlayer player);
|
||||
|
||||
@ZenMethod
|
||||
public IEventHandle onPlayerLoggedIn(IPlayerLoggedInEventHandler ev);
|
||||
public IEventHandle onPlayerLoggedIn(IEventHandler<PlayerLoggedInEvent> ev);
|
||||
|
||||
@ZenMethod
|
||||
public IEventHandle onPlayerLoggedOut(IPlayerLoggedOutEventHandler ev);
|
||||
public IEventHandle onPlayerLoggedOut(IEventHandler<PlayerLoggedOutEvent> ev);
|
||||
}
|
||||
@@ -250,8 +250,12 @@ public class GlobalRegistry {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void putValue(String name, IZenSymbol value) {
|
||||
symbols.put(name, value);
|
||||
public void putValue(String name, IZenSymbol value, ZenPosition position) {
|
||||
if (symbols.containsKey(name)) {
|
||||
error(position, "Value already defined in this scope: " + name);
|
||||
} else {
|
||||
symbols.put(name, value);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -36,7 +36,7 @@ import stanhebben.zenscript.parser.ParseException;
|
||||
* @author Stan Hebben
|
||||
*/
|
||||
public class MTTweaker implements ITweaker {
|
||||
private static final boolean DEBUG = true;
|
||||
private static final boolean DEBUG = false;
|
||||
|
||||
private final List<IUndoableAction> actions = new ArrayList<IUndoableAction>();
|
||||
private final Set<IUndoableAction> wereStuck = new LinkedHashSet<IUndoableAction>();
|
||||
|
||||
Reference in new issue
Block a user