From 85731f8fa434a310175fb3ba9c057dcb7cac5175 Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Tue, 1 Dec 2020 13:11:06 -0800 Subject: [PATCH] Supressed some deprecation warnings --- core/src/main/java/com/riiablo/item/ItemReader.java | 2 ++ .../java/com/riiablo/widget/CharacterSelectButton.java | 5 +++-- core/src/main/java/com/riiablo/widget/EntityWrapper.java | 9 +++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/riiablo/item/ItemReader.java b/core/src/main/java/com/riiablo/item/ItemReader.java index 07bec41a..0337939e 100644 --- a/core/src/main/java/com/riiablo/item/ItemReader.java +++ b/core/src/main/java/com/riiablo/item/ItemReader.java @@ -28,6 +28,7 @@ public class ItemReader { in.skipUntil(SIGNATURE); } + @SuppressWarnings("deprecation") public Item readItem(ByteInput in) { final int startOffset = in.bytesRead(); /** @see Item#data */ Item item = readSingleItem(in); @@ -54,6 +55,7 @@ public class ItemReader { return item; } + @SuppressWarnings("deprecation") Item readSingleItem(ByteInput in) { final int itemOffset = in.bytesRead(); /** @see Item#data */ log.trace("Reading item..."); diff --git a/core/src/main/java/com/riiablo/widget/CharacterSelectButton.java b/core/src/main/java/com/riiablo/widget/CharacterSelectButton.java index d835eb00..a905f6da 100644 --- a/core/src/main/java/com/riiablo/widget/CharacterSelectButton.java +++ b/core/src/main/java/com/riiablo/widget/CharacterSelectButton.java @@ -12,7 +12,6 @@ import com.badlogic.gdx.utils.Disposable; import com.riiablo.CharacterClass; import com.riiablo.Riiablo; import com.riiablo.codec.DC6; -import com.riiablo.entity.CharacterPreview; import com.riiablo.loader.DC6Loader; import com.riiablo.save.D2S; @@ -82,7 +81,9 @@ public class CharacterSelectButton extends Table implements Disposable { public void set(D2S d2s) { this.d2s = d2s; setName(d2s.name()); - preview.set(new CharacterPreview(d2s)); + @SuppressWarnings("deprecation") + com.riiablo.entity.CharacterPreview character = new com.riiablo.entity.CharacterPreview(d2s); + preview.set(character); title.setText(d2s.getProgressionString()); // TODO: i18n? This may be hard-coded in-game name.setText(d2s.name()); name.setColor(d2s.isHardcore() ? Riiablo.colors.red : Riiablo.colors.gold); diff --git a/core/src/main/java/com/riiablo/widget/EntityWrapper.java b/core/src/main/java/com/riiablo/widget/EntityWrapper.java index 6bb0bd3b..1f75d239 100644 --- a/core/src/main/java/com/riiablo/widget/EntityWrapper.java +++ b/core/src/main/java/com/riiablo/widget/EntityWrapper.java @@ -3,22 +3,23 @@ package com.riiablo.widget; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.math.Matrix4; import com.badlogic.gdx.scenes.scene2d.Actor; -import com.riiablo.entity.Entity; + import com.riiablo.graphics.PaletteIndexedBatch; public class EntityWrapper extends Actor { private static final Matrix4 tmpMatrix = new Matrix4(); private static final Matrix4 transformMatrix = new Matrix4(); - private Entity entity; + @SuppressWarnings("deprecation") + private com.riiablo.entity.Entity entity; public EntityWrapper() {} - public EntityWrapper(Entity entity) { + public EntityWrapper(@SuppressWarnings("deprecation") com.riiablo.entity.Entity entity) { set(entity); } - public void set(Entity entity) { + public void set(@SuppressWarnings("deprecation") com.riiablo.entity.Entity entity) { this.entity = entity; }