forge 1.20.6

build.gradle.kts

@@ -29,6 +29,7 @@ allprojects {
         }
 
         mavenCentral()
+        maven("https://maven-staging.bai.lol")
     }
 
     java {

buildSrc/build.gradle.kts

@@ -24,4 +24,7 @@ dependencies {
 
     // https://github.com/MinecraftForge/ForgeGradle/issues/919
     implementation("net.minecraftforge:srgutils:0.5.10")
+
+    // fix unsupported class file major version 65
+    implementation("org.ow2.asm:asm:9.7")
 }

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs = -Xmx3G
 
-minecraft          = 1.20.5
+minecraft          = 1.20.6
 
 archiveBaseName    = wthit
 group              = mcp.mobius.waila
@@ -9,18 +9,18 @@ majorVersion       = 11
 # [rei, jei, emi]
 recipeViewer       = none
 
-badpackets         = 0.7.2
+badpackets         = 0.7.3-git-ccef7811
 rei                = 13.0.666
 jei                = 1.20.2-16.0.0.28
 emi                = 1.0.23+1.20.2
 
 fabricLoader       = 0.15.10
-fabricApi          = 0.97.5+1.20.5
+fabricApi          = 0.97.8+1.20.6
 modMenu            = 10.0.0-alpha.3
 trEnergy           = 3.0.0
 
-forge              = 49.0.9
-neo                = 20.5.20-beta
+forge              = 50.0.0
+neo                = 20.6.12-beta
 
 architectury       = 10.0.7
 clothConfig        = 12.0.107

platform/fabric/gradle.properties

@@ -2,15 +2,15 @@
 cf.endpoint    = minecraft.curseforge.com
 cf.projectId   = 440979
 cf.releaseType = stable
-cf.gameVersion = 1.20.5
+cf.gameVersion = 1.20.5, 1.20.6
 cf.loader      = Fabric
 cf.require     = fabric-api, badpackets
 cf.optional    = modmenu, roughly-enough-items, jei, emi
 
 # Modrinth
 mr.projectId   = 6AQIaxuO
 mr.releaseType = stable
-mr.gameVersion = 1.20.5
+mr.gameVersion = 1.20.5, 1.20.6
 mr.loader      = fabric
 mr.require     = P7dR8mSH, ftdbN0KK
 mr.optional    = mOgUt4GM, nfn13YXA, fRiHVvU7

platform/forge/build.gradle.kts

@@ -2,7 +2,7 @@ import java.text.SimpleDateFormat
 import java.util.*
 
 plugins {
-    id("net.minecraftforge.gradle") version "6.0.21"
+    id("net.minecraftforge.gradle") version "6.0.24"
     id("org.spongepowered.mixin") version "0.7.38"
 }
 
@@ -12,9 +12,8 @@ dependencies {
     minecraft("net.minecraftforge:forge:${rootProp["minecraft"]}-${rootProp["forge"]}")
 
     implementation("org.jetbrains:annotations:19.0.0")
-    annotationProcessor("org.spongepowered:mixin:0.8.5:processor")
 
-    runtimeOnly(fg.deobf("lol.bai:badpackets:forge-${rootProp["badpackets"]}"))
+    runtimeOnly("lol.bai:badpackets:forge-${rootProp["badpackets"]}")
 //    runtimeOnly(fg.deobf("dev.architectury:architectury-forge:${rootProp["architectury"]}"))
 //    runtimeOnly(fg.deobf("me.shedaniel.cloth:cloth-config-forge:${rootProp["clothConfig"]}"))
 
@@ -23,12 +22,12 @@ dependencies {
 
     when (rootProp["recipeViewer"]) {
         "rei" -> {
-            runtimeOnly(fg.deobf("me.shedaniel:RoughlyEnoughItems-forge:${rootProp["rei"]}"))
+            runtimeOnly("me.shedaniel:RoughlyEnoughItems-forge:${rootProp["rei"]}")
 //            runtimeOnly(fg.deobf("me.shedaniel:RoughlyEnoughItems-plugin-compatibilities-forge:${rootProp["rei"]}"))
         }
 
         "jei" -> rootProp["jei"].split("-").also { (mc, jei) ->
-            runtimeOnly(fg.deobf("mezz.jei:jei-${mc}-forge:${jei}"))
+            runtimeOnly("mezz.jei:jei-${mc}-forge:${jei}")
         }
     }
 }
@@ -49,6 +48,8 @@ sourceSets {
 
 minecraft {
     mappings("official", rootProp["minecraft"])
+    reobf = false
+
     runs {
         create("server")
         create("client") {
@@ -90,8 +91,6 @@ tasks.jar {
         "Implementation-Timestamp" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(Date()),
         "Automatic-Module-Name" to "mcp.mobius.waila"
     )
-
-    finalizedBy("reobfJar")
 }
 
 afterEvaluate {

platform/forge/gradle.properties

@@ -2,15 +2,15 @@
 cf.endpoint    = minecraft.curseforge.com
 cf.projectId   = 455982
 cf.releaseType = stable
-cf.gameVersion = 1.20.3, 1.20.4
+cf.gameVersion = 1.20.6
 cf.loader      = Forge
 cf.require     = badpackets
 cf.optional    = jei, roughly-enough-items-hacks
 
 # Modrinth
 mr.projectId   = 6AQIaxuO
 mr.releaseType = stable
-mr.gameVersion = 1.20.3, 1.20.4
+mr.gameVersion = 1.20.6
 mr.loader      = forge
 mr.require     = ftdbN0KK
 mr.optional    = 1PfY6b5p

platform/forge/src/main/java/mcp/mobius/waila/forge/ForgeApiService.java

@@ -1,16 +1,9 @@
 package mcp.mobius.waila.forge;
 
-import java.util.List;
-
 import mcp.mobius.waila.api.IModInfo;
 import mcp.mobius.waila.service.ApiService;
 import mcp.mobius.waila.util.ModInfo;
-import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Tier;
-import net.minecraft.world.level.block.Block;
-import net.minecraftforge.common.TierSortingRegistry;
-import org.jetbrains.annotations.Nullable;
 
 public class ForgeApiService extends ApiService {
 
@@ -25,13 +18,8 @@ public String getDefaultEnergyUnit() {
     }
 
     @Override
-    public @Nullable TagKey<Block> getTierTag(Tier tier) {
-        return tier.getTag();
-    }
-
-    @Override
-    public List<Tier> getTiers() {
-        return TierSortingRegistry.getSortedTiers();
+    public boolean fluidNbt() {
+        return true;
     }
 
 }

platform/forge/src/plugin/java/mcp/mobius/waila/plugin/forge/provider/EnergyCapabilityProvider.java

@@ -14,7 +14,7 @@ public enum EnergyCapabilityProvider implements IDataProvider<BlockEntity> {
 
     @Override
     public void appendData(IDataWriter data, IServerAccessor<BlockEntity> accessor, IPluginConfig config) {
-        data.add(EnergyData.class, res ->
+        data.add(EnergyData.TYPE, res ->
             accessor.getTarget().getCapability(ForgeCapabilities.ENERGY).ifPresent(storage ->
                 res.add(EnergyData.of(storage.getEnergyStored(), storage.getMaxEnergyStored()))));
     }

platform/forge/src/plugin/java/mcp/mobius/waila/plugin/forge/provider/FluidCapabilityProvider.java

@@ -15,7 +15,7 @@ public enum FluidCapabilityProvider implements IDataProvider<BlockEntity> {
 
     @Override
     public void appendData(IDataWriter data, IServerAccessor<BlockEntity> accessor, IPluginConfig config) {
-        data.add(FluidData.class, res ->
+        data.add(FluidData.TYPE, res ->
             accessor.getTarget().getCapability(ForgeCapabilities.FLUID_HANDLER).ifPresent(handler -> {
                 var size = handler.getTanks();
                 var fluidData = ForgeFluidData.of(size);

platform/forge/src/plugin/java/mcp/mobius/waila/plugin/forge/provider/ItemCapabilityProvider.java

@@ -14,7 +14,7 @@ public enum ItemCapabilityProvider implements IDataProvider<BlockEntity> {
 
     @Override
     public void appendData(IDataWriter data, IServerAccessor<BlockEntity> accessor, IPluginConfig config) {
-        data.add(ItemData.class, res ->
+        data.add(ItemData.TYPE, res ->
             accessor.getTarget().getCapability(ForgeCapabilities.ITEM_HANDLER).ifPresent(handler ->
                 res.add(ItemData.of(config).getter(handler::getStackInSlot, handler.getSlots()))));
     }

platform/neo/gradle.properties

@@ -2,15 +2,15 @@
 cf.endpoint    = minecraft.curseforge.com
 cf.projectId   = 455982
 cf.releaseType = beta
-cf.gameVersion = 1.20.5
+cf.gameVersion = 1.20.5, 1.20.6
 cf.loader      = NeoForge
 cf.require     = badpackets
 cf.optional    = jei
 
 # Modrinth
 mr.projectId   = 6AQIaxuO
-mr.releaseType = beta
-mr.gameVersion = 1.20.5
+mr.releaseType = stable
+mr.gameVersion = 1.20.5, 1.20.6
 mr.loader      = neoforge
 mr.require     = ftdbN0KK
 mr.optional    = 1PfY6b5p

platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/WailaPluginTextile.java

@@ -8,7 +8,7 @@
 import mcp.mobius.waila.plugin.textile.fluid.TextileFluidDescriptor;
 import mcp.mobius.waila.plugin.textile.provider.FluidStorageProvider;
 import mcp.mobius.waila.plugin.textile.provider.ItemStorageProvider;
-import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags;
+import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
@@ -61,7 +61,7 @@ public void register(IRegistrar registrar) {
         registrar.addToolType(new ResourceLocation("shears"), IToolType.builder()
             .lowestTierItem(Items.SHEARS)
             .blockPredicate(it -> /*it.is(BlockTags.SHEARS_MINEABLE) ||*/ it.getBlock() instanceof IShearable || it.getBlock() instanceof DoublePlantBlock)
-            .itemTag(ConventionalItemTags.SHEARS)
+            .itemTag(ConventionalItemTags.SHEARS_TOOLS)
             .build());
     }
 

platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/fluid/TextileFluidDescriptor.java

@@ -40,7 +40,7 @@ public void describeFluid(FluidDescriptionContext<Fluid> ctx, FluidDescription d
         double capacity = content.maxLevel * content.amountPerLevel;
 
         return FabricFluidData.of(1)
-            .add(content.fluid, null, stored, capacity);
+            .add(content.fluid, stored, capacity);
     }
 
 }

settings.gradle.kts

@@ -27,7 +27,7 @@ platform("mojmap")
 
 //platform("bukkit")
 platform("fabric")
-//platform("forge")
+platform("forge")
 platform("neo")
 platform("textile")
 //platform("quilt")

src/api/java/mcp/mobius/waila/api/__internal__/IApiService.java

@@ -78,4 +78,6 @@ public interface IApiService {
 
     boolean isDevEnv();
 
+    boolean fluidNbt();
+
 }