mirror of
https://github.com/GTNewHorizons/CraftTweaker.git
synced 2026-11-18 19:29:08 +00:00
Added a few checks
This commit is contained in:
1 parent
ab1eb5cff5
commit
2c24f3f77a
5 files changed
+20
-32
No files matched your search
@@ -685,7 +685,9 @@ public class MineTweakerImplementationAPI {
|
||||
platform.distributeScripts(MineTweakerAPI.tweaker.getScriptData());
|
||||
}
|
||||
|
||||
|
||||
ONPOSTRELOAD.publish(new ReloadEvent());
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -720,6 +722,7 @@ public class MineTweakerImplementationAPI {
|
||||
|
||||
}
|
||||
|
||||
|
||||
// ######################
|
||||
// ### Action classes ###
|
||||
// ######################
|
||||
|
||||
@@ -1,17 +1,12 @@
|
||||
package minetweaker.api.item;
|
||||
|
||||
import java.util.List;
|
||||
import minetweaker.api.block.IBlock;
|
||||
import minetweaker.api.data.IData;
|
||||
import minetweaker.api.liquid.ILiquidStack;
|
||||
import minetweaker.api.oredict.IOreDictEntry;
|
||||
import stanhebben.zenscript.annotations.OperatorType;
|
||||
import stanhebben.zenscript.annotations.ZenCaster;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
import stanhebben.zenscript.annotations.ZenGetter;
|
||||
import stanhebben.zenscript.annotations.ZenMethod;
|
||||
import stanhebben.zenscript.annotations.ZenOperator;
|
||||
import stanhebben.zenscript.annotations.ZenSetter;
|
||||
import stanhebben.zenscript.annotations.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Contains an item stack. An item stack consists of an item definition, a meta
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
|
||||
package minetweaker.api.tooltip;
|
||||
|
||||
import java.util.List;
|
||||
import minetweaker.IUndoableAction;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.api.formatting.IFormattedText;
|
||||
@@ -17,6 +16,8 @@ import minetweaker.api.util.IngredientMap.IngredientMapEntry;
|
||||
import stanhebben.zenscript.annotations.ZenExpansion;
|
||||
import stanhebben.zenscript.annotations.ZenMethod;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
@@ -52,7 +53,6 @@ public class IngredientTooltips {
|
||||
private final IIngredient ingredient;
|
||||
private final IFormattedText tooltip;
|
||||
private final boolean shift;
|
||||
|
||||
private IngredientMapEntry<IFormattedText> entry;
|
||||
|
||||
public AddTooltipAction(IIngredient ingredient, IFormattedText tooltip, boolean shift) {
|
||||
|
||||
@@ -34,7 +34,9 @@ public class ForgeEventHandler{
|
||||
for(IFormattedText tooltip : IngredientTooltips.getTooltips(itemStack)){
|
||||
ev.getToolTip().add(((IMCFormattedString) tooltip).getTooltipString());
|
||||
}
|
||||
|
||||
if (!Keyboard.isCreated()) {
|
||||
return;
|
||||
}
|
||||
if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)){
|
||||
for(IFormattedText tooltip : IngredientTooltips.getShiftTooltips(itemStack)){
|
||||
ev.getToolTip().add(((IMCFormattedString) tooltip).getTooltipString());
|
||||
|
||||
@@ -1,28 +1,9 @@
|
||||
package stanhebben.zenscript;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.Reader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Enumeration;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipFile;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import stanhebben.zenscript.compiler.ClassNameGenerator;
|
||||
import stanhebben.zenscript.compiler.EnvironmentClass;
|
||||
import stanhebben.zenscript.compiler.EnvironmentGlobal;
|
||||
import stanhebben.zenscript.compiler.EnvironmentMethod;
|
||||
import stanhebben.zenscript.compiler.IEnvironmentGlobal;
|
||||
import stanhebben.zenscript.compiler.IEnvironmentMethod;
|
||||
import stanhebben.zenscript.compiler.*;
|
||||
import stanhebben.zenscript.definitions.ParsedFunction;
|
||||
import stanhebben.zenscript.definitions.ParsedFunctionArgument;
|
||||
import stanhebben.zenscript.statements.Statement;
|
||||
@@ -31,6 +12,12 @@ import stanhebben.zenscript.symbols.SymbolArgument;
|
||||
import stanhebben.zenscript.symbols.SymbolZenStaticMethod;
|
||||
import stanhebben.zenscript.type.ZenType;
|
||||
import stanhebben.zenscript.util.MethodOutput;
|
||||
|
||||
import java.io.*;
|
||||
import java.util.*;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipFile;
|
||||
|
||||
import static stanhebben.zenscript.util.ZenTypeUtil.internal;
|
||||
|
||||
/**
|
||||
@@ -149,7 +136,7 @@ public class ZenModule {
|
||||
if (debug) {
|
||||
try {
|
||||
File outputDir = new File("generated");
|
||||
outputDir.mkdir();
|
||||
outputDir.mkdir();
|
||||
|
||||
for (String className : environmentGlobal.getClassNames()) {
|
||||
File outputFile = new File(outputDir, className.replace('.', '/') + ".class");
|
||||
@@ -289,6 +276,7 @@ public class ZenModule {
|
||||
*/
|
||||
public Runnable getMain() {
|
||||
try {
|
||||
|
||||
return (Runnable) classLoader.loadClass("__ZenMain__").newInstance();
|
||||
} catch (InstantiationException e) {
|
||||
return null;
|
||||
|
||||
Reference in new issue
Block a user