LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 20:10:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Classnames in PlaceObject

Browse Source
This commit is contained in:
Jindra Petřík
2022-12-18 23:10:24 +01:00
parent c828680c9e
commit 6a14c761ad
7 changed files with 93 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/ImagePanel.java
+6 -6
View File
@@ -317,7 +317,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
}
if (ds != null) {
CharacterTag cht = swf.getCharacter(ds.characterId);
CharacterTag cht = ds.getCharacter();
if (cht != null) {
if (cht instanceof DrawableTag) {
RECT rect = timelined.getRect();
@@ -359,7 +359,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
}
if (ds != null) {
CharacterTag cht = swf.getCharacter(ds.characterId);
CharacterTag cht = ds.getCharacter();
if (cht != null) {
if (cht instanceof DrawableTag) {
DrawableTag dt = (DrawableTag) cht;
@@ -1400,7 +1400,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
}
DepthState ds = f.layers.get(selectedDepth);
if (ds != null) {
CharacterTag cht = timelined.getTimeline().swf.getCharacter(ds.characterId);
CharacterTag cht = ds.getCharacter();
if (cht != null) {
debugLabel.setText(cht.getName());
}
@@ -1943,7 +1943,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
}
if (ds != null) {
CharacterTag cht = swf.getCharacter(ds.characterId);
CharacterTag cht = ds.getCharacter();
if (cht != null) {
if (cht instanceof DrawableTag) {
DrawableTag dt = (DrawableTag) cht;
@@ -1971,7 +1971,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
}
if (ds != null) {
CharacterTag cht = swf.getCharacter(ds.characterId);
CharacterTag cht = ds.getCharacter();
if (cht != null) {
if (cht instanceof DrawableTag) {
DrawableTag dt = (DrawableTag) cht;
@@ -2365,7 +2365,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
}
first = false;
CharacterTag c = swf.getCharacter(ds.characterId);
CharacterTag c = ds.getCharacter();
ret.append(c.toString());
if (ds.depth > 0) {
ret.append(" ");
src/com/jpexs/decompiler/flash/gui/timeline/TimelineBodyPanel.java
+4 -3
View File
@@ -36,6 +36,7 @@ import java.awt.event.MouseListener;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import javax.swing.JPanel;
import org.pushingpixels.substance.api.ColorSchemeAssociationKind;
import org.pushingpixels.substance.api.ComponentState;
@@ -201,7 +202,7 @@ public class TimelineBodyPanel extends JPanel implements MouseListener, KeyListe
for (; start_f2 >= 1; start_f2--) {
DepthState ds = timeline.getFrame(start_f2 - 1).layers.get(d);
if (((dsStart == null) != (ds == null))
|| (ds != null && dsStart.characterId != ds.characterId)) {
|| (ds != null && (dsStart.characterId != ds.characterId || !Objects.equals(dsStart.className, ds.className)))) {
break;
}
}
@@ -213,7 +214,7 @@ public class TimelineBodyPanel extends JPanel implements MouseListener, KeyListe
DepthState flNext = f < max_f ? timeline.getFrame(f + 1).layers.get(d) : null;
DepthState flPrev = f > 0 ? timeline.getFrame(f - 1).layers.get(d) : null;
CharacterTag cht = fl == null ? null : timeline.swf.getCharacter(fl.characterId);
CharacterTag cht = fl == null ? null : fl.getCharacter();
boolean shapeTween = cht != null && (cht instanceof MorphShapeTag);
boolean motionTweenStart = !motionTween && (flNext != null && flNext.motionTween);
boolean motionTweenEnd = !motionTween && (flPrev != null && flPrev.motionTween);
@@ -230,7 +231,7 @@ public class TimelineBodyPanel extends JPanel implements MouseListener, KeyListe
if (fl == null) {
for (; f + 1 < timeline.getFrameCount(); f++) {
fl = timeline.getFrame(f + 1).layers.get(d);
if (fl != null && fl.characterId != -1) {
if (fl != null && fl.getCharacter() != null) {
break;
}