From 55c3630bf32d9fe9647d94440920a68208ed33b7 Mon Sep 17 00:00:00 2001 From: Stan Hebben Date: Sun, 6 Jul 2014 13:38:52 +0200 Subject: [PATCH] - Added IC2 charge conditions and transformers - Fixed 1.6.4 frantically reloading scripts - Fixed 1.7.10 chat messages --- .../providers/ScriptProviderMemory.java | 2 + .../mc164/network/MCPacketHandler.java | 6 ++- .../mods/ic2/expand/IngredientExpansion.java | 52 +++++++++++++++++++ .../mods/ic2/expand/ItemExpansion.java | 1 + .../minetweaker/mc1710/player/MCPlayer.java | 2 +- .../mods/ic2/expand/IngredientExpansion.java | 51 ++++++++++++++++++ .../mods/ic2/expand/IngredientExpansion.java | 51 ++++++++++++++++++ 7 files changed, 162 insertions(+), 3 deletions(-) create mode 100644 MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java create mode 100644 MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java create mode 100644 MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderMemory.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderMemory.java index 82b387d..21f5937 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderMemory.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderMemory.java @@ -50,6 +50,8 @@ public class ScriptProviderMemory implements IScriptProvider { while (script.next()) { String name = script.getName(); byte[] data = FileUtil.read(script.open()); + if (data.length == 0) continue; // skip empty files + deflaterData.writeUTF(name); deflaterData.writeInt(data.length); deflaterData.write(data); diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/network/MCPacketHandler.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/network/MCPacketHandler.java index 52f049d..e6db71a 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/network/MCPacketHandler.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/network/MCPacketHandler.java @@ -35,8 +35,10 @@ public class MCPacketHandler implements IPacketHandler { if (packet.channel.equals(CHANNEL_SERVERSCRIPT)) { System.out.println("Received script data: " + packet.data.length + " bytes"); - MineTweakerImplementationAPI.setScriptProvider(new ScriptProviderMemory(packet.data)); - MineTweakerImplementationAPI.reload(); + if (MineTweakerAPI.server == null) { + MineTweakerImplementationAPI.setScriptProvider(new ScriptProviderMemory(packet.data)); + MineTweakerImplementationAPI.reload(); + } } else if (packet.channel.equals(CHANNEL_OPENBROWSER)) { String url = UTF8.decode(ByteBuffer.wrap(packet.data)).toString().trim(); if(Desktop.isDesktopSupported()){ diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java new file mode 100644 index 0000000..ff70ee6 --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java @@ -0,0 +1,52 @@ +/* + * 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.mods.ic2.expand; + +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemCondition; +import minetweaker.api.item.IItemStack; +import minetweaker.api.item.IItemTransformer; +import stanhebben.zenscript.annotations.ZenExpansion; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan + */ +@ZenExpansion("minetweaker.item.IIngredient") +public class IngredientExpansion { + @ZenMethod + public static IIngredient onlyIC2ChargeAtLeast(IIngredient ingredient, final int charge) { + return ingredient.only(new IItemCondition() { + @Override + public boolean matches(IItemStack stack) { + return ItemExpansion.getIC2Charge(stack) >= charge; + } + }); + } + + @ZenMethod + public static IIngredient onlyIC2ChargeAtMost(IIngredient ingredient, final int charge) { + return ingredient.only(new IItemCondition() { + @Override + public boolean matches(IItemStack stack) { + return ItemExpansion.getIC2Charge(stack) <= charge; + } + }); + } + + @ZenMethod + public static IIngredient transformIC2Discharge(IIngredient ingredient, final int amount) { + return ingredient.transform(new IItemTransformer() { + @Override + public IItemStack transform(IItemStack item) { + return ItemExpansion.ic2Discharge(item, amount, 0).withAmount(item.getAmount() + 1); + } + }); + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java index 43ba48b..aff2140 100644 --- a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java @@ -2,6 +2,7 @@ package minetweaker.mods.ic2.expand; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; +import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java index 0041d93..019569c 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java @@ -56,7 +56,7 @@ public class MCPlayer implements IPlayer { @Override public void sendChat(IChatMessage message) { - Object internal = message; + Object internal = message.getInternal(); if (!(internal instanceof IChatComponent)) { MineTweakerAPI.logError("not a valid chat message"); return; diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java new file mode 100644 index 0000000..1ef7155 --- /dev/null +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java @@ -0,0 +1,51 @@ +/* + * 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.mods.ic2.expand; + +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemCondition; +import minetweaker.api.item.IItemStack; +import minetweaker.api.item.IItemTransformer; +import stanhebben.zenscript.annotations.ZenExpansion; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan + */ +@ZenExpansion("minetweaker.item.IIngredient") +public class IngredientExpansion { + @ZenMethod + public static IIngredient onlyIC2ChargeAtLeast(IIngredient ingredient, final int charge) { + return ingredient.only(new IItemCondition() { + @Override + public boolean matches(IItemStack stack) { + return ItemExpansion.getIC2Charge(stack) >= charge; + } + }); + } + + @ZenMethod + public static IIngredient onlyIC2ChargeAtMost(IIngredient ingredient, final int charge) { + return ingredient.only(new IItemCondition() { + @Override + public boolean matches(IItemStack stack) { + return ItemExpansion.getIC2Charge(stack) <= charge; + } + }); + } + + @ZenMethod + public static IIngredient transformIC2Discharge(IIngredient ingredient, final int amount) { + return ingredient.transform(new IItemTransformer() { + @Override + public IItemStack transform(IItemStack item) { + return ItemExpansion.ic2Discharge(item, amount, 0).withAmount(item.getAmount() + 1); + } + }); + } +} diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java new file mode 100644 index 0000000..1ef7155 --- /dev/null +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java @@ -0,0 +1,51 @@ +/* + * 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.mods.ic2.expand; + +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemCondition; +import minetweaker.api.item.IItemStack; +import minetweaker.api.item.IItemTransformer; +import stanhebben.zenscript.annotations.ZenExpansion; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan + */ +@ZenExpansion("minetweaker.item.IIngredient") +public class IngredientExpansion { + @ZenMethod + public static IIngredient onlyIC2ChargeAtLeast(IIngredient ingredient, final int charge) { + return ingredient.only(new IItemCondition() { + @Override + public boolean matches(IItemStack stack) { + return ItemExpansion.getIC2Charge(stack) >= charge; + } + }); + } + + @ZenMethod + public static IIngredient onlyIC2ChargeAtMost(IIngredient ingredient, final int charge) { + return ingredient.only(new IItemCondition() { + @Override + public boolean matches(IItemStack stack) { + return ItemExpansion.getIC2Charge(stack) <= charge; + } + }); + } + + @ZenMethod + public static IIngredient transformIC2Discharge(IIngredient ingredient, final int amount) { + return ingredient.transform(new IItemTransformer() { + @Override + public IItemStack transform(IItemStack item) { + return ItemExpansion.ic2Discharge(item, amount, 0).withAmount(item.getAmount() + 1); + } + }); + } +}