1.21.11-start

Author: mysticdrew

common/src/main/java/journeymap/api/v2/client/entity/WrappedEntity.java

@@ -2,8 +2,8 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
@@ -42,7 +42,7 @@ public interface WrappedEntity
      * @return - resource location.
      */
     @Nullable
-    ResourceLocation getEntityIconLocation();
+    Identifier getEntityIconLocation();
 
     /**
      * If the entity is hostile
@@ -212,7 +212,7 @@ public interface WrappedEntity
      *
      * @param entityIconLocation - the resource location of the icon.
      */
-    void setEntityIconLocation(ResourceLocation entityIconLocation);
+    void setEntityIconLocation(Identifier entityIconLocation);
 
     /**
      * Sets the custom name of the entity.

common/src/main/java/journeymap/api/v2/client/fullscreen/CustomToolBarBuilder.java

@@ -1,6 +1,6 @@
 package journeymap.api.v2.client.fullscreen;
 
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.NotNull;
 
 public interface CustomToolBarBuilder
@@ -10,42 +10,42 @@ public interface CustomToolBarBuilder
      *
      * @param labelOn  - The on label, can be the display string or i18n key.
      * @param labelOff - The off label, can be the display string or i18n key.
-     * @param icon - The icon name. Icon resourceLocation
+     * @param icon - The icon name. Icon Identifier
      * @param onPress  - The onpress action.
      * @return IThemeButton
      */
-    IThemeButton getThemeToggleButton(@NotNull String labelOn, @NotNull String labelOff, @NotNull ResourceLocation icon, @NotNull IThemeButton.Action onPress);
+    IThemeButton getThemeToggleButton(@NotNull String labelOn, @NotNull String labelOff, @NotNull Identifier icon, @NotNull IThemeButton.Action onPress);
 
     /**
      * Creates and gets a theme button with a separate on/off label.
      *
      * @param labelOn  - The on label, can be the display string or i18n key.
      * @param labelOff - The off label, can be the display string or i18n key.
-     * @param icon - The icon name. Icon resourceLocation
+     * @param icon - The icon name. Icon Identifier
      * @param onPress  - The onpress action.
      * @return IThemeButton
      */
-    IThemeButton getThemeButton(@NotNull String labelOn, @NotNull String labelOff, @NotNull ResourceLocation icon, @NotNull IThemeButton.Action onPress);
+    IThemeButton getThemeButton(@NotNull String labelOn, @NotNull String labelOff, @NotNull Identifier icon, @NotNull IThemeButton.Action onPress);
 
     /**
      * Creates and gets a theme toggle button with a separate on/off label.
      *
      * @param label    - The label, can be the display string or i18n key.
-     * @param icon - The icon name. Icon resourceLocation
+     * @param icon - The icon name. Icon Identifier
      * @param onPress  - The onpress action.
      * @return IThemeButton
      */
-    IThemeButton getThemeToggleButton(@NotNull String label, @NotNull ResourceLocation icon, @NotNull IThemeButton.Action onPress);
+    IThemeButton getThemeToggleButton(@NotNull String label, @NotNull Identifier icon, @NotNull IThemeButton.Action onPress);
 
     /**
      * Creates and gets a theme button with a separate on/off label.
      *
      * @param label    - The label, can be the display string or i18n key.
-     * @param icon - The icon name. Icon resourceLocation
+     * @param icon - The icon name. Icon Identifier
      * @param onPress  - The onpress action.
      * @return IThemeButton
      */
-    IThemeButton getThemeButton(@NotNull String label, @NotNull ResourceLocation icon, @NotNull IThemeButton.Action onPress);
+    IThemeButton getThemeButton(@NotNull String label, @NotNull Identifier icon, @NotNull IThemeButton.Action onPress);
 
 
     /**

common/src/main/java/journeymap/api/v2/client/fullscreen/ThemeButtonDisplay.java

@@ -1,6 +1,6 @@
 package journeymap.api.v2.client.fullscreen;
 
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.NotNull;
 
 public interface ThemeButtonDisplay
@@ -10,43 +10,43 @@ public interface ThemeButtonDisplay
      *
      * @param labelOn  - The on label, can be the display string or i18n key.
      * @param labelOff - The off label, can be the display string or i18n key.
-     * @param icon - The icon name. Icon resourceLocation
+     * @param icon - The icon name. Icon Identifier
      * @param toggled  - If button starts toggled.
      * @param onPress  - The onpress action.
      * @return IThemeButton
      */
-    IThemeButton addThemeToggleButton(@NotNull String labelOn, @NotNull String labelOff, @NotNull ResourceLocation icon, boolean toggled, @NotNull IThemeButton.Action onPress);
+    IThemeButton addThemeToggleButton(@NotNull String labelOn, @NotNull String labelOff, @NotNull Identifier icon, boolean toggled, @NotNull IThemeButton.Action onPress);
 
     /**
      * Creates and adds a theme button with a separate on/off label to the toolbar.
      *
      * @param labelOn  - The on label, can be the display string or i18n key.
      * @param labelOff - The off label, can be the display string or i18n key.
-     * @param icon - The icon name. Icon resourceLocation
+     * @param icon - The icon name. Icon Identifier
      * @param onPress  - The onpress action.
      * @return IThemeButton
      */
-    IThemeButton addThemeButton(@NotNull String labelOn, @NotNull String labelOff, @NotNull ResourceLocation icon, @NotNull IThemeButton.Action onPress);
+    IThemeButton addThemeButton(@NotNull String labelOn, @NotNull String labelOff, @NotNull Identifier icon, @NotNull IThemeButton.Action onPress);
 
     /**
      * Creates and adds a theme toggle button with a separate on/off label to the toolbar.
      *
      * @param label    - The label, can be the display string or i18n key.
-     * @param icon - The icon name. Icon resourceLocation
+     * @param icon - The icon name. Icon Identifier
      * @param toggled  - If button starts toggled.
      * @param onPress  - The onpress action.
      * @return IThemeButton
      */
-    IThemeButton addThemeToggleButton(@NotNull String label, @NotNull ResourceLocation icon, boolean toggled, @NotNull IThemeButton.Action onPress);
+    IThemeButton addThemeToggleButton(@NotNull String label, @NotNull Identifier icon, boolean toggled, @NotNull IThemeButton.Action onPress);
 
     /**
      * Creates and adds a theme button with a separate on/off label to the toolbar.
      *
      * @param label    - The label, can be the display string or i18n key.
-     * @param icon - The icon name. Icon resourceLocation
+     * @param icon - The icon name. Icon Identifier
      * @param onPress  - The onpress action.
      * @return IThemeButton
      */
-    IThemeButton addThemeButton(@NotNull String label, @NotNull ResourceLocation icon, @NotNull IThemeButton.Action onPress);
+    IThemeButton addThemeButton(@NotNull String label, @NotNull Identifier icon, @NotNull IThemeButton.Action onPress);
 
 }

common/src/main/java/journeymap/api/v2/client/model/MapImage.java

@@ -25,7 +25,7 @@
 import com.google.gson.annotations.Since;
 import com.mojang.blaze3d.platform.NativeImage;
 import journeymap.api.v2.client.display.Displayable;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 
 import javax.annotation.Nullable;
 
@@ -44,7 +44,7 @@ public final class MapImage
     private transient NativeImage image;
 
     @Since(1.1)
-    private ResourceLocation imageLocation;
+    private Identifier imageLocation;
 
     @Since(1.1)
     private Integer color = 0xffffff;
@@ -129,7 +129,7 @@ public MapImage(NativeImage image, int textureX, int textureY, int textureWidth,
      * @param textureWidth      width of texture
      * @param textureHeight     height of texture
      */
-    public MapImage(ResourceLocation imageLocation, int textureWidth, int textureHeight)
+    public MapImage(Identifier imageLocation, int textureWidth, int textureHeight)
     {
         this(imageLocation, 0, 0, textureWidth, textureHeight, 0xffffff, 1f);
     }
@@ -147,7 +147,7 @@ public MapImage(ResourceLocation imageLocation, int textureWidth, int textureHei
      * @param color         Sets a color tint (rgb) on the image.  Use white (0xffffff) for no tint.
      * @param opacity       opacity between 0 and 1
      */
-    public MapImage(ResourceLocation imageLocation, int textureX, int textureY, int textureWidth, int textureHeight, int color, float opacity)
+    public MapImage(Identifier imageLocation, int textureX, int textureY, int textureWidth, int textureHeight, int color, float opacity)
     {
         this.imageLocation = imageLocation;
         this.textureX = textureX;
@@ -323,7 +323,7 @@ public int getTextureHeight()
      * @return the location
      */
     @Nullable
-    public ResourceLocation getImageLocation()
+    public Identifier getImageLocation()
     {
         return imageLocation;
     }

common/src/main/java/journeymap/api/v2/client/model/ShapeProperties.java

@@ -24,7 +24,7 @@
 import com.google.common.base.Objects;
 import com.mojang.blaze3d.platform.NativeImage;
 import journeymap.api.v2.client.display.Displayable;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -41,7 +41,7 @@ public class ShapeProperties
     private float strokeWidth = 2;
     private StrokePosition strokePosition = StrokePosition.CENTER;
     private NativeImage image;
-    private ResourceLocation imageLocation;
+    private Identifier imageLocation;
     private double texturePositionX = 0;
     private double texturePositionY = 0;
     private double textureScaleX = 1;
@@ -208,7 +208,7 @@ public ShapeProperties setImage(NativeImage image)
      * @return the location
      */
     @Nullable
-    public ResourceLocation getImageLocation()
+    public Identifier getImageLocation()
     {
         return imageLocation;
     }
@@ -219,7 +219,7 @@ public ResourceLocation getImageLocation()
      * @param imageLocation the image location
      * @return this
      */
-    public ShapeProperties setImageLocation(ResourceLocation imageLocation)
+    public ShapeProperties setImageLocation(Identifier imageLocation)
     {
         this.imageLocation = imageLocation;
         return this;

common/src/main/java/journeymap/api/v2/client/ui/component/LayeredScreen.java

@@ -23,7 +23,7 @@ public void display()
             this.backgroundScreen = this.minecraft.screen;
             this.minecraft.screen = this;
             this.added();
-            this.init(minecraft, minecraft.getWindow().getGuiScaledWidth(), minecraft.getWindow().getGuiScaledHeight());
+            super.init(minecraft.getWindow().getGuiScaledWidth(), minecraft.getWindow().getGuiScaledHeight());
             minecraft.getNarrator().saySystemNow(this.getNarrationMessage());
         }
         else
@@ -32,12 +32,25 @@ public void display()
         }
     }
 
+    /**
+     * use the non-deprecated version instead
+     *
+     * @param minecraft
+     * @param width
+     * @param height
+     */
+    @Deprecated(forRemoval = true)
     public void resize(Minecraft minecraft, int width, int height)
     {
-        super.resize(minecraft, width, height);
+        this.resize(width, height);
+    }
+
+    public void resize(int width, int height)
+    {
+        super.resize(width, height);
         if (this.backgroundScreen != null)
         {
-            this.backgroundScreen.resize(this.minecraft, this.width, this.height);
+            this.backgroundScreen.resize(this.width, this.height);
         }
     }
 

common/src/main/java/journeymap/api/v2/common/waypoint/Waypoint.java

@@ -1,8 +1,8 @@
 package journeymap.api.v2.common.waypoint;
 
 import net.minecraft.core.BlockPos;
+import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.Nullable;
 
@@ -72,7 +72,7 @@ public interface Waypoint
 
     default void setPrimaryDimension(ResourceKey<Level> dimension)
     {
-        setPrimaryDimension(dimension.location().toString());
+        setPrimaryDimension(dimension.identifier().toString());
     }
 
     void setPrimaryDimension(String dimension);
@@ -171,16 +171,16 @@ default void setPrimaryDimension(ResourceKey<Level> dimension)
     /**
      * Gets the texture resource location.
      *
-     * @return - ResourceLocation
+     * @return - Identifier
      */
-    ResourceLocation getIconResourceLocation();
+    Identifier getIconIdentifier();
 
     /**
      * Sets the texture resource location.
      *
-     * @param resourceLocation - the resource location
+     * @param Identifier - the resource location
      */
-    void setIconResourceLoctaion(ResourceLocation resourceLocation);
+    void setIconResourceLoctaion(Identifier Identifier);
 
     /**
      * Gets the image textureWidth.

common/src/main/java/journeymap/api/v2/common/waypoint/WaypointFactory.java

@@ -41,12 +41,12 @@ private static WaypointFactory getInstance()
      */
     public static Waypoint createClientWaypoint(String modId, BlockPos pos, @Nullable String name, ResourceKey<Level> primaryDimension, boolean persistent)
     {
-        return createClientWaypoint(modId, pos, name, primaryDimension.location().toString(), persistent);
+        return createClientWaypoint(modId, pos, name, primaryDimension.identifier().toString(), persistent);
     }
 
     public static Waypoint createClientWaypoint(String modId, BlockPos pos, ResourceKey<Level> primaryDimension, boolean persistent)
     {
-        return createClientWaypoint(modId, pos, primaryDimension.location().toString(), persistent);
+        return createClientWaypoint(modId, pos, primaryDimension.identifier().toString(), persistent);
     }
 
     public static Waypoint createClientWaypoint(String modId, BlockPos pos, String primaryDimension, boolean persistent)

common/src/main/java/journeymap/api/v2/common/waypoint/WaypointGroup.java

@@ -1,6 +1,6 @@
 package journeymap.api.v2.common.waypoint;
 
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -182,16 +182,16 @@ public interface WaypointGroup
     /**
      * Gets the texture resource location.
      *
-     * @return - ResourceLocation
+     * @return - Identifier
      */
-    ResourceLocation getIconResourceLocation();
+    Identifier getIconIdentifier();
 
     /**
      * Sets the texture resource location.
      *
-     * @param resourceLocation - the resource location
+     * @param Identifier - the resource location
      */
-    void setIconResourceLoctaion(ResourceLocation resourceLocation);
+    void setIconResourceLoctaion(Identifier Identifier);
 
     /**
      * Gets the image textureWidth.

fabric/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.11-SNAPSHOT'
+    id 'fabric-loom' version '1.13-SNAPSHOT'
     id "idea"
     id "maven-publish"
 }