LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-17 10:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Iggy - reading and writing ABC

Browse Source
This commit is contained in:
Jindra Petřík
2016-12-12 12:14:11 +01:00
parent 7725a77ad5
commit 22695b985b
4 changed files with 70 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyDeclStrings.java
View File

@@ -16,8 +16,8 @@ public class IggyDeclStrings implements StructureInterface {
@IggyFieldType(DataType.uint64_t)
long one;
@IggyFieldType(DataType.uint32_t)
long size;
//@IggyFieldType(DataType.uint32_t)
//long size;
@IggyArrayFieldType(value = DataType.uint8_t, count = 3)
byte xxx[];
@IggyArrayFieldType(value = DataType.uint8_t, countField = "size")
@@ -28,6 +28,14 @@ public class IggyDeclStrings implements StructureInterface {
@IggyFieldType(DataType.uint64_t)
long zero;
public byte[] getData() {
return data;
}
public void setData(byte[] data) {
this.data = data;
}
public IggyDeclStrings(ReadDataStreamInterface stream) throws IOException {
readFromDataStream(stream);
}
@@ -35,7 +43,7 @@ public class IggyDeclStrings implements StructureInterface {
@Override
public void readFromDataStream(ReadDataStreamInterface s) throws IOException {
one = s.readUI64();
size = s.readUI32();
long size = s.readUI32();
xxx = s.readBytes(3);
data = s.readBytes((int) size);
if ((15 + size) % 8 != 0) {
@@ -54,13 +62,17 @@ public class IggyDeclStrings implements StructureInterface {
public void writeToDataStream(WriteDataStreamInterface s) throws IOException {
IggyIndexBuilder ib = s.getIndexing();
s.writeUI64(one);
s.writeUI32(size);
s.writeBytes(xxx);
s.writeUI32(data.length);
ib.writeLengthCustom(15, new int[]{0x00, 0x08}, new int[]{2, 5});
ib.writeLengthUI32(size);
s.writeBytes(xxx);
s.writeBytes(data);
ib.writeConstLength(IggyIndexBuilder.CONST_SEQUENCE_SIZE);
ib.writeLengthUI32(data.length);
if ((15 + data.length) % 8 != 0) {
byte[] padd = new byte[((int) (((15 + data.length) / 8 + 1) * 8 - 15 - data.length))];
s.writeBytes(padd);
}
s.writeBytes(padd);
ib.writeConstLength(IggyIndexBuilder.CONST_SEQUENCE_SIZE);
s.writeUI64(one);
s.writeUI64(zero);
}

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggySwf.java
View File

@@ -332,4 +332,8 @@ public class IggySwf implements StructureInterface {
return sb.toString();
}
public IggyDeclStrings getDeclStrings() {
return decl_strings;
}
}

30
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/conversion/IggyToSwfConvertor.java
View File

@@ -2,17 +2,20 @@ package com.jpexs.decompiler.flash.iggy.conversion;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFCompression;
import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.iggy.IggyShape;
import com.jpexs.decompiler.flash.iggy.IggyCharKerning;
import com.jpexs.decompiler.flash.iggy.IggyShapeNode;
import com.jpexs.decompiler.flash.iggy.IggyCharOffset;
import com.jpexs.decompiler.flash.iggy.IggyCharAdvances;
import com.jpexs.decompiler.flash.iggy.IggyDeclStrings;
import com.jpexs.decompiler.flash.iggy.IggyFile;
import com.jpexs.decompiler.flash.iggy.IggyFont;
import com.jpexs.decompiler.flash.iggy.IggySwf;
import com.jpexs.decompiler.flash.iggy.IggyText;
import com.jpexs.decompiler.flash.tags.DefineEditTextTag;
import com.jpexs.decompiler.flash.tags.DefineFont2Tag;
import com.jpexs.decompiler.flash.tags.DoABC2Tag;
import com.jpexs.decompiler.flash.tags.EndTag;
import com.jpexs.decompiler.flash.tags.FileAttributesTag;
import com.jpexs.decompiler.flash.types.FILLSTYLEARRAY;
@@ -26,7 +29,9 @@ import com.jpexs.decompiler.flash.types.shaperecords.EndShapeRecord;
import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD;
import com.jpexs.decompiler.flash.types.shaperecords.StraightEdgeRecord;
import com.jpexs.decompiler.flash.types.shaperecords.StyleChangeRecord;
import com.jpexs.helpers.ByteArrayRange;
import java.awt.Color;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -36,6 +41,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
*
@@ -88,7 +95,7 @@ public class IggyToSwfConvertor {
swf.version = 10; //FIXME
FileAttributesTag fat = new FileAttributesTag(swf);
fat.actionScript3 = false;
fat.actionScript3 = true;
fat.hasMetadata = false;
fat.useNetwork = false;
swf.addTag(fat);
@@ -196,6 +203,27 @@ public class IggyToSwfConvertor {
swf.addTag(textTag);
}
IggyDeclStrings declStrings = iggySwf.getDeclStrings();
if (declStrings != null) {
byte[] abcData = declStrings.getData();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
baos.write(new byte[]{1, 0, 0, 0, 0, 0x10, 0, 0x2E});
baos.write(abcData);
} catch (IOException ex) {
//should not happen
}
byte[] fullAbcTagData = baos.toByteArray();
try {
DoABC2Tag nabc = new DoABC2Tag(new SWFInputStream(swf, fullAbcTagData), new ByteArrayRange(fullAbcTagData));
nabc.setModified(true);
swf.addTag(nabc);
} catch (IOException ex) {
//ignore
}
}
swf.addTag(
new EndTag(swf));
swf.setModified(

18
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/conversion/SwfToIggyConvertor.java
View File

@@ -1,6 +1,7 @@
package com.jpexs.decompiler.flash.iggy.conversion;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFOutputStream;
import com.jpexs.decompiler.flash.iggy.IggyCharAdvances;
import com.jpexs.decompiler.flash.iggy.IggyCharIndices;
import com.jpexs.decompiler.flash.iggy.IggyCharKerning;
@@ -11,11 +12,14 @@ import com.jpexs.decompiler.flash.iggy.IggySwf;
import com.jpexs.decompiler.flash.iggy.IggyText;
import com.jpexs.decompiler.flash.tags.DefineEditTextTag;
import com.jpexs.decompiler.flash.tags.DefineFont2Tag;
import com.jpexs.decompiler.flash.tags.DoABC2Tag;
import com.jpexs.decompiler.flash.tags.Tag;
import com.jpexs.decompiler.flash.types.KERNINGRECORD;
import com.jpexs.decompiler.flash.types.SHAPE;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@@ -31,6 +35,7 @@ public class SwfToIggyConvertor {
public static void updateIggy(IggySwf iggySwf, SWF swf) throws IOException {
List<DefineFont2Tag> fontTags = new ArrayList<>();
List<DefineEditTextTag> textTags = new ArrayList<>();
List<DoABC2Tag> abcTags = new ArrayList<>();
for (Tag t : swf.getTags()) {
if (t instanceof DefineFont2Tag) {
@@ -39,6 +44,12 @@ public class SwfToIggyConvertor {
if (t instanceof DefineEditTextTag) {
textTags.add((DefineEditTextTag) t);
}
if (t instanceof DoABC2Tag) {
abcTags.add((DoABC2Tag) t);
}
}
if (abcTags.size() > 1) {
throw new IOException("Cannot save more than one ABC tag");
}
int fontCount = iggySwf.getFonts().size();
if (fontCount != fontTags.size()) {
@@ -59,6 +70,13 @@ public class SwfToIggyConvertor {
DefineEditTextTag textTag = textTags.get(i);
SwfToIggyConvertor.updateIggyText(iggyText, textTag);
}
if (!abcTags.isEmpty()) {
DoABC2Tag abcTag = abcTags.get(0);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
byte abcTagData[] = abcTag.getData();
byte declData[] = Arrays.copyOfRange(abcTagData, 4/*UI32 flags*/ + 1 /*empty string as name*/ + 3 /*versions, leaving one zero intact*/, abcTagData.length);
iggySwf.getDeclStrings().setData(declData);
}
}
public static void updateIggyText(IggyText iggyText, DefineEditTextTag textTag) {