diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java index 6c44241..b933b8f 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java @@ -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 ITEM_COMPARATOR = new ItemComparator(); private static final Comparator LIQUID_COMPARATOR = new LiquidComparator(); + private static final Comparator BLOCK_COMPARATOR = new BlockComparator(); + private static final Comparator 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 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 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 blocks = MineTweakerAPI.game.getBlocks(); + Collections.sort(blocks, BLOCK_COMPARATOR); + + MineTweakerAPI.logCommand("Blocks:"); + for (IBlockDefinition block : blocks) { + MineTweakerAPI.logCommand(" -- " + 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 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 { + @Override + public int compare(IBlockDefinition o1, IBlockDefinition o2) { + return o1.getId().compareTo(o2.getId()); + } + } + + private static class EntityComparator implements Comparator { + @Override + public int compare(IEntityDefinition o1, IEntityDefinition o2) { + return o1.getId().compareTo(o2.getId()); + } + } + + private static class ListenPlayerLoggedIn implements IEventHandler { @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 { @Override public void handle(PlayerLoggedOutEvent event) { logger.removePlayer(event.getPlayer()); } } - private static class ListenBlockInfo implements IPlayerInteractEventHandler { + private static class ListenBlockInfo implements IEventHandler { @Override public void handle(PlayerInteractEvent event) { if (blockInfoPlayers.contains(event.getPlayer())) { diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/block/IBlockDefinition.java b/MineTweaker3-API/src/main/java/minetweaker/api/block/IBlockDefinition.java index 6a76b01..f6fa0dc 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/block/IBlockDefinition.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/block/IBlockDefinition.java @@ -12,4 +12,7 @@ import stanhebben.zenscript.annotations.ZenGetter; public interface IBlockDefinition { @ZenGetter("id") public String getId(); + + @ZenGetter("displayName") + public String getDisplayName(); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntityDefinition.java b/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntityDefinition.java new file mode 100644 index 0000000..9bffc8b --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntityDefinition.java @@ -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(); +} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IEventManager.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IEventManager.java index 76cc6c4..fb1b655 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IEventManager.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/event/IEventManager.java @@ -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 ev); - public IEventHandle onPlayerSmelted(IPlayerSmeltedEventHandler ev); + // implemented + public IEventHandle onPlayerSmelted(IEventHandler ev); - public IEventHandle onPlayerChangedDimension(IPlayerChangedDimensionEventHandler ev); + public IEventHandle onPlayerChangedDimension(IEventHandler ev); - public IEventHandle onPlayerRespawn(IPlayerRespawnEventHandler ev); + public IEventHandle onPlayerRespawn(IEventHandler ev); - public IEventHandle onPlayerAttackEntity(IPlayerAttackEntityEventHandler ev); + public IEventHandle onPlayerAttackEntity(IEventHandler ev); - public IEventHandle onPlayerBonemeal(IPlayerBonemealEventHandler ev); + public IEventHandle onPlayerBonemeal(IEventHandler ev); - public IEventHandle onPlayerInteractEntity(IPlayerInteractEntityEventHandler ev); + public IEventHandle onPlayerInteractEntity(IEventHandler ev); - public IEventHandle onPlayerPickup(IPlayerPickupEventHandler ev); + public IEventHandle onPlayerPickup(IEventHandler ev); - public IEventHandle onPlayerPickupItem(IPlayerPickupItemEventHandler ev); + public IEventHandle onPlayerPickupItem(IEventHandler ev); - public IEventHandle onPlayerFillBucket(IPlayerFillBucketEventHandler ev); + public IEventHandle onPlayerFillBucket(IEventHandler ev); - public IEventHandle onPlayerDeathDrops(IPlayerDeathDropsEventHandler ev); + public IEventHandle onPlayerDeathDrops(IEventHandler ev); - public IEventHandle onPlayerInteract(IPlayerInteractEventHandler ev); + public IEventHandle onPlayerInteract(IEventHandler ev); - public IEventHandle onPlayerOpenContainer(IPlayerOpenContainerEventHandler ev); + public IEventHandle onPlayerOpenContainer(IEventHandler ev); - public IEventHandle onPlayerPickupXp(IPlayerPickupXpEventHandler ev); + public IEventHandle onPlayerPickupXp(IEventHandler ev); - public IEventHandle onPlayerSleepInBed(IPlayerSleepInBedEventHandler ev); + public IEventHandle onPlayerSleepInBed(IEventHandler ev); - public IEventHandle onPlayerUseHoe(IPlayerUseHoeEventHandler ev); + public IEventHandle onPlayerUseHoe(IEventHandler ev); - public IEventHandle onPlayerUseItemStart(IPlayerUseItemStartEventHandler ev); + public IEventHandle onPlayerUseItemStart(IEventHandler ev); - public IEventHandle onPlayerUseItemTick(IPlayerUseItemTickEventHandler ev); + public IEventHandle onPlayerUseItemTick(IEventHandler ev); - /*public IEventHandle onPlayerUseItemStop(IPlayerUseItemStopEventHandler ev); + /*public IEventHandle onPlayerUseItemStop(IEventHandler ev); public IEventHandle onPlayerUseItemFinish(IPlayerUserItemFinishEventHandler ev); diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerAttackEntityEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerAttackEntityEventHandler.java deleted file mode 100644 index b7ecc9e..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerAttackEntityEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerAttackEntityEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerBonemealEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerBonemealEventHandler.java deleted file mode 100644 index bdd85b8..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerBonemealEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerBonemealEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerChangedDimensionEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerChangedDimensionEventHandler.java deleted file mode 100644 index ac3f247..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerChangedDimensionEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerChangedDimensionEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerCraftedEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerCraftedEventHandler.java deleted file mode 100644 index 69bf511..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerCraftedEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerCraftedEvent ev); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerDeathDropsEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerDeathDropsEventHandler.java deleted file mode 100644 index 3b58de3..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerDeathDropsEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerDeathDropsEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerFillBucketEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerFillBucketEventHandler.java deleted file mode 100644 index 4db83e6..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerFillBucketEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerFillBucketEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerInteractEntityEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerInteractEntityEventHandler.java deleted file mode 100644 index b132ef2..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerInteractEntityEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerInteractEntityEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerInteractEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerInteractEventHandler.java deleted file mode 100644 index 437845d..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerInteractEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerInteractEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerLoggedInEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerLoggedInEventHandler.java deleted file mode 100644 index fdf2945..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerLoggedInEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerLoggedInEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerLoggedOutEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerLoggedOutEventHandler.java deleted file mode 100644 index 60268a2..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerLoggedOutEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerLoggedOutEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerOpenContainerEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerOpenContainerEventHandler.java deleted file mode 100644 index f5b6be7..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerOpenContainerEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerOpenContainerEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerPickupEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerPickupEventHandler.java deleted file mode 100644 index a3fa22c..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerPickupEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerPickupEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerPickupItemEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerPickupItemEventHandler.java deleted file mode 100644 index 4348f19..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerPickupItemEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerPickupItemEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerPickupXpEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerPickupXpEventHandler.java deleted file mode 100644 index b056453..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerPickupXpEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerPickupXpEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerRespawnEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerRespawnEventHandler.java deleted file mode 100644 index d51ec8d..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerRespawnEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerRespawnEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerSleepInBedEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerSleepInBedEventHandler.java deleted file mode 100644 index 9f300fb..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerSleepInBedEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerSleepInBedEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerSmeltedEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerSmeltedEventHandler.java deleted file mode 100644 index a3c81ef..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerSmeltedEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerSmeltedEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerUseHoeEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerUseHoeEventHandler.java deleted file mode 100644 index f9fd6d2..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerUseHoeEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerUseHoeEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerUseItemStartEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerUseItemStartEventHandler.java deleted file mode 100644 index 2986e8d..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerUseItemStartEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerUseItemStartEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerUseItemTickEventHandler.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerUseItemTickEventHandler.java deleted file mode 100644 index d294713..0000000 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IPlayerUseItemTickEventHandler.java +++ /dev/null @@ -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 { - @Override - public void handle(PlayerUseItemTickEvent event); -} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/MTEventManager.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/MTEventManager.java index fbcd88d..be35be0 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/MTEventManager.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/event/MTEventManager.java @@ -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 elPlayerCrafted = new EventList(); @Override - public IEventHandle onPlayerCrafted(IPlayerCraftedEventHandler ev) { + public IEventHandle onPlayerCrafted(IEventHandler ev) { return elPlayerCrafted.add(ev); } @@ -62,7 +63,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerSmelted = new EventList(); @Override - public IEventHandle onPlayerSmelted(IPlayerSmeltedEventHandler ev) { + public IEventHandle onPlayerSmelted(IEventHandler ev) { return elPlayerSmelted.add(ev); } @@ -81,7 +82,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerChangedDimension = new EventList(); @Override - public IEventHandle onPlayerChangedDimension(IPlayerChangedDimensionEventHandler ev) { + public IEventHandle onPlayerChangedDimension(IEventHandler ev) { return elPlayerChangedDimension.add(ev); } @@ -99,7 +100,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerLoggedIn = new EventList(); - public IEventHandle onPlayerLoggedIn(IPlayerLoggedInEventHandler ev) { + public IEventHandle onPlayerLoggedIn(IEventHandler ev) { return elPlayerLoggedIn.add(ev); } @@ -117,7 +118,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerLoggedOut = new EventList(); - public IEventHandle onPlayerLoggedOut(IPlayerLoggedOutEventHandler ev) { + public IEventHandle onPlayerLoggedOut(IEventHandler ev) { return elPlayerLoggedOut.add(ev); } @@ -136,7 +137,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerRespawn = new EventList(); @Override - public IEventHandle onPlayerRespawn(IPlayerRespawnEventHandler ev) { + public IEventHandle onPlayerRespawn(IEventHandler ev) { return elPlayerRespawn.add(ev); } @@ -155,7 +156,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerAttackEntity = new EventList(); @Override - public IEventHandle onPlayerAttackEntity(IPlayerAttackEntityEventHandler ev) { + public IEventHandle onPlayerAttackEntity(IEventHandler ev) { return elPlayerAttackEntity.add(ev); } @@ -174,7 +175,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerBonemeal = new EventList(); @Override - public IEventHandle onPlayerBonemeal(IPlayerBonemealEventHandler ev) { + public IEventHandle onPlayerBonemeal(IEventHandler ev) { return elPlayerBonemeal.add(ev); } @@ -193,7 +194,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerInteractEntity = new EventList(); @Override - public IEventHandle onPlayerInteractEntity(IPlayerInteractEntityEventHandler ev) { + public IEventHandle onPlayerInteractEntity(IEventHandler ev) { return elPlayerInteractEntity.add(ev); } @@ -212,7 +213,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerPickup = new EventList(); @Override - public IEventHandle onPlayerPickup(IPlayerPickupEventHandler ev) { + public IEventHandle onPlayerPickup(IEventHandler ev) { return elPlayerPickup.add(ev); } @@ -231,7 +232,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerPickupItem = new EventList(); @Override - public IEventHandle onPlayerPickupItem(IPlayerPickupItemEventHandler ev) { + public IEventHandle onPlayerPickupItem(IEventHandler ev) { return elPlayerPickupItem.add(ev); } @@ -250,7 +251,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerFillBucket = new EventList(); @Override - public IEventHandle onPlayerFillBucket(IPlayerFillBucketEventHandler ev) { + public IEventHandle onPlayerFillBucket(IEventHandler ev) { return elPlayerFillBucket.add(ev); } @@ -269,7 +270,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerDeathDrops = new EventList(); @Override - public IEventHandle onPlayerDeathDrops(IPlayerDeathDropsEventHandler ev) { + public IEventHandle onPlayerDeathDrops(IEventHandler ev) { return elPlayerDeathDrops.add(ev); } @@ -288,7 +289,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerInteract = new EventList(); @Override - public IEventHandle onPlayerInteract(IPlayerInteractEventHandler ev) { + public IEventHandle onPlayerInteract(IEventHandler ev) { return elPlayerInteract.add(ev); } @@ -307,7 +308,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerOpenContainer = new EventList(); @Override - public IEventHandle onPlayerOpenContainer(IPlayerOpenContainerEventHandler ev) { + public IEventHandle onPlayerOpenContainer(IEventHandler ev) { return elPlayerOpenContainer.add(ev); } @@ -326,7 +327,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerPickupXp = new EventList(); @Override - public IEventHandle onPlayerPickupXp(IPlayerPickupXpEventHandler ev) { + public IEventHandle onPlayerPickupXp(IEventHandler ev) { return elPlayerPickupXp.add(ev); } @@ -345,7 +346,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerSleepInBed = new EventList(); @Override - public IEventHandle onPlayerSleepInBed(IPlayerSleepInBedEventHandler ev) { + public IEventHandle onPlayerSleepInBed(IEventHandler ev) { return elPlayerSleepInBed.add(ev); } @@ -364,7 +365,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerUseHoe = new EventList(); @Override - public IEventHandle onPlayerUseHoe(IPlayerUseHoeEventHandler ev) { + public IEventHandle onPlayerUseHoe(IEventHandler ev) { return elPlayerUseHoe.add(ev); } @@ -383,7 +384,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerUseItemStart = new EventList(); @Override - public IEventHandle onPlayerUseItemStart(IPlayerUseItemStartEventHandler ev) { + public IEventHandle onPlayerUseItemStart(IEventHandler ev) { return elPlayerUseItemStart.add(ev); } @@ -402,7 +403,7 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerUseItemTick = new EventList(); @Override - public IEventHandle onPlayerUseItemTick(IPlayerUseItemTickEventHandler ev) { + public IEventHandle onPlayerUseItemTick(IEventHandler ev) { return elPlayerUseItemTick.add(ev); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/game/IGame.java b/MineTweaker3-API/src/main/java/minetweaker/api/game/IGame.java index 0c6318c..c45cf38 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/game/IGame.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/game/IGame.java @@ -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 getItems(); + /** + * Retrieves the block definitions in this game. + * + * @return block definitions + */ + @ZenGetter("blocks") + public List getBlocks(); + /** * Retrieves the liquids in this game. * @@ -35,6 +45,14 @@ public interface IGame { * * @return game biomes */ - @ZenGetter("Biomes") + @ZenGetter("biomes") public List getBiomes(); + + /** + * Retrieves the entities in this game. + * + * @return game entities + */ + @ZenGetter("entities") + public List getEntities(); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/server/AbstractServer.java b/MineTweaker3-API/src/main/java/minetweaker/api/server/AbstractServer.java index f8403bf..cec52f5 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/server/AbstractServer.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/server/AbstractServer.java @@ -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 ev) { return MineTweakerImplementationAPI.events.onPlayerLoggedIn(ev); } @Override - public final IEventHandle onPlayerLoggedOut(IPlayerLoggedOutEventHandler ev) { + public final IEventHandle onPlayerLoggedOut(IEventHandler ev) { return MineTweakerImplementationAPI.events.onPlayerLoggedOut(ev); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/server/IServer.java b/MineTweaker3-API/src/main/java/minetweaker/api/server/IServer.java index 71dd544..58c643b 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/server/IServer.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/server/IServer.java @@ -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 ev); @ZenMethod - public IEventHandle onPlayerLoggedOut(IPlayerLoggedOutEventHandler ev); + public IEventHandle onPlayerLoggedOut(IEventHandler ev); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java index 6774485..7f73123 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java @@ -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 diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java index 7dd2c61..8e184ad 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java @@ -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 actions = new ArrayList(); private final Set wereStuck = new LinkedHashSet(); diff --git a/MineTweaker3-MC164-Main/build.gradle b/MineTweaker3-MC164-Main/build.gradle index 1fa098a..b6e9f7c 100644 --- a/MineTweaker3-MC164-Main/build.gradle +++ b/MineTweaker3-MC164-Main/build.gradle @@ -15,7 +15,7 @@ buildscript { apply plugin: 'forge' -version = "1.6.4-3.0.6" +version = "1.6.4-" + ext.mineTweakerVersion //group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = project.projectDir.name @@ -47,6 +47,12 @@ processResources // replace version and mcversion expand 'version':project.version, 'mcversion':project.minecraft.version } + + from(sourceSets.main.java.srcDirs) { + include 'minetweaker/mc164/MineTweakerMod.java' + + expand 'version':project.version + } // copy everything else, thats not the mcmod.info from(sourceSets.main.resources.srcDirs) { diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MTCraftingHandler.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MTCraftingHandler.java index f861956..e781767 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MTCraftingHandler.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MTCraftingHandler.java @@ -9,6 +9,7 @@ package minetweaker.mc164; import cpw.mods.fml.common.ICraftingHandler; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.event.PlayerCraftedEvent; +import minetweaker.api.event.PlayerSmeltedEvent; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.mc164.recipes.MCCraftingInventory; import net.minecraft.entity.player.EntityPlayer; @@ -36,6 +37,10 @@ public class MTCraftingHandler implements ICraftingHandler { @Override public void onSmelting(EntityPlayer ep, ItemStack is) { - + if (MineTweakerImplementationAPI.events.hasPlayerSmelted()) { + MineTweakerImplementationAPI.events.publishPlayerSmelted(new PlayerSmeltedEvent( + MineTweakerMC.getIPlayer(ep), + MineTweakerMC.getIItemStack(is))); + } } } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java index f5549df..8efc26e 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java @@ -43,7 +43,6 @@ import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.NetHandler; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.EventBus; /** * Main mod class. Performs some general logic, initialization of the API and @@ -51,7 +50,7 @@ import net.minecraftforge.event.EventBus; * * @author Stan Hebben */ -@Mod(modid = MineTweakerMod.MODID, version = MineTweakerMod.MCVERSION + "-3.0.3") +@Mod(modid = MineTweakerMod.MODID, version = "${version}") @NetworkMod(clientSideRequired = true, serverSideRequired = true, channels = {MCPacketHandler.CHANNEL_SERVERSCRIPT, MCPacketHandler.CHANNEL_OPENBROWSER}, packetHandler = MCPacketHandler.class) public class MineTweakerMod { public static final String MODID = "MineTweaker3"; diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/block/MCBlockDefinition.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/block/MCBlockDefinition.java index 6da08f9..2e2bf3e 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/block/MCBlockDefinition.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/block/MCBlockDefinition.java @@ -35,4 +35,9 @@ public class MCBlockDefinition implements IBlockDefinition { public String getId() { return block.getUnlocalizedName(); } + + @Override + public String getDisplayName() { + return block.getLocalizedName(); + } } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/entity/MCEntityDefinition.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/entity/MCEntityDefinition.java new file mode 100644 index 0000000..689c43f --- /dev/null +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/entity/MCEntityDefinition.java @@ -0,0 +1,32 @@ +/* + * 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.mc164.entity; + +import cpw.mods.fml.common.registry.EntityRegistry; +import minetweaker.api.entity.IEntityDefinition; + +/** + * + * @author Stan + */ +public class MCEntityDefinition implements IEntityDefinition { + private final EntityRegistry.EntityRegistration registration; + + public MCEntityDefinition(EntityRegistry.EntityRegistration registration) { + this.registration = registration; + } + + @Override + public String getId() { + return registration.getEntityClass().getName(); + } + + @Override + public String getName() { + return registration.getEntityName(); + } +} diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/game/MCGame.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/game/MCGame.java index 2c23d9e..1f0b567 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/game/MCGame.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/game/MCGame.java @@ -6,16 +6,22 @@ package minetweaker.mc164.game; +import cpw.mods.fml.common.registry.EntityRegistry; import java.util.ArrayList; import java.util.List; import java.util.Map; +import minetweaker.api.block.IBlockDefinition; +import minetweaker.api.entity.IEntityDefinition; import minetweaker.api.game.IGame; import minetweaker.api.item.IItemDefinition; import minetweaker.api.liquid.ILiquidDefinition; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.world.IBiome; +import minetweaker.mc164.entity.MCEntityDefinition; import minetweaker.mc164.item.MCItemDefinition; import minetweaker.mc164.liquid.MCLiquidDefinition; +import minetweaker.mc164.util.MineTweakerHacks; +import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -32,10 +38,25 @@ public class MCGame implements IGame { @Override public List getItems() { List result = new ArrayList(); + for (Item item : Item.itemsList) { if (item == null) continue; result.add(new MCItemDefinition(item)); } + + return result; + } + + @Override + public List getBlocks() { + List result = new ArrayList(); + + for (Block block : Block.blocksList) { + if (block == null) continue; + + result.add(MineTweakerMC.getBlockDefinition(block)); + } + return result; } @@ -58,4 +79,15 @@ public class MCGame implements IGame { } return result; } + + @Override + public List getEntities() { + List result = new ArrayList(); + + for (EntityRegistry.EntityRegistration entityRegistration : MineTweakerHacks.getEntityClassRegistrations().values()) { + result.add(new MCEntityDefinition(entityRegistration)); + } + + return result; + } } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerHacks.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerHacks.java index c7a2223..84c80c4 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerHacks.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerHacks.java @@ -6,12 +6,15 @@ package minetweaker.mc164.util; +import com.google.common.collect.BiMap; +import cpw.mods.fml.common.registry.EntityRegistry; import java.io.File; import java.lang.reflect.Field; import java.util.List; import java.util.Map; import java.util.Set; import minetweaker.MineTweakerAPI; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; @@ -41,6 +44,8 @@ public class MineTweakerHacks { private static final Field INVENTORYCRAFTING_EVENTHANDLER; private static final Field SLOTCRAFTING_PLAYER; + private static final Field ENTITYREGISTRY_CLASSREGISTRATIONS; + static { NBTTAGCOMPOUND_TAGMAP = getField(NBTTagCompound.class, MineTweakerObfuscation.NBTTAGCOMPOUND_TAGMAP); OREDICTIONARY_ORESTACKS = getField(OreDictionary.class, MineTweakerObfuscation.OREDICTIONARY_ORESTACKS); @@ -49,10 +54,22 @@ public class MineTweakerHacks { INVENTORYCRAFTING_EVENTHANDLER = getField(InventoryCrafting.class, MineTweakerObfuscation.INVENTORYCRAFTING_EVENTHANDLER); SLOTCRAFTING_PLAYER = getField(SlotCrafting.class, MineTweakerObfuscation.SLOTCRAFTING_PLAYER); + + ENTITYREGISTRY_CLASSREGISTRATIONS = getField(EntityRegistry.class, new String[] {"entityClassRegistrations"}); } private MineTweakerHacks() {} + public static BiMap, EntityRegistry.EntityRegistration> getEntityClassRegistrations() { + try { + return (BiMap, EntityRegistry.EntityRegistration>) ENTITYREGISTRY_CLASSREGISTRATIONS.get(EntityRegistry.instance()); + } catch (IllegalArgumentException ex) { + return null; + } catch (IllegalAccessException ex) { + return null; + } + } + public static Map getNBTCompoundMap(NBTTagCompound tag) { try { return (Map) NBTTAGCOMPOUND_TAGMAP.get(tag); diff --git a/MineTweaker3-MC1710-Main/build.gradle b/MineTweaker3-MC1710-Main/build.gradle index 67f58c8..4523edd 100644 --- a/MineTweaker3-MC1710-Main/build.gradle +++ b/MineTweaker3-MC1710-Main/build.gradle @@ -19,7 +19,7 @@ buildscript { apply plugin: 'forge' minecraft{version = "1.7.10-10.13.0.1160"} -version = "1.7.10-3.0.6" +version = "1.7.10-" + ext.mineTweakerVersion archivesBaseName = project.projectDir.name dependencies { @@ -46,6 +46,12 @@ processResources // replace version and mcversion expand 'version':project.version, 'mcversion':project.minecraft.version } + + from(sourceSets.main.java.srcDirs) { + include 'minetweaker/mc1710/MineTweakerMod.java' + + expand 'version':project.version + } // copy everything else, thats not the mcmod.info from(sourceSets.main.resources.srcDirs) { diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java index 774befe..f997754 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java @@ -7,6 +7,7 @@ import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.event.PlayerCraftedEvent; import minetweaker.api.event.PlayerLoggedInEvent; import minetweaker.api.event.PlayerLoggedOutEvent; +import minetweaker.api.event.PlayerSmeltedEvent; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.mc1710.network.MineTweakerLoadScriptsPacket; import minetweaker.mc1710.recipes.MCCraftingInventory; @@ -43,6 +44,15 @@ public class FMLEventHandler { } } + @SubscribeEvent + public void onPlayerItemSmelted(PlayerEvent.ItemSmeltedEvent ev) { + if (MineTweakerImplementationAPI.events.hasPlayerSmelted()) { + MineTweakerImplementationAPI.events.publishPlayerSmelted(new PlayerSmeltedEvent( + MineTweakerMC.getIPlayer(ev.player), + MineTweakerMC.getIItemStack(ev.smelting))); + } + } + @SubscribeEvent public void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent ev) { MineTweakerImplementationAPI.events.publishPlayerLoggedOut(new PlayerLoggedOutEvent(MineTweakerMC.getIPlayer(ev.player))); diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java index 6520940..27a9e24 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java @@ -44,7 +44,7 @@ import net.minecraftforge.common.MinecraftForge; * * @author Stan Hebben */ -@Mod(modid = MineTweakerMod.MODID, version = MineTweakerMod.MCVERSION + "-3.0.3") +@Mod(modid = MineTweakerMod.MODID, version = "${version}") public class MineTweakerMod { public static final String MODID = "MineTweaker3"; public static final String MCVERSION = "1.7.10"; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java index 37df383..fcd2d26 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java @@ -28,4 +28,9 @@ public class MCBlockDefinition implements IBlockDefinition { public String getId() { return Block.blockRegistry.getNameForObject(block); } + + @Override + public String getDisplayName() { + return block.getLocalizedName(); + } } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/entity/MCEntityDefinition.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/entity/MCEntityDefinition.java new file mode 100644 index 0000000..a6df0e1 --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/entity/MCEntityDefinition.java @@ -0,0 +1,32 @@ +/* + * 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.mc1710.entity; + +import cpw.mods.fml.common.registry.EntityRegistry; +import minetweaker.api.entity.IEntityDefinition; + +/** + * + * @author Stan + */ +public class MCEntityDefinition implements IEntityDefinition { + private final EntityRegistry.EntityRegistration registration; + + public MCEntityDefinition(EntityRegistry.EntityRegistration registration) { + this.registration = registration; + } + + @Override + public String getId() { + return registration.getEntityClass().getName(); + } + + @Override + public String getName() { + return registration.getEntityName(); + } +} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java index 185e81f..97a4d63 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java @@ -6,17 +6,23 @@ package minetweaker.mc1710.game; +import cpw.mods.fml.common.registry.EntityRegistry; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; +import minetweaker.api.block.IBlockDefinition; +import minetweaker.api.entity.IEntityDefinition; import minetweaker.api.game.IGame; import minetweaker.api.item.IItemDefinition; import minetweaker.api.liquid.ILiquidDefinition; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.world.IBiome; +import minetweaker.mc1710.entity.MCEntityDefinition; import minetweaker.mc1710.item.MCItemDefinition; import minetweaker.mc1710.liquid.MCLiquidDefinition; +import minetweaker.mc1710.util.MineTweakerHacks; +import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -39,6 +45,16 @@ public class MCGame implements IGame { return result; } + @Override + public List getBlocks() { + List result = new ArrayList(); + for (String block : (Set)Block.blockRegistry.getKeys()) { + result.add(MineTweakerMC.getBlockDefinition((Block) Block.blockRegistry.getObject(block))); + } + + return result; + } + @Override public List getLiquids() { List result = new ArrayList(); @@ -58,4 +74,15 @@ public class MCGame implements IGame { } return result; } + + @Override + public List getEntities() { + List result = new ArrayList(); + + for (EntityRegistry.EntityRegistration entityRegistration : MineTweakerHacks.getEntityClassRegistrations().values()) { + result.add(new MCEntityDefinition(entityRegistration)); + } + + return result; + } } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java index 5f232ba..c7b2153 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java @@ -6,11 +6,14 @@ package minetweaker.mc1710.util; +import com.google.common.collect.BiMap; +import cpw.mods.fml.common.registry.EntityRegistry; import java.io.File; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; import minetweaker.MineTweakerAPI; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; @@ -38,6 +41,8 @@ public class MineTweakerHacks { private static final Field INVENTORYCRAFTING_EVENTHANDLER; private static final Field SLOTCRAFTING_PLAYER; + private static final Field ENTITYREGISTRY_CLASSREGISTRATIONS; + static { NBTTAGLIST_TAGLIST = getField(NBTTagList.class, MineTweakerObfuscation.NBTTAGLIST_TAGLIST); OREDICTIONARY_IDTOSTACK = getField(OreDictionary.class, MineTweakerObfuscation.OREDICTIONARY_IDTOSTACK); @@ -46,10 +51,22 @@ public class MineTweakerHacks { SHAPEDORERECIPE_WIDTH = getField(ShapedOreRecipe.class, new String[] {"width"}); INVENTORYCRAFTING_EVENTHANDLER = getField(InventoryCrafting.class, MineTweakerObfuscation.INVENTORYCRAFTING_EVENTHANDLER); SLOTCRAFTING_PLAYER = getField(SlotCrafting.class, MineTweakerObfuscation.SLOTCRAFTING_PLAYER); + + ENTITYREGISTRY_CLASSREGISTRATIONS = getField(EntityRegistry.class, new String[] {"entityClassRegistrations"}); } private MineTweakerHacks() {} + public static BiMap, EntityRegistry.EntityRegistration> getEntityClassRegistrations() { + try { + return (BiMap, EntityRegistry.EntityRegistration>) ENTITYREGISTRY_CLASSREGISTRATIONS.get(EntityRegistry.instance()); + } catch (IllegalArgumentException ex) { + return null; + } catch (IllegalAccessException ex) { + return null; + } + } + public static List getTagList(NBTTagList list) { if (NBTTAGLIST_TAGLIST == null) { return null; diff --git a/MineTweaker3-MC172-Main/build.gradle b/MineTweaker3-MC172-Main/build.gradle index 89fdc04..ec0752d 100644 --- a/MineTweaker3-MC172-Main/build.gradle +++ b/MineTweaker3-MC172-Main/build.gradle @@ -19,7 +19,7 @@ buildscript { apply plugin: 'forge' minecraft{version = "1.7.2-10.12.2.1121"} -version = "1.7.2-3.0.6" +version = "1.7.2-" + ext.mineTweakerVersion archivesBaseName = project.projectDir.name dependencies { @@ -47,7 +47,13 @@ processResources expand 'version':project.version, 'mcversion':project.minecraft.version } - // copy everything else, thats not the mcmod.info + from(sourceSets.main.java.srcDirs) { + include 'minetweaker/mc172/MineTweakerMod.java' + + expand 'version':project.version + } + + // copy everything else, thats not the mcmod.info from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info' } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/FMLEventHandler.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/FMLEventHandler.java index 37aa525..677ebe8 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/FMLEventHandler.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/FMLEventHandler.java @@ -7,6 +7,7 @@ import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.event.PlayerCraftedEvent; import minetweaker.api.event.PlayerLoggedInEvent; import minetweaker.api.event.PlayerLoggedOutEvent; +import minetweaker.api.event.PlayerSmeltedEvent; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.mc172.network.MineTweakerLoadScriptsPacket; import minetweaker.mc172.recipes.MCCraftingInventory; @@ -26,13 +27,15 @@ public class FMLEventHandler { player); } - MineTweakerImplementationAPI.events.publishPlayerLoggedIn(new PlayerLoggedInEvent(MineTweakerMC.getIPlayer(ev.player))); + MineTweakerImplementationAPI.events.publishPlayerLoggedIn( + new PlayerLoggedInEvent(MineTweakerMC.getIPlayer(ev.player))); } @SubscribeEvent public void onPlayerItemCrafted(PlayerEvent.ItemCraftedEvent ev) { if (MineTweakerMod.INSTANCE.recipes.hasTransformerRecipes()) { - MineTweakerMod.INSTANCE.recipes.applyTransformations(MCCraftingInventory.get(ev.craftMatrix, ev.player)); + MineTweakerMod.INSTANCE.recipes.applyTransformations( + MCCraftingInventory.get(ev.craftMatrix, ev.player)); } if (MineTweakerImplementationAPI.events.hasPlayerCrafted()) { @@ -43,8 +46,18 @@ public class FMLEventHandler { } } + @SubscribeEvent + public void onPlayerItemSmelted(PlayerEvent.ItemSmeltedEvent ev) { + if (MineTweakerImplementationAPI.events.hasPlayerSmelted()) { + MineTweakerImplementationAPI.events.publishPlayerSmelted(new PlayerSmeltedEvent( + MineTweakerMC.getIPlayer(ev.player), + MineTweakerMC.getIItemStack(ev.smelting))); + } + } + @SubscribeEvent public void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent ev) { - MineTweakerImplementationAPI.events.publishPlayerLoggedOut(new PlayerLoggedOutEvent(MineTweakerMC.getIPlayer(ev.player))); + MineTweakerImplementationAPI.events.publishPlayerLoggedOut( + new PlayerLoggedOutEvent(MineTweakerMC.getIPlayer(ev.player))); } } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java index 27b5e02..220b7df 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java @@ -44,7 +44,7 @@ import net.minecraftforge.common.MinecraftForge; * * @author Stan Hebben */ -@Mod(modid = MineTweakerMod.MODID, version = MineTweakerMod.MCVERSION + "-3.0.3") +@Mod(modid = MineTweakerMod.MODID, version = "${version}") public class MineTweakerMod { public static final String MODID = "MineTweaker3"; public static final String MCVERSION = "1.7.2"; diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/block/MCBlockDefinition.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/block/MCBlockDefinition.java index 860973c..1d1658d 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/block/MCBlockDefinition.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/block/MCBlockDefinition.java @@ -28,4 +28,9 @@ public class MCBlockDefinition implements IBlockDefinition { public String getId() { return Block.blockRegistry.getNameForObject(block); } + + @Override + public String getDisplayName() { + return block.getLocalizedName(); + } } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/entity/MCEntityDefinition.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/entity/MCEntityDefinition.java new file mode 100644 index 0000000..1425219 --- /dev/null +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/entity/MCEntityDefinition.java @@ -0,0 +1,32 @@ +/* + * 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.mc172.entity; + +import cpw.mods.fml.common.registry.EntityRegistry; +import minetweaker.api.entity.IEntityDefinition; + +/** + * + * @author Stan + */ +public class MCEntityDefinition implements IEntityDefinition { + private final EntityRegistry.EntityRegistration registration; + + public MCEntityDefinition(EntityRegistry.EntityRegistration registration) { + this.registration = registration; + } + + @Override + public String getId() { + return registration.getEntityClass().getName(); + } + + @Override + public String getName() { + return registration.getEntityName(); + } +} diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/game/MCGame.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/game/MCGame.java index f845e69..f043bf0 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/game/MCGame.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/game/MCGame.java @@ -6,17 +6,23 @@ package minetweaker.mc172.game; +import cpw.mods.fml.common.registry.EntityRegistry; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; +import minetweaker.api.block.IBlockDefinition; +import minetweaker.api.entity.IEntityDefinition; import minetweaker.api.game.IGame; import minetweaker.api.item.IItemDefinition; import minetweaker.api.liquid.ILiquidDefinition; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.world.IBiome; +import minetweaker.mc172.entity.MCEntityDefinition; import minetweaker.mc172.item.MCItemDefinition; import minetweaker.mc172.liquid.MCLiquidDefinition; +import minetweaker.mc172.util.MineTweakerHacks; +import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -38,6 +44,16 @@ public class MCGame implements IGame { } return result; } + + @Override + public List getBlocks() { + List result = new ArrayList(); + for (String block : (Set)Block.blockRegistry.getKeys()) { + result.add(MineTweakerMC.getBlockDefinition((Block) Block.blockRegistry.getObject(block))); + } + + return result; + } @Override public List getLiquids() { @@ -58,4 +74,15 @@ public class MCGame implements IGame { } return result; } + + @Override + public List getEntities() { + List result = new ArrayList(); + + for (EntityRegistry.EntityRegistration entityRegistration : MineTweakerHacks.getEntityClassRegistrations().values()) { + result.add(new MCEntityDefinition(entityRegistration)); + } + + return result; + } } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerHacks.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerHacks.java index eea611f..21b35bb 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerHacks.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerHacks.java @@ -6,11 +6,14 @@ package minetweaker.mc172.util; +import com.google.common.collect.BiMap; +import cpw.mods.fml.common.registry.EntityRegistry; import java.io.File; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; import minetweaker.MineTweakerAPI; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; @@ -34,22 +37,38 @@ public class MineTweakerHacks { private static final Field OREDICTIONARY_IDTOSTACK; private static final Field OREDICTIONARY_IDTOSTACKUN; private static final Field MINECRAFTSERVER_ANVILFILE; + private static final Field SHAPEDORERECIPE_WIDTH; private static final Field INVENTORYCRAFTING_EVENTHANDLER; private static final Field SLOTCRAFTING_PLAYER; + private static final Field ENTITYREGISTRY_CLASSREGISTRATIONS; + static { NBTTAGLIST_TAGLIST = getField(NBTTagList.class, MineTweakerObfuscation.NBTTAGLIST_TAGLIST); OREDICTIONARY_IDTOSTACK = getField(OreDictionary.class, MineTweakerObfuscation.OREDICTIONARY_IDTOSTACK); OREDICTIONARY_IDTOSTACKUN = getField(OreDictionary.class, MineTweakerObfuscation.OREDICTIONARY_IDTOSTACKUN); MINECRAFTSERVER_ANVILFILE = getField(MinecraftServer.class, MineTweakerObfuscation.MINECRAFTSERVER_ANVILFILE); SHAPEDORERECIPE_WIDTH = getField(ShapedOreRecipe.class, new String[] {"width"}); + INVENTORYCRAFTING_EVENTHANDLER = getField(InventoryCrafting.class, MineTweakerObfuscation.INVENTORYCRAFTING_EVENTHANDLER); SLOTCRAFTING_PLAYER = getField(SlotCrafting.class, MineTweakerObfuscation.SLOTCRAFTING_PLAYER); + + ENTITYREGISTRY_CLASSREGISTRATIONS = getField(EntityRegistry.class, new String[] {"entityClassRegistrations"}); } private MineTweakerHacks() {} + public static BiMap, EntityRegistry.EntityRegistration> getEntityClassRegistrations() { + try { + return (BiMap, EntityRegistry.EntityRegistration>) ENTITYREGISTRY_CLASSREGISTRATIONS.get(EntityRegistry.instance()); + } catch (IllegalArgumentException ex) { + return null; + } catch (IllegalAccessException ex) { + return null; + } + } + public static List getTagList(NBTTagList list) { if (NBTTAGLIST_TAGLIST == null) { return null; diff --git a/MineTweaker3-Web/about.html b/MineTweaker3-Web/about.html index fa1b8c4..0a9d9d7 100644 --- a/MineTweaker3-Web/about.html +++ b/MineTweaker3-Web/about.html @@ -40,6 +40,7 @@ diff --git a/ZenScript/src/main/java/stanhebben/zenscript/ZenModule.java b/ZenScript/src/main/java/stanhebben/zenscript/ZenModule.java index 9ec7582..50627ea 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/ZenModule.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/ZenModule.java @@ -68,7 +68,7 @@ public class ZenModule { fn.getName(), fn.getSignature(), fn.getArgumentTypes(), - fn.getReturnType())); + fn.getReturnType()), fn.getPosition()); } } @@ -89,7 +89,7 @@ public class ZenModule { List arguments = function.getValue().getArguments(); for (int i = 0; i < arguments.size(); i++) { ParsedFunctionArgument argument = arguments.get(i); - methodEnvironment.putValue(argument.getName(), new SymbolArgument(i, argument.getType())); + methodEnvironment.putValue(argument.getName(), new SymbolArgument(i, argument.getType()), fn.getPosition()); } methodOutput.start(); diff --git a/ZenScript/src/main/java/stanhebben/zenscript/ZenParsedFile.java b/ZenScript/src/main/java/stanhebben/zenscript/ZenParsedFile.java index 9d04f90..afa6dfb 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/ZenParsedFile.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/ZenParsedFile.java @@ -110,10 +110,10 @@ public class ZenParsedFile { if (symbol == null) { environmentScript.error(imprt.getPosition(), "Not a valid type"); } else { - environmentScript.putValue(imprt.getRename(), type.toSymbol()); + environmentScript.putValue(imprt.getRename(), type.toSymbol(), imprt.getPosition()); } } else { - environmentScript.putValue(imprt.getRename(), new SymbolType(ZenType.ANY)); + environmentScript.putValue(imprt.getRename(), new SymbolType(ZenType.ANY), imprt.getPosition()); } } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentClass.java b/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentClass.java index c2c6e4f..3ac0b7c 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentClass.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentClass.java @@ -78,8 +78,12 @@ public class EnvironmentClass implements IEnvironmentClass { } @Override - public void putValue(String name, IZenSymbol value) { - local.put(name, value); + public void putValue(String name, IZenSymbol value, ZenPosition position) { + if (local.containsKey(name)) { + error(position, "Value already defined in this scope: " + name); + } else { + local.put(name, value); + } } @Override diff --git a/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentGlobal.java b/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentGlobal.java index 598059a..ba7f4ea 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentGlobal.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentGlobal.java @@ -97,9 +97,9 @@ public class EnvironmentGlobal implements IEnvironmentGlobal { } @Override - public void putValue(String name, IZenSymbol value) { + public void putValue(String name, IZenSymbol value, ZenPosition position) { if (local.containsKey(name)) { - throw new RuntimeException("already exists"); + error(position, "Value already defined in this scope: " + name); } else { local.put(name, value); } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentMethod.java b/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentMethod.java index 9feaf6c..3834bc0 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentMethod.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentMethod.java @@ -105,8 +105,12 @@ public class EnvironmentMethod implements IEnvironmentMethod { } @Override - public void putValue(String name, IZenSymbol value) { - local.put(name, value); + public void putValue(String name, IZenSymbol value, ZenPosition position) { + if (local.containsKey(name)) { + error(position, "Value already defined in this scope: " + name); + } else { + local.put(name, value); + } } @Override diff --git a/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentScope.java b/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentScope.java index 478363d..c6c8853 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentScope.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentScope.java @@ -94,8 +94,12 @@ public class EnvironmentScope implements IEnvironmentMethod { } @Override - public void putValue(String name, IZenSymbol value) { - local.put(name, value); + public void putValue(String name, IZenSymbol value, ZenPosition position) { + if (local.containsKey(name)) { + error(position, "Value already defined in this scope: " + name); + } else { + local.put(name, value); + } } @Override diff --git a/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentScript.java b/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentScript.java index 6f87eeb..6ecb5ff 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentScript.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/compiler/EnvironmentScript.java @@ -67,10 +67,14 @@ public class EnvironmentScript implements IEnvironmentGlobal { } @Override - public void putValue(String name, IZenSymbol value) { + public void putValue(String name, IZenSymbol value, ZenPosition position) { if (value == null) throw new IllegalArgumentException("value cannot be null"); - imports.put(name, value); + if (imports.containsKey(name)) { + error(position, "Value already defined in this scope: " + name); + } else { + imports.put(name, value); + } } @Override diff --git a/ZenScript/src/main/java/stanhebben/zenscript/compiler/IEnvironmentGlobal.java b/ZenScript/src/main/java/stanhebben/zenscript/compiler/IEnvironmentGlobal.java index 4ef94ce..e64fc5e 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/compiler/IEnvironmentGlobal.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/compiler/IEnvironmentGlobal.java @@ -35,5 +35,5 @@ public interface IEnvironmentGlobal extends ITypeRegistry, IZenErrorLogger { public IPartialExpression getValue(String name, ZenPosition position); - public void putValue(String name, IZenSymbol value); + public void putValue(String name, IZenSymbol value, ZenPosition position); } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/expression/Expression.java b/ZenScript/src/main/java/stanhebben/zenscript/expression/Expression.java index 7b64c0c..f76e776 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/expression/Expression.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/expression/Expression.java @@ -29,7 +29,7 @@ public abstract class Expression implements IPartialExpression { } public Expression cast(ZenPosition position, IEnvironmentGlobal environment, ZenType type) { - if (getType() == type) { + if (getType().equals(type)) { return this; } else { ICastingRule castingRule = getType().getCastingRule(type, environment); diff --git a/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionInvalid.java b/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionInvalid.java index 521eb57..9d25606 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionInvalid.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionInvalid.java @@ -31,6 +31,7 @@ public class ExpressionInvalid extends Expression { this.type = type; + // XXX: remove before release //throw new RuntimeException("Constructing invalid expression"); } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionJavaLambda.java b/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionJavaLambda.java index 2a2b18e..48d03a1 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionJavaLambda.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionJavaLambda.java @@ -81,7 +81,8 @@ public class ExpressionJavaLambda extends Expression { for (int i = 0; i < arguments.size(); i++) { environmentMethod.putValue( arguments.get(i).getName(), - new SymbolArgument(i + 1, environment.getType(method.getGenericParameterTypes()[i]))); + new SymbolArgument(i + 1, environment.getType(method.getGenericParameterTypes()[i])), + getPosition()); } output.start(); diff --git a/ZenScript/src/main/java/stanhebben/zenscript/parser/expression/ParsedExpressionArray.java b/ZenScript/src/main/java/stanhebben/zenscript/parser/expression/ParsedExpressionArray.java index a60fde6..6796f5f 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/parser/expression/ParsedExpressionArray.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/parser/expression/ParsedExpressionArray.java @@ -6,6 +6,7 @@ package stanhebben.zenscript.parser.expression; +import java.util.Collections; import java.util.List; import stanhebben.zenscript.compiler.IEnvironmentMethod; import stanhebben.zenscript.expression.Expression; @@ -60,6 +61,9 @@ public class ParsedExpressionArray extends ParsedExpression { } } + System.out.println("Predicted array base type " + (predictedBaseType == null ? "none" : predictedBaseType.getName())); + System.out.println("Contents are: " + contents); + Expression[] cContents = new Expression[contents.size()]; for (int i = 0; i < contents.size(); i++) { cContents[i] = contents.get(i).compile(environment, predictedBaseType).eval(environment); diff --git a/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementForeach.java b/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementForeach.java index d97e5ae..33edfda 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementForeach.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementForeach.java @@ -42,7 +42,7 @@ public class StatementForeach extends Statement { int[] localVariables = new int[varnames.length]; for (int i = 0; i < localVariables.length; i++) { SymbolLocal localVar = new SymbolLocal(iterator.getType(i), true); - local.putValue(varnames[i], localVar); + local.putValue(varnames[i], localVar, getPosition()); localVariables[i] = local.getLocal(localVar); } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementIf.java b/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementIf.java index 787106a..94c42e7 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementIf.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementIf.java @@ -25,7 +25,10 @@ public class StatementIf extends Statement { public void compile(IEnvironmentMethod environment) { environment.getOutput().position(getPosition()); - Expression cCondition = condition.compile(environment, ZenType.BOOL).eval(environment); + Expression cCondition = condition.compile(environment, ZenType.BOOL) + .eval(environment) + .cast(getPosition(), environment, ZenType.BOOL); + ZenType expressionType = cCondition.getType(); if (expressionType.canCastImplicit(ZenType.BOOL, environment)) { Label labelEnd = new Label(); diff --git a/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementVar.java b/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementVar.java index 784ced4..8974e61 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementVar.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementVar.java @@ -43,7 +43,7 @@ public class StatementVar extends Statement { ZenType cType = type == null ? (cInitializer == null ? ZenTypeAny.INSTANCE : cInitializer.getType()) : type; SymbolLocal symbol = new SymbolLocal(cType, isFinal); - environment.putValue(name, symbol); + environment.putValue(name, symbol, getPosition()); if (cInitializer != null) { cInitializer.compile(true, environment); diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenType.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenType.java index 9b1c579..8a1beea 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenType.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenType.java @@ -243,7 +243,7 @@ public abstract class ZenType { public ICastingRule getCastingRule(ZenType type, IEnvironmentGlobal environment) { if (castingRules == null) { castingRules = new HashMap(); - constructCastingRules(environment, new CastingRuleDelegateMap(castingRules), true); + constructCastingRules(environment, new CastingRuleDelegateMap(this, castingRules), true); } return castingRules.get(type); @@ -395,4 +395,18 @@ public abstract class ZenType { return false; } + + @Override + public int hashCode() { + return getName().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other instanceof ZenType) { + return getName().equals(((ZenType) other).getName()); + } else { + return false; + } + } } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeBoolObject.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeBoolObject.java index 12ebc3e..0afcdbf 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeBoolObject.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeBoolObject.java @@ -151,7 +151,7 @@ public class ZenTypeBoolObject extends ZenType { @Override public String getName() { - return "bool"; + return "bool?"; } @Override diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeByteObject.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeByteObject.java index 538362f..3b90bce 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeByteObject.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeByteObject.java @@ -184,7 +184,7 @@ public class ZenTypeByteObject extends ZenType { @Override public String getName() { - return "byte"; + return "byte?"; } @Override diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeDoubleObject.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeDoubleObject.java index f153b91..5b74a08 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeDoubleObject.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeDoubleObject.java @@ -190,7 +190,7 @@ public class ZenTypeDoubleObject extends ZenType { @Override public String getName() { - return "double"; + return "double?"; } @Override diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeFloatObject.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeFloatObject.java index fc62302..924a3a2 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeFloatObject.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeFloatObject.java @@ -190,7 +190,7 @@ public class ZenTypeFloatObject extends ZenType { @Override public String getName() { - return "float"; + return "float?"; } @Override diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeIntObject.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeIntObject.java index 6c2d1da..3538259 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeIntObject.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeIntObject.java @@ -190,7 +190,7 @@ public class ZenTypeIntObject extends ZenType { @Override public String getName() { - return "int"; + return "int?"; } @Override diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeNative.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeNative.java index eb74965..62e5ef2 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeNative.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeNative.java @@ -44,6 +44,7 @@ import stanhebben.zenscript.expression.ExpressionInvalid; import stanhebben.zenscript.expression.ExpressionNull; import stanhebben.zenscript.expression.ExpressionString; import stanhebben.zenscript.expression.partial.IPartialExpression; +import stanhebben.zenscript.type.casting.CastingNotNull; import stanhebben.zenscript.type.casting.CastingRuleNone; import stanhebben.zenscript.type.casting.CastingRuleNullableStaticMethod; import stanhebben.zenscript.type.casting.ICastingRuleDelegate; @@ -55,7 +56,6 @@ import stanhebben.zenscript.type.natives.JavaMethod; import stanhebben.zenscript.type.natives.ZenNativeCaster; import stanhebben.zenscript.type.natives.ZenNativeMember; import stanhebben.zenscript.type.natives.ZenNativeOperator; -import stanhebben.zenscript.util.AnyClassWriter; import static stanhebben.zenscript.util.AnyClassWriter.throwCastException; import static stanhebben.zenscript.util.AnyClassWriter.throwUnsupportedException; import stanhebben.zenscript.util.IAnyDefinition; @@ -422,6 +422,7 @@ public class ZenTypeNative extends ZenType { } } + rules.registerCastingRule(BOOL, new CastingNotNull(this)); rules.registerCastingRule(ANY, new CastingRuleNullableStaticMethod(JavaMethod.getStatic( getAnyClassName(environment), "valueOf", diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/casting/CastingNotNull.java b/ZenScript/src/main/java/stanhebben/zenscript/type/casting/CastingNotNull.java new file mode 100644 index 0000000..de9cade --- /dev/null +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/casting/CastingNotNull.java @@ -0,0 +1,48 @@ +/* + * 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 stanhebben.zenscript.type.casting; + +import org.objectweb.asm.Label; +import stanhebben.zenscript.compiler.IEnvironmentMethod; +import stanhebben.zenscript.type.ZenType; +import stanhebben.zenscript.util.MethodOutput; + +/** + * + * @author Stan + */ +public class CastingNotNull implements ICastingRule { + public ZenType fromType; + + public CastingNotNull(ZenType fromType) { + this.fromType = fromType; + } + + @Override + public void compile(IEnvironmentMethod method) { + MethodOutput output = method.getOutput(); + Label labelElse = new Label(); + Label labelAfter = new Label(); + + output.ifNull(labelElse); + output.iConst1(); + output.goTo(labelAfter); + output.label(labelElse); + output.iConst0(); + output.label(labelAfter); + } + + @Override + public ZenType getInputType() { + return fromType; + } + + @Override + public ZenType getResultingType() { + return ZenType.BOOL; + } +} diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/casting/CastingRuleDelegateMap.java b/ZenScript/src/main/java/stanhebben/zenscript/type/casting/CastingRuleDelegateMap.java index 6a63977..3f845d0 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/casting/CastingRuleDelegateMap.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/casting/CastingRuleDelegateMap.java @@ -14,14 +14,19 @@ import stanhebben.zenscript.type.ZenType; * @author Stan */ public class CastingRuleDelegateMap implements ICastingRuleDelegate { + private final ZenType forType; private final Map target; - public CastingRuleDelegateMap(Map target) { + public CastingRuleDelegateMap(ZenType forType, Map target) { + this.forType = forType; this.target = target; } @Override public void registerCastingRule(ZenType type, ICastingRule rule) { + // XXX: remove before release + //System.out.println("Registering casting rule to convert " + forType + " to " + type + ": " + rule); + target.put(type, rule); } } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/natives/JavaMethod.java b/ZenScript/src/main/java/stanhebben/zenscript/type/natives/JavaMethod.java index 4407e7d..9601b0e 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/natives/JavaMethod.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/natives/JavaMethod.java @@ -46,7 +46,7 @@ public class JavaMethod implements IJavaMethod { } public static IJavaMethod getStatic(String owner, String name, ZenType returnType, ZenType... arguments) { - return new JavaMethodGenerated(true, false, false, name, owner, returnType, arguments, new boolean[arguments.length]); + return new JavaMethodGenerated(true, false, false, owner, name, returnType, arguments, new boolean[arguments.length]); } public static IJavaMethod get(ITypeRegistry types, Method method) { diff --git a/common.gradle b/common.gradle index f5283a7..2e54632 100644 --- a/common.gradle +++ b/common.gradle @@ -1,3 +1,11 @@ +// ----------------------- +// configurable properties +// ----------------------- + +ext.mineTweakerVersion="3.0.7" +ext.mineTweakerDebug="true" + +// -- end of configurable properties repositories { mavenCentral() diff --git a/settings.gradle b/settings.gradle index c6261bf..25c7774 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,9 @@ rootProject.name = 'MineTweaker3' +// -------------- +// building stuff +// -------------- + // Find the directories containing a "build.gradle" file in the root directory // of the project. That is, every directory containing a "build.gradle" will // be automatically the subproject of this project.