mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git
synced 2026-09-25 14:30:47 +00:00
#664 Cannot expand fillStyles in DefineShape tags in raw edit fixed + some misssing files from the previous commit
This commit is contained in:
@@ -68,7 +68,6 @@ import com.jpexs.decompiler.flash.exporters.settings.ShapeExportSettings;
|
||||
import com.jpexs.decompiler.flash.exporters.settings.SoundExportSettings;
|
||||
import com.jpexs.decompiler.flash.exporters.settings.TextExportSettings;
|
||||
import com.jpexs.decompiler.flash.gui.Main;
|
||||
import com.jpexs.decompiler.flash.gui.abc.ASMSourceEditorPane;
|
||||
import com.jpexs.decompiler.flash.helpers.collections.MyEntry;
|
||||
import com.jpexs.decompiler.flash.importers.BinaryDataImporter;
|
||||
import com.jpexs.decompiler.flash.importers.ImageImporter;
|
||||
|
||||
@@ -792,7 +792,19 @@ public class GenericTagTreePanel extends GenericTagPanel {
|
||||
FieldNode condnode = (FieldNode) (mod).getNodeByPath(fulldf);
|
||||
|
||||
if (condnode != null) {
|
||||
fieldMap.put(sf, (Boolean) ReflectionTools.getValue(condnode.obj, condnode.field, condnode.index));
|
||||
Object value = ReflectionTools.getValue(condnode.obj, condnode.field, condnode.index);
|
||||
if (value instanceof Boolean) {
|
||||
fieldMap.put(sf, (Boolean) value);
|
||||
} else if (value instanceof Integer) {
|
||||
int intValue = (int) value;
|
||||
boolean found = false;
|
||||
for (int i : cond.options()) {
|
||||
if (i == intValue) {
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
fieldMap.put(sf, found);
|
||||
}
|
||||
} else {
|
||||
fieldMap.put(sf, true);
|
||||
}
|
||||
|
||||
@@ -869,9 +869,9 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener, Se
|
||||
body.max_stack = 1;
|
||||
body.exceptions = new ABCException[0];
|
||||
AVM2Code code = new AVM2Code();
|
||||
code.code.add(new AVM2Instruction(0, new GetLocal0Ins(), new int[0], new byte[0]));
|
||||
code.code.add(new AVM2Instruction(0, new PushScopeIns(), new int[0], new byte[0]));
|
||||
code.code.add(new AVM2Instruction(0, new ReturnVoidIns(), new int[0], new byte[0]));
|
||||
code.code.add(new AVM2Instruction(0, new GetLocal0Ins(), new int[0]));
|
||||
code.code.add(new AVM2Instruction(0, new PushScopeIns(), new int[0]));
|
||||
code.code.add(new AVM2Instruction(0, new ReturnVoidIns(), new int[0]));
|
||||
body.code = code;
|
||||
Traits traits = new Traits();
|
||||
traits.traits = new ArrayList<>();
|
||||
|
||||
@@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.gui.abc;
|
||||
import com.jpexs.decompiler.flash.abc.ABC;
|
||||
import com.jpexs.decompiler.flash.abc.ABCInputStream;
|
||||
import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
|
||||
import com.jpexs.decompiler.flash.abc.avm2.ConstantPool;
|
||||
import com.jpexs.decompiler.flash.abc.avm2.UnknownInstructionCode;
|
||||
import com.jpexs.decompiler.flash.abc.avm2.graph.AVM2Graph;
|
||||
import com.jpexs.decompiler.flash.abc.avm2.parser.ParseException;
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
package com.jpexs.decompiler.flash.gui.abc;
|
||||
|
||||
import com.jpexs.decompiler.flash.abc.ABC;
|
||||
import com.jpexs.decompiler.flash.abc.avm2.ConstantPool;
|
||||
import com.jpexs.decompiler.flash.abc.types.traits.Trait;
|
||||
import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
|
||||
import com.jpexs.decompiler.flash.gui.AppStrings;
|
||||
|
||||
Reference in New Issue
Block a user