diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptAddActionScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptAddActionScreen.java index 829d5b3..385538a 100644 --- a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptAddActionScreen.java +++ b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptAddActionScreen.java @@ -45,6 +45,7 @@ public ScriptAddActionScreen(Script script, int insertIndex, ScriptActionCategor for (ScriptActionType type : ScriptActionType.values()) { if (type.getCategory() != category) continue; + if (type.isDeprecated()) continue; CItem item = new CItem(x, y, type.getIcon()); item.setClickListener((btn) -> { diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditScreen.java index f45a260..eb73a39 100644 --- a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditScreen.java +++ b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditScreen.java @@ -57,8 +57,11 @@ public ScriptEditScreen(Script script) { @Override public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) { Rectangle b = getBounds(); + if (b.contains(mouseX, mouseY)) { - DrawableHelper.fill(stack, b.x, b.y, b.x + b.width, b.y + b.height, 0x33000000); + int color = 0x33000000; + + DrawableHelper.fill(stack, b.x, b.y, b.x + b.width, b.y + b.height, color); } } @@ -123,7 +126,21 @@ public Rectangle getBounds() { public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) { Rectangle b = getBounds(); if (b.contains(mouseX, mouseY)) { - DrawableHelper.fill(stack, b.x, b.y, b.x + b.width, b.y + b.height, 0x33000000); + int color = 0x33000000; + + if(sa.getType().isDeprecated()) + { + color = 0x80FF0000; + } + + DrawableHelper.fill(stack, b.x, b.y, b.x + b.width, b.y + b.height, color); + } + else + { + if(sa.getType().isDeprecated()) + { + DrawableHelper.fill(stack, b.x, b.y, b.x + b.width, b.y + b.height, 0x33FF0000); + } } } diff --git a/src/main/java/io/github/techstreet/dfscript/script/Script.java b/src/main/java/io/github/techstreet/dfscript/script/Script.java index 6841ed4..8926955 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/Script.java +++ b/src/main/java/io/github/techstreet/dfscript/script/Script.java @@ -28,7 +28,7 @@ import org.apache.logging.log4j.Logger; public class Script { - public static int scriptVersion = 2; + public static int scriptVersion = 3; private String name; private String owner; @@ -245,6 +245,19 @@ public ScriptContext getContext() { return context; } + public void replaceAction(ScriptActionType oldAction, ScriptActionType newAction) { + for(int i = 0; i < parts.size(); i++) + { + if(parts.get(i) instanceof ScriptAction) + { + if(((ScriptAction) parts.get(i)).getType() == oldAction) + { + parts.set(i, ((ScriptAction) parts.get(i)).setType(newAction)); + } + } + } + } + public static class Serializer implements JsonSerializer