LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-28 20:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct adding new subtags (CharacterId tags)

Browse Source
This commit is contained in:
Jindra Petřík
2015-04-18 06:06:12 +02:00
parent 642b6827db
commit 76bd6e8df6
47 changed files with 275 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java
View File

@@ -120,4 +120,9 @@ public class CSMTextSettingsTag extends Tag implements CharacterIdTag {
public int getCharacterId() {
return textID;
}
@Override
public void setCharacterId(int characterId) {
this.textID = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBinaryDataTag.java
View File

@@ -139,4 +139,9 @@ public class DefineBinaryDataTag extends CharacterTag {
}
return false;
}
@Override
public void setCharacterId(int characterId) {
this.tag = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java
View File

@@ -124,4 +124,9 @@ public class DefineBitsJPEG2Tag extends ImageTag implements AloneTag {
}
return baos.toByteArray();
}
@Override
public void setCharacterId(int characterId) {
this.characterID = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java
View File

@@ -161,4 +161,9 @@ public class DefineBitsJPEG3Tag extends ImageTag implements AloneTag {
}
return baos.toByteArray();
}
@Override
public void setCharacterId(int characterId) {
this.characterID = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java
View File

@@ -171,4 +171,9 @@ public class DefineBitsJPEG4Tag extends ImageTag implements AloneTag {
imageData = sis.readByteRangeEx(alphaDataOffset, "imageData");
bitmapAlphaData = sis.readByteRangeEx(sis.available(), "bitmapAlphaData");
}
@Override
public void setCharacterId(int characterId) {
this.characterID = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java
View File

@@ -277,4 +277,9 @@ public class DefineBitsLossless2Tag extends ImageTag implements AloneTag {
cachedImage = bi;
return bi;
}
@Override
public void setCharacterId(int characterId) {
this.characterID = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java
View File

@@ -279,4 +279,9 @@ public class DefineBitsLosslessTag extends ImageTag implements AloneTag {
public String getImageFormat() {
return "png";
}
@Override
public void setCharacterId(int characterId) {
this.characterID = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java
View File

@@ -137,4 +137,9 @@ public class DefineBitsTag extends ImageTag implements TagChangedListener {
public void handleEvent(Tag tag) {
clearCache();
}
@Override
public void setCharacterId(int characterId) {
this.characterID = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java
View File

@@ -323,4 +323,9 @@ public class DefineButton2Tag extends ButtonTag implements ASMSourceContainer {
timeline.addFrame(frameHit);
return timeline;
}
@Override
public void setCharacterId(int characterId) {
this.buttonId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java
View File

@@ -93,4 +93,9 @@ public class DefineButtonCxformTag extends Tag implements CharacterIdTag {
public int getCharacterId() {
return buttonId;
}
@Override
public void setCharacterId(int characterId) {
this.buttonId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java
View File

@@ -140,4 +140,9 @@ public class DefineButtonSoundTag extends Tag implements CharacterIdTag {
buttonSoundInfo3 = sis.readSOUNDINFO("buttonSoundInfo3");
}
}
@Override
public void setCharacterId(int characterId) {
this.buttonId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java
View File

@@ -413,4 +413,9 @@ public class DefineButtonTag extends ButtonTag implements ASMSource {
public Tag getSourceTag() {
return this;
}
@Override
public void setCharacterId(int characterId) {
this.buttonId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java
View File

@@ -1124,4 +1124,9 @@ public class DefineEditTextTag extends TextTag {
public String toHtmlCanvas(double unitDivisor) {
return render(true, null, new Matrix(), new ColorTransform());
}
@Override
public void setCharacterId(int characterId) {
this.characterID = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java
View File

@@ -500,4 +500,9 @@ public class DefineFont2Tag extends FontTag {
}
return kerningAdjustment;
}
@Override
public void setCharacterId(int characterId) {
this.fontId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java
View File

@@ -515,4 +515,9 @@ public class DefineFont3Tag extends FontTag {
}
return kerningAdjustment;
}
@Override
public void setCharacterId(int characterId) {
this.fontId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java
View File

@@ -105,4 +105,9 @@ public class DefineFont4Tag extends CharacterTag {
}
return baos.toByteArray();
}
@Override
public void setCharacterId(int characterId) {
this.fontID = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java
View File

@@ -103,4 +103,9 @@ public class DefineFontAlignZonesTag extends Tag implements CharacterIdTag {
public int getCharacterId() {
return fontID;
}
@Override
public void setCharacterId(int characterId) {
this.fontID = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java
View File

@@ -151,4 +151,9 @@ public class DefineFontInfo2Tag extends Tag implements CharacterIdTag {
public int getCharacterId() {
return fontID;
}
@Override
public void setCharacterId(int characterId) {
this.fontID = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java
View File

@@ -152,4 +152,9 @@ public class DefineFontInfoTag extends Tag implements CharacterIdTag {
public int getCharacterId() {
return fontId;
}
@Override
public void setCharacterId(int characterId) {
this.fontId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontNameTag.java
View File

@@ -85,4 +85,9 @@ public class DefineFontNameTag extends Tag implements CharacterIdTag {
public int getCharacterId() {
return fontId;
}
@Override
public void setCharacterId(int characterId) {
this.fontId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java
View File

@@ -361,4 +361,9 @@ public class DefineFontTag extends FontTag {
public int getCharKerningAdjustment(char c1, char c2) {
return 0;
}
@Override
public void setCharacterId(int characterId) {
this.fontId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineMorphShape2Tag.java
View File

@@ -412,4 +412,9 @@ public class DefineMorphShape2Tag extends MorphShapeTag {
return cmse.getShapeData();
}
@Override
public void setCharacterId(int characterId) {
this.characterId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java
View File

@@ -388,4 +388,9 @@ public class DefineMorphShapeTag extends MorphShapeTag {
return cmse.getShapeData();
}
@Override
public void setCharacterId(int characterId) {
this.characterId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java
View File

@@ -84,4 +84,9 @@ public class DefineScalingGridTag extends Tag implements CharacterIdTag {
public int getCharacterId() {
return characterId;
}
@Override
public void setCharacterId(int characterId) {
this.characterId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape2Tag.java
View File

@@ -148,4 +148,9 @@ public class DefineShape2Tag extends ShapeTag {
public boolean isSingleFrame() {
return true;
}
@Override
public void setCharacterId(int characterId) {
this.shapeId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape3Tag.java
View File

@@ -148,4 +148,9 @@ public class DefineShape3Tag extends ShapeTag {
public boolean isSingleFrame() {
return true;
}
@Override
public void setCharacterId(int characterId) {
this.shapeId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape4Tag.java
View File

@@ -172,4 +172,9 @@ public class DefineShape4Tag extends ShapeTag {
public boolean isSingleFrame() {
return true;
}
@Override
public void setCharacterId(int characterId) {
this.shapeId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShapeTag.java
View File

@@ -146,4 +146,9 @@ public class DefineShapeTag extends ShapeTag {
public boolean isSingleFrame() {
return true;
}
@Override
public void setCharacterId(int characterId) {
this.shapeId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineSoundTag.java
View File

@@ -355,4 +355,9 @@ public class DefineSoundTag extends CharacterTag implements SoundTag {
final int[] rateMap = {5512, 11025, 22050, 44100};
return new SoundFormat(getSoundFormatId(), rateMap[getSoundRate()], getSoundType());
}
@Override
public void setCharacterId(int characterId) {
this.soundId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java
View File

@@ -367,4 +367,9 @@ public class DefineSpriteTag extends CharacterTag implements DrawableTag, Timeli
public String toHtmlCanvas(double unitDivisor) {
return getTimeline().toHtmlCanvas(unitDivisor, null);
}
@Override
public void setCharacterId(int characterId) {
this.spriteId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
View File

@@ -633,4 +633,9 @@ public class DefineText2Tag extends TextTag {
public String toHtmlCanvas(double unitDivisor) {
return staticTextToHtmlCanvas(unitDivisor, swf, textRecords, 2, textBounds, textMatrix, new ColorTransform());
}
@Override
public void setCharacterId(int characterId) {
this.characterID = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
View File

@@ -645,4 +645,9 @@ public class DefineTextTag extends TextTag {
public String toHtmlCanvas(double unitDivisor) {
return staticTextToHtmlCanvas(unitDivisor, swf, textRecords, 1, textBounds, textMatrix, new ColorTransform());
}
@Override
public void setCharacterId(int characterId) {
this.characterID = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java
View File

@@ -145,4 +145,9 @@ public class DefineVideoStreamTag extends CharacterTag implements BoundedTag {
public RECT getRect(Set<BoundedTag> added) {
return new RECT(0, (int) (SWF.unitDivisor * width), 0, (int) (SWF.unitDivisor * height));
}
@Override
public void setCharacterId(int characterId) {
this.characterID = characterId;
}
}

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
View File

@@ -208,7 +208,7 @@ public class DoInitActionTag extends Tag implements CharacterIdTag, ASMSource {
@Override
public String getName() {
String expName = swf==null?"":swf.getExportName(spriteId);
String expName = swf == null ? "" : swf.getExportName(spriteId);
if ((expName == null) || expName.isEmpty()) {
return super.getName();
}
@@ -245,4 +245,10 @@ public class DoInitActionTag extends Tag implements CharacterIdTag, ASMSource {
public Tag getSourceTag() {
return this;
}
@Override
public void setCharacterId(int characterId) {
this.spriteId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java
View File

@@ -426,4 +426,9 @@ public class PlaceObject2Tag extends PlaceObjectTypeTag implements ASMSourceCont
setModified(mod);
matrix = old;
}
@Override
public void setCharacterId(int characterId) {
this.characterId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java
View File

@@ -571,4 +571,9 @@ public class PlaceObject3Tag extends PlaceObjectTypeTag implements ASMSourceCont
setModified(mod);
matrix = old;
}
@Override
public void setCharacterId(int characterId) {
this.characterId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/PlaceObject4Tag.java
View File

@@ -574,4 +574,9 @@ public class PlaceObject4Tag extends PlaceObjectTypeTag implements ASMSourceCont
setModified(mod);
matrix = old;
}
@Override
public void setCharacterId(int characterId) {
this.characterId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/PlaceObjectTag.java
View File

@@ -237,4 +237,9 @@ public class PlaceObjectTag extends PlaceObjectTypeTag {
setModified(mod);
matrix = old;
}
@Override
public void setCharacterId(int characterId) {
this.characterId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java
View File

@@ -105,4 +105,9 @@ public class RemoveObjectTag extends RemoveTag implements CharacterIdTag {
public int getCharacterId() {
return characterId;
}
@Override
public void setCharacterId(int characterId) {
this.characterId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java
View File

@@ -243,4 +243,9 @@ public class SoundStreamHead2Tag extends Tag implements SoundStreamHeadTypeTag {
String exportName = swf.getExportName(getCharacterId());
return getCharacterId() + (exportName != null ? "_" + exportName : "");
}
@Override
public void setCharacterId(int characterId) {
this.virtualCharacterId = characterId;
}
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java
View File

@@ -98,6 +98,11 @@ public class SoundStreamHeadTag extends Tag implements SoundStreamHeadTypeTag {
return virtualCharacterId;
}
@Override
public void setCharacterId(int characterId) {
this.virtualCharacterId = characterId;
}
@Override
public void setVirtualCharacterId(int ch) {
virtualCharacterId = ch;

13
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/VideoFrameTag.java
View File

@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.tags;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.SWFOutputStream;
import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
import com.jpexs.decompiler.flash.types.BasicType;
import com.jpexs.decompiler.flash.types.annotations.SWFType;
import com.jpexs.helpers.ByteArrayRange;
@@ -31,7 +32,7 @@ import java.io.OutputStream;
*
* @author JPEXS
*/
public class VideoFrameTag extends Tag {
public class VideoFrameTag extends Tag implements CharacterIdTag {
@SWFType(BasicType.UI16)
public int streamID;
@@ -91,4 +92,14 @@ public class VideoFrameTag extends Tag {
frameNum = sis.readUI16("frameNum");
videoData = sis.readByteRangeEx(sis.available(), "videoData"); //TODO: Parse video packets
}
@Override
public int getCharacterId() {
return streamID;
}
@Override
public void setCharacterId(int characterId) {
this.streamID = characterId;
}
}

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/CharacterIdTag.java
View File

@@ -23,4 +23,6 @@ package com.jpexs.decompiler.flash.tags.base;
public interface CharacterIdTag {
public int getCharacterId();
public void setCharacterId(int characterId);
}

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineCompactedFont.java
View File

@@ -423,4 +423,9 @@ public final class DefineCompactedFont extends FontTag implements DrawableTag {
public boolean hasLayout() {
return true;
}
@Override
public void setCharacterId(int characterId) {
this.fontId = characterId;
}
}