Update to 26.1

Author: Patbox

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          21    # Latest version
+          25    # Latest version
         ]
         # and run on both Linux and Windows
         os: [ubuntu-latest]
@@ -35,7 +35,7 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from LTS java on one OS
+        if: ${{ runner.os == 'Linux' }} # Only upload artifacts built from LTS java on one OS
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 21
+          java-version: 25
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

build.gradle

@@ -1,14 +1,12 @@
 plugins {
-	id 'fabric-loom' version '1.13.+'
+	id 'net.fabricmc.fabric-loom' version '1.15.+'
 	id "com.modrinth.minotaur" version "2.+"
 	id 'maven-publish'
 }
 
-
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
-
-archivesBaseName = project.archives_base_name
+base {
+	archivesName = project.archives_base_name
+}
 group = project.maven_group
 
 if (System.getenv("CI") != null) {
@@ -30,7 +28,7 @@ loom {
 			name = "Data Generation"
 			runDir = "build/datagen"
 			vmArg("-Dfabric-api.datagen")
-			vmArg("-Dfabric-api.datagen.modid=polydecorations")
+			vmArg("-Dfabric-api.datagen.id=polydecorations")
 			vmArg("-Dfabric-api.datagen.output-dir=${file("src/main/generated")}")
 		}
 	}
@@ -68,34 +66,33 @@ repositories {
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings loom.officialMojangMappings()
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-	modImplementation 'eu.pb4:polymer-core:0.15.1+1.21.11'
-	modImplementation 'eu.pb4:polymer-blocks:0.15.1+1.21.11'
-	modImplementation 'eu.pb4:polymer-resource-pack:0.15.1+1.21.11'
-	modImplementation 'eu.pb4:polymer-resource-pack-extras:0.15.1+1.21.11'
-	modImplementation 'eu.pb4:polymer-autohost:0.15.1+1.21.11'
-	modImplementation 'eu.pb4:polymer-virtual-entity:0.15.1+1.21.11'
-	modImplementation include('eu.pb4:common-protection-api:1.0.0')
-	modImplementation include('eu.pb4:sgui:1.12.0+1.21.11')
-	modImplementation include('eu.pb4:map-canvas-api:0.7.0+1.21.11')
-	modImplementation include('eu.pb4:factorytools:0.9.3+1.21.11')
-	modImplementation include('nl.theepicblock:resource-locator-api:0.6.3-drex+1.21.11')
+	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+
+	implementation 'eu.pb4:polymer-core:0.16.0-pre.4+26.1'
+	implementation 'eu.pb4:polymer-blocks:0.16.0-pre.4+26.1'
+	implementation 'eu.pb4:polymer-resource-pack:0.16.0-pre.4+26.1'
+	implementation 'eu.pb4:polymer-resource-pack-extras:0.16.0-pre.4+26.1'
+	implementation 'eu.pb4:polymer-autohost:0.16.0-pre.4+26.1'
+	implementation 'eu.pb4:polymer-virtual-entity:0.16.0-pre.4+26.1'
+	implementation include('eu.pb4:common-protection-api:2.0.0')
+	implementation include('eu.pb4:sgui:2.0.0+26.1')
+	implementation include('eu.pb4:map-canvas-api:0.8.0+26.1')
+	implementation include('eu.pb4:factorytools:0.10.0-pre.2+26.1')
+	implementation include('nl.theepicblock:resource-locator-api:0.7.0-patbox+26.1')
 
 	// Temp hack to allow development
-	//modImplementation include('com.kneelawk:graphlib:1.99.99+1.20.local')
-	//modImplementation include('alexiil.mc.lib:libnetworkstack-base:0.11.0-aaa.patbox')
+	//implementation include('com.kneelawk:graphlib:1.99.99+1.20.local')
+	//implementation include('alexiil.mc.lib:libnetworkstack-base:0.11.0-aaa.patbox')
 
-	modCompileOnly 'maven.modrinth:polydex:1.3.0+1.21.2'
+	compileOnly 'eu.pb4:polydex:1.9.2+26.1-rc-3'
 
 	// Uncomment the following line to enable the deprecated Fabric API modules. 
 	// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
 
-	// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
+	// implementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
 }
 
 processResources {
@@ -108,7 +105,7 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
 	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 21
+	it.options.release = 25
 }
 
 java {
@@ -120,7 +117,7 @@ java {
 
 jar {
 	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
+		rename { "${it}_${project.archives_base_name}"}
 	}
 }
 
@@ -147,18 +144,18 @@ if (System.getenv("MODRINTH")) {
 		projectId = '5710VC7f'// The ID of your modrinth project, slugs will not work.
 		versionNumber = "" + version // The version of the mod to upload.
 		versionType = "release"
-		uploadFile = remapJar // This links to a task that builds your mod jar and sets "uploadFile" to the mod jar.
+		uploadFile = jar // This links to a task that builds your mod jar and sets "uploadFile" to the mod jar.
 		gameVersions = [((String) project.minecraft_version)]
 		changelog = System.getenv("CHANGELOG")
-		loaders = ["fabric"/*, "quilt"*/]
+		loaders = ["fabric"]
 
 		dependencies {
 			required.project "polymer"
 			optional.project "armorstandeditor"
 		}
 	}
 
-	remapJar {
+	jar {
 		finalizedBy project.tasks.modrinth
 	}
 }

gradle.properties

@@ -4,16 +4,16 @@ org.gradle.parallel=true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-minecraft_version=1.21.11
-yarn_mappings=1.21.11+build.1
-loader_version=0.18.2
-loom_version=1.10-SNAPSHOT
+
+minecraft_version=26.1
+loader_version=0.18.5
+loom_version=1.15-SNAPSHOT
 
 # Fabric API
-fabric_version=0.139.5+1.21.11
+fabric_api_version=0.144.3+26.1
 
 # Mod Properties
-	mod_version = 0.10.4
+	mod_version = 0.11.0
 	maven_group = eu.pb4
 	archives_base_name = polydecorations
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/eu/pb4/polydecorations/block/SimpleParticleBlock.java

@@ -5,6 +5,7 @@
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.ItemStackTemplate;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 
@@ -20,6 +21,6 @@ default ParticleOptions getBreakingParticle(BlockState blockState) {
     }
 
     default ParticleOptions computeParticle(Block block) {
-        return new ItemParticleOption(ParticleTypes.ITEM, new ItemStack(block.asItem()));
+        return new ItemParticleOption(ParticleTypes.ITEM, new ItemStackTemplate(block.asItem()));
     }
 }

src/main/java/eu/pb4/polydecorations/block/extension/AttachedSignPostBlock.java

@@ -39,7 +39,7 @@
 import net.minecraft.world.phys.BlockHitResult;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Vector3f;
-import xyz.nucleoid.packettweaker.PacketContext;
+import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
 
 import java.util.Map;
 
@@ -55,7 +55,7 @@ public AttachedSignPostBlock(BlockBehaviour.Properties settings, Block block, in
         this.radius = pixelSideLength / 16f / 2f;
         MAP.put(block, this);
         this.registerDefaultState(this.defaultBlockState().setValue(WATERLOGGED, false));
-        ModInit.LATE_INIT.add(() -> DecorationsBlockEntities.SIGN_POST.addSupportedBlock(this));
+        ModInit.LATE_INIT.add(() -> DecorationsBlockEntities.SIGN_POST.addValidBlock(this));
     }
 
     @Override
@@ -181,7 +181,7 @@ public void updateUpper(SignPostBlockEntity.Sign upperText) {
             this.upperBack.setTeleportDuration(0);
             this.upperBack.setYaw(upperText.flip() ? 180 + upperText.yaw() : upperText.yaw());
             this.upperBack.setTranslation(new Vector3f(0, 4 / 16f, zOffset));
-            this.upperBack.setItem(ItemDisplayElementUtil.getSolidModel(upperText.item()));
+            this.upperBack.setItem(ItemDisplayElementUtil.getModel(upperText.item()).get());
             this.upperBack.tick();
             this.upperBack.setTeleportDuration(1);
             this.upperBack.tick();
@@ -205,7 +205,7 @@ public void updateLower(SignPostBlockEntity.Sign lowerText) {
             this.lowerBack.setTeleportDuration(0);
             this.lowerBack.setYaw(lowerText.flip() ? 180 + lowerText.yaw() : lowerText.yaw());
             this.lowerBack.setTranslation(new Vector3f(0, -4 / 16f, zOffset));
-            this.lowerBack.setItem(ItemDisplayElementUtil.getSolidModel(lowerText.item()));
+            this.lowerBack.setItem(ItemDisplayElementUtil.getModel(lowerText.item()).get());
             this.lowerBack.tick();
             this.lowerBack.setTeleportDuration(1);
             this.lowerBack.tick();

src/main/java/eu/pb4/polydecorations/block/extension/SignPostBlockEntity.java

@@ -166,12 +166,12 @@ public InteractionResult onUse(Player player, boolean upper, BlockHitResult hit)
         }
 
         if (player.getMainHandItem().getItem() instanceof SignApplicator item) {
-            if (item.canApplyToSign(getText(upper).text, player)) {
+            if (item.canApplyToSign(getText(upper).text, player.getMainHandItem(), player)) {
                 var fake = Fake.INSTANCE;
                 fake.setText(getText(upper).text, false);
                 fake.setWaxed(getText(upper).waxed);
                 try {
-                    if (item.tryApplyToSign(level, fake, false, player)) {
+                    if (item.tryApplyToSign(level, fake, false, player.getMainHandItem(), player)) {
                         if (!player.isCreative()) {
                             player.getMainHandItem().shrink(1);
                         }
@@ -308,9 +308,9 @@ public Gui(ServerPlayer player, Supplier<Sign> getter, Consumer<Sign> setter) {
         }
 
         @Override
-        public void onClose() {
+        public void onManualClose() {
             setter.accept(getter.get().withText(getter.get().text.setMessage(0, this.getLine(0))));
-            super.onClose();
+            super.onManualClose();
         }
 
         @Override

src/main/java/eu/pb4/polydecorations/block/extension/WallAttachedLanternBlock.java

@@ -1,6 +1,7 @@
 package eu.pb4.polydecorations.block.extension;
 
 import eu.pb4.factorytools.api.block.QuickWaterloggable;
+import eu.pb4.factorytools.api.util.LazyItemStack;
 import eu.pb4.factorytools.api.virtualentity.BlockModel;
 import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil;
 import eu.pb4.polydecorations.block.DecorationsBlockTags;
@@ -11,6 +12,7 @@
 import eu.pb4.polymer.virtualentity.api.attachment.HolderAttachment;
 import eu.pb4.polymer.virtualentity.api.elements.ItemDisplayElement;
 import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
+import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.network.chat.MutableComponent;
@@ -38,7 +40,6 @@
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
 import org.jetbrains.annotations.Nullable;
-import xyz.nucleoid.packettweaker.PacketContext;
 
 import java.util.Arrays;
 import java.util.Locale;
@@ -128,9 +129,9 @@ public boolean canPathfindThrough(BlockState state, BlockGetter world, BlockPos
     }
 
     public static final class Model extends BlockModel {
-        public static final ItemStack MODEL[] = Arrays.stream(Attached.values())
-                .map(x -> ItemDisplayElementUtil.getSolidModel(id("block/lantern_support/" + x.ordinal())))
-                .toArray(ItemStack[]::new);
+        public static final LazyItemStack MODEL[] = Arrays.stream(Attached.values())
+                .map(x -> ItemDisplayElementUtil.getModel(id("block/lantern_support/" + x.ordinal())))
+                .toArray(LazyItemStack[]::new);
         private final ItemDisplayElement main;
 
         private Model(BlockState state) {
@@ -141,7 +142,7 @@ private Model(BlockState state) {
         }
 
         private ItemStack model(BlockState state) {
-            return MODEL[state.getValue(ATTACHED).ordinal()];
+            return MODEL[state.getValue(ATTACHED).ordinal()].get();
         }
 
         @Override

src/main/java/eu/pb4/polydecorations/block/extension/WallAttachedOxidizableLanternBlock.java

@@ -1,23 +1,12 @@
 package eu.pb4.polydecorations.block.extension;
 
-import eu.pb4.factorytools.api.block.QuickWaterloggable;
-import eu.pb4.factorytools.api.virtualentity.BlockModel;
-import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil;
-import eu.pb4.polymer.core.api.block.PolymerBlock;
-import eu.pb4.polymer.virtualentity.api.BlockWithElementHolder;
-import eu.pb4.polymer.virtualentity.api.ElementHolder;
-import eu.pb4.polymer.virtualentity.api.attachment.BlockAwareAttachment;
-import eu.pb4.polymer.virtualentity.api.attachment.HolderAttachment;
-import eu.pb4.polymer.virtualentity.api.elements.ItemDisplayElement;
-import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.block.WeatheringCopper;
 import net.minecraft.world.level.block.WeatheringLanternBlock;
 import net.minecraft.world.level.block.state.BlockState;
-import org.jetbrains.annotations.Nullable;
-import xyz.nucleoid.packettweaker.PacketContext;
 
 import java.util.Locale;
 import java.util.Map;