From fc8bf619e196553076af7596579b7079da0fe5d0 Mon Sep 17 00:00:00 2001 From: Stan Hebben Date: Sun, 6 Jul 2014 15:02:37 +0200 Subject: [PATCH] - Fixed isOp function in 1.7.10 - Added ModOnly at some places - Fixed number casting rules --- MineTweaker3-MC164-Main/build.gradle | 2 +- .../main/java/minetweaker/mc164/MineTweakerMod.java | 2 +- .../mods/ic2/expand/IngredientExpansion.java | 3 ++- .../java/minetweaker/mods/ic2/machines/Canner.java | 12 ++++++------ .../java/minetweaker/mods/ic2/machines/Recycler.java | 1 - MineTweaker3-MC1710-Main/build.gradle | 2 +- .../main/java/minetweaker/mc1710/MineTweakerMod.java | 2 +- .../java/minetweaker/mc1710/server/MCServer.java | 7 +++++-- .../mods/ic2/expand/IngredientExpansion.java | 2 ++ .../java/minetweaker/mods/ic2/machines/Canner.java | 8 ++++---- MineTweaker3-MC172-Main/build.gradle | 2 +- .../main/java/minetweaker/mc172/MineTweakerMod.java | 2 +- .../mods/ic2/expand/IngredientExpansion.java | 2 ++ .../java/minetweaker/mods/ic2/machines/Canner.java | 8 ++++---- .../java/stanhebben/zenscript/type/ZenTypeByte.java | 2 +- .../stanhebben/zenscript/type/ZenTypeDouble.java | 2 +- .../java/stanhebben/zenscript/type/ZenTypeFloat.java | 2 +- .../java/stanhebben/zenscript/type/ZenTypeInt.java | 2 +- .../java/stanhebben/zenscript/type/ZenTypeLong.java | 2 +- .../java/stanhebben/zenscript/type/ZenTypeShort.java | 2 +- build.gradle | 6 +++--- 21 files changed, 40 insertions(+), 33 deletions(-) diff --git a/MineTweaker3-MC164-Main/build.gradle b/MineTweaker3-MC164-Main/build.gradle index 3b30a11..b2612f8 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.0" +version = "1.6.4-3.0.3" //group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = project.projectDir.name 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 51cf961..581561c 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java @@ -49,7 +49,7 @@ import net.minecraft.network.packet.Packet250CustomPayload; * * @author Stan Hebben */ -@Mod(modid = MineTweakerMod.MODID, version = MineTweakerMod.MCVERSION + "-3.0.0") +@Mod(modid = MineTweakerMod.MODID, version = MineTweakerMod.MCVERSION + "-3.0.3") @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-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 index ff70ee6..99647ce 100644 --- 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 @@ -6,7 +6,7 @@ package minetweaker.mods.ic2.expand; -import minetweaker.MineTweakerAPI; +import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemCondition; import minetweaker.api.item.IItemStack; @@ -19,6 +19,7 @@ import stanhebben.zenscript.annotations.ZenMethod; * @author Stan */ @ZenExpansion("minetweaker.item.IIngredient") +@ModOnly("IC2") public class IngredientExpansion { @ZenMethod public static IIngredient onlyIC2ChargeAtLeast(IIngredient ingredient, final int charge) { diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java index 8f0a46e..e1a5c5f 100644 --- a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java @@ -27,23 +27,23 @@ import stanhebben.zenscript.annotations.ZenMethod; @ModOnly("IC2") public class Canner { @ZenMethod - public static void addBottleRecipe(IIngredient container, IIngredient fill, IItemStack output) { + public static void addBottleRecipe(IItemStack output, IIngredient container, IIngredient fill) { MineTweakerAPI.apply(new AddBottleIngredientAction(container, fill, output)); } @ZenMethod - public static void addBottleRecipe(IIngredient container, ILiquidStack liquid, IItemStack output) { - MineTweakerAPI.logError("Not supported in this mod support version"); + public static void addBottleRecipe(IItemStack output, IIngredient container, ILiquidStack liquid) { + MineTweakerAPI.logWarning("Cannot use liquid inputs in 1.6.4"); } @ZenMethod - public static void addEnrichRecipe(ILiquidStack input, IIngredient additive, ILiquidStack output) { + public static void addEnrichRecipe(ILiquidStack output, ILiquidStack input, IIngredient additive) { MineTweakerAPI.apply(new AddEnrichIngredientAction(input, additive, output)); } @ZenMethod - public static void addEnrichRecipe(ILiquidStack input, ILiquidStack additive, ILiquidStack output) { - MineTweakerAPI.logError("Not supported in this mod support version"); + public static void addEnrichRecipe(ILiquidStack output, ILiquidStack input, ILiquidStack additive) { + MineTweakerAPI.logWarning("Cannot use liquid inputs in 1.6.4"); } private static class AddBottleIngredientAction extends OneWayAction { diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java index 5793e12..3fff0c3 100644 --- a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java @@ -14,7 +14,6 @@ import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.mods.ic2.IC2RecipeInput; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/MineTweaker3-MC1710-Main/build.gradle b/MineTweaker3-MC1710-Main/build.gradle index 4cd5aab..41e1a4d 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.0" +version = "1.7.10-3.0.3" archivesBaseName = project.projectDir.name dependencies { 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 fda49ad..5774507 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.0") +@Mod(modid = MineTweakerMod.MODID, version = MineTweakerMod.MCVERSION + "-3.0.3") 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/server/MCServer.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/MCServer.java index 27eb75c..f3182d7 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/MCServer.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/MCServer.java @@ -10,7 +10,6 @@ import java.util.Arrays; import java.util.List; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; -import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.player.IPlayer; import minetweaker.api.server.AbstractServer; @@ -54,7 +53,11 @@ public class MCServer extends AbstractServer { @Override public boolean isOp(IPlayer player) { UserListOps ops = MinecraftServer.getServer().getConfigurationManager().func_152603_m(); - return ops.func_152690_d() || ops.func_152700_a(player.getName()) != null; + if (server.isDedicatedServer()) { + return ops.func_152690_d() || ops.func_152700_a(player.getName()) != null; + } else { + return true; + } } private static IPlayer getPlayer(ICommandSender commandSender) { 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 index 1ef7155..99647ce 100644 --- 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 @@ -6,6 +6,7 @@ package minetweaker.mods.ic2.expand; +import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemCondition; import minetweaker.api.item.IItemStack; @@ -18,6 +19,7 @@ import stanhebben.zenscript.annotations.ZenMethod; * @author Stan */ @ZenExpansion("minetweaker.item.IIngredient") +@ModOnly("IC2") public class IngredientExpansion { @ZenMethod public static IIngredient onlyIC2ChargeAtLeast(IIngredient ingredient, final int charge) { diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java index ffecdc8..6c698be 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java @@ -28,22 +28,22 @@ import stanhebben.zenscript.annotations.ZenMethod; @ModOnly("IC2") public class Canner { @ZenMethod - public static void addBottleRecipe(IIngredient container, IIngredient fill, IItemStack output) { + public static void addBottleRecipe(IItemStack output, IIngredient container, IIngredient fill) { MineTweakerAPI.apply(new AddBottleIngredientAction(container, fill, output)); } @ZenMethod - public static void addBottleRecipe(IIngredient container, ILiquidStack liquid, IItemStack output) { + public static void addBottleRecipe(IItemStack output, IIngredient container, ILiquidStack liquid) { MineTweakerAPI.apply(new AddBottleLiquidAction(container, liquid, output)); } @ZenMethod - public static void addEnrichRecipe(ILiquidStack input, IIngredient additive, ILiquidStack output) { + public static void addEnrichRecipe(ILiquidStack output, ILiquidStack input, IIngredient additive) { MineTweakerAPI.apply(new AddEnrichIngredientAction(input, additive, output)); } @ZenMethod - public static void addEnrichRecipe(ILiquidStack input, ILiquidStack additive, ILiquidStack output) { + public static void addEnrichRecipe(ILiquidStack output, ILiquidStack input, ILiquidStack additive) { MineTweakerAPI.apply(new AddEnrichLiquidAction(input, additive, output)); } diff --git a/MineTweaker3-MC172-Main/build.gradle b/MineTweaker3-MC172-Main/build.gradle index 56c0f17..f89a019 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.0" +version = "1.7.2-3.0.3" archivesBaseName = project.projectDir.name dependencies { 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 24bcd4d..98f314d 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.0") +@Mod(modid = MineTweakerMod.MODID, version = MineTweakerMod.MCVERSION + "-3.0.3") public class MineTweakerMod { public static final String MODID = "MineTweaker3"; public static final String MCVERSION = "1.7.2"; 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 index 1ef7155..99647ce 100644 --- 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 @@ -6,6 +6,7 @@ package minetweaker.mods.ic2.expand; +import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemCondition; import minetweaker.api.item.IItemStack; @@ -18,6 +19,7 @@ import stanhebben.zenscript.annotations.ZenMethod; * @author Stan */ @ZenExpansion("minetweaker.item.IIngredient") +@ModOnly("IC2") public class IngredientExpansion { @ZenMethod public static IIngredient onlyIC2ChargeAtLeast(IIngredient ingredient, final int charge) { diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java index ffecdc8..6c698be 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java @@ -28,22 +28,22 @@ import stanhebben.zenscript.annotations.ZenMethod; @ModOnly("IC2") public class Canner { @ZenMethod - public static void addBottleRecipe(IIngredient container, IIngredient fill, IItemStack output) { + public static void addBottleRecipe(IItemStack output, IIngredient container, IIngredient fill) { MineTweakerAPI.apply(new AddBottleIngredientAction(container, fill, output)); } @ZenMethod - public static void addBottleRecipe(IIngredient container, ILiquidStack liquid, IItemStack output) { + public static void addBottleRecipe(IItemStack output, IIngredient container, ILiquidStack liquid) { MineTweakerAPI.apply(new AddBottleLiquidAction(container, liquid, output)); } @ZenMethod - public static void addEnrichRecipe(ILiquidStack input, IIngredient additive, ILiquidStack output) { + public static void addEnrichRecipe(ILiquidStack output, ILiquidStack input, IIngredient additive) { MineTweakerAPI.apply(new AddEnrichIngredientAction(input, additive, output)); } @ZenMethod - public static void addEnrichRecipe(ILiquidStack input, ILiquidStack additive, ILiquidStack output) { + public static void addEnrichRecipe(ILiquidStack output, ILiquidStack input, ILiquidStack additive) { MineTweakerAPI.apply(new AddEnrichLiquidAction(input, additive, output)); } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeByte.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeByte.java index a74a91f..ba99a97 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeByte.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeByte.java @@ -31,7 +31,7 @@ public class ZenTypeByte extends ZenType { @Override public boolean canCastImplicit(ZenType type, IEnvironmentGlobal environment) { int itype = type.getNumberType(); - return itype == NUM_BYTE + return itype != 0 || type == STRING || canCastExpansion(environment, type); } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeDouble.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeDouble.java index caca7a8..dfb08d4 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeDouble.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeDouble.java @@ -29,7 +29,7 @@ public class ZenTypeDouble extends ZenType { @Override public boolean canCastImplicit(ZenType type, IEnvironmentGlobal environment) { - return (type.getNumberType() != 0 && type.getNumberType() <= NUM_DOUBLE) + return (type.getNumberType() != 0 && type.getNumberType() == NUM_DOUBLE) || type == STRING || canCastExpansion(environment, type); } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeFloat.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeFloat.java index cfd423b..51abf2c 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeFloat.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeFloat.java @@ -29,7 +29,7 @@ public class ZenTypeFloat extends ZenType { @Override public boolean canCastImplicit(ZenType type, IEnvironmentGlobal environment) { - return (type.getNumberType() != 0 && type.getNumberType() <= NUM_FLOAT) + return (type.getNumberType() != 0 && type.getNumberType() >= NUM_FLOAT) || type == ZenTypeString.INSTANCE || canCastExpansion(environment, type); } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeInt.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeInt.java index 1d17399..c565fd1 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeInt.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeInt.java @@ -29,7 +29,7 @@ public class ZenTypeInt extends ZenType { @Override public boolean canCastImplicit(ZenType type, IEnvironmentGlobal environment) { - return (type.getNumberType() != 0 && type.getNumberType() <= NUM_INT) + return (type.getNumberType() != 0 && type.getNumberType() >= NUM_INT) || type == ZenTypeString.INSTANCE || canCastExpansion(environment, type); } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeLong.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeLong.java index 999be92..133e155 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeLong.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeLong.java @@ -29,7 +29,7 @@ public class ZenTypeLong extends ZenType { @Override public boolean canCastImplicit(ZenType type, IEnvironmentGlobal environment) { - return (type.getNumberType() != 0 && type.getNumberType() <= NUM_LONG) + return (type.getNumberType() != 0 && type.getNumberType() >= NUM_LONG) || type == ZenTypeString.INSTANCE || canCastExpansion(environment, type); } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeShort.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeShort.java index 44f6ad4..7b60796 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeShort.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeShort.java @@ -28,7 +28,7 @@ public class ZenTypeShort extends ZenType { @Override public boolean canCastImplicit(ZenType type, IEnvironmentGlobal environment) { - return (type.getNumberType() != 0 && type.getNumberType() <= NUM_SHORT) + return (type.getNumberType() != 0 && type.getNumberType() >= NUM_SHORT) || type == ZenTypeString.INSTANCE || canCastExpansion(environment, type); } diff --git a/build.gradle b/build.gradle index 45ca9ea..ccf52c8 100644 --- a/build.gradle +++ b/build.gradle @@ -29,13 +29,13 @@ task assembleMC1710(type: Jar, dependsOn: [\ ':ZenScript:build', ':MineTweaker3-API:build', ':MineTweaker3-MC1710-Main:build', - ':MineTweaker3-MC1710-Mod-IC2:build'/*, - ':MineTweaker3-MC1710-Mod-NEI:build'*/]) { + ':MineTweaker3-MC1710-Mod-IC2:build', + ':MineTweaker3-MC1710-Mod-NEI:build']) { from zipTree(project(":ZenScript").jar.archivePath) from zipTree(project(':MineTweaker3-API').jar.archivePath) from zipTree(project(':MineTweaker3-MC1710-Main').jar.archivePath) from zipTree(project(':MineTweaker3-MC1710-Mod-IC2').jar.archivePath) -/* from zipTree(project(':MineTweaker3-MC1710-Mod-NEI').jar.archivePath)*/ + from zipTree(project(':MineTweaker3-MC1710-Mod-NEI').jar.archivePath) } task assembleMC172(type: Jar, dependsOn: [\