diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cd44c98..bd8edf6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,13 +3,13 @@ loom = "1.4.+" -minecraft = "1.20.2" -fabric_loader = "0.14.22" +minecraft = "1.20.4" +fabric_loader = "0.15.3" # The latest versions are available at https://parchmentmc.org/docs/getting-started parchment = "2023.12.10" -fabric_api = "0.89.0+1.20.2" +fabric_api = "0.92.0+1.20.4" [libraries] minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } diff --git a/src/main/java/dev/upcraft/glassential/blocks/GlassentialGlassBlock.java b/src/main/java/dev/upcraft/glassential/blocks/GlassentialGlassBlock.java index bac3758..342b3d9 100644 --- a/src/main/java/dev/upcraft/glassential/blocks/GlassentialGlassBlock.java +++ b/src/main/java/dev/upcraft/glassential/blocks/GlassentialGlassBlock.java @@ -3,7 +3,6 @@ import dev.upcraft.glassential.Glassential; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.registries.Registries; @@ -13,9 +12,9 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.block.AbstractGlassBlock; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.TransparentBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.pathfinder.PathComputationType; @@ -27,7 +26,8 @@ import java.util.List; import java.util.function.UnaryOperator; -public class GlassentialGlassBlock extends AbstractGlassBlock { +@SuppressWarnings("deprecation") +public class GlassentialGlassBlock extends TransparentBlock { private final BlockProperties[] properties; private final boolean dark; @@ -41,7 +41,7 @@ public GlassentialGlassBlock(String cullId, BlockProperties... properties) { } public GlassentialGlassBlock(UnaryOperator settingsApplier, String cullId, BlockProperties... properties) { - super(settingsApplier.apply(FabricBlockSettings.copy(Blocks.GLASS))); + super(settingsApplier.apply(Properties.ofFullCopy(Blocks.GLASS))); this.properties = properties; List props = Arrays.asList(properties); this.dark = props.contains(BlockProperties.TINTED); diff --git a/src/main/java/dev/upcraft/glassential/mixin/TintedGlassBlockMixin.java b/src/main/java/dev/upcraft/glassential/mixin/TintedGlassBlockMixin.java index a8a3ee5..b88b2de 100644 --- a/src/main/java/dev/upcraft/glassential/mixin/TintedGlassBlockMixin.java +++ b/src/main/java/dev/upcraft/glassential/mixin/TintedGlassBlockMixin.java @@ -2,13 +2,13 @@ import dev.upcraft.glassential.Glassential; import net.minecraft.core.Direction; -import net.minecraft.world.level.block.AbstractGlassBlock; import net.minecraft.world.level.block.TintedGlassBlock; +import net.minecraft.world.level.block.TransparentBlock; import net.minecraft.world.level.block.state.BlockState; import org.spongepowered.asm.mixin.Mixin; @Mixin(TintedGlassBlock.class) -public abstract class TintedGlassBlockMixin extends AbstractGlassBlock { +public abstract class TintedGlassBlockMixin extends TransparentBlock { private TintedGlassBlockMixin(Properties settings) { super(settings); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 02fc8e9..6851a21 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -36,7 +36,7 @@ "depends": { "fabricloader": "*", "fabric-api": "*", - "minecraft": "=1.20.2", + "minecraft": "=1.20.4", "java": ">=17" }, "custom": {