Further forge fixes

build.forge.gradle.kts

···
     modImplementation("dev.su5ed.sinytra:fabric-loader:2.7.11+0.16.5+1.20.1")
     modImplementation("dev.su5ed.sinytra.fabric-api:fabric-api-base:0.4.32+ef105b4977")
     modImplementation("dev.su5ed.sinytra.fabric-api:fabric-networking-api-v1:1.3.14+fb7c822677")
-    modImplementation("dev.su5ed.sinytra.fabric-api:fabric-object-builder-api-v1:11.1.5+f8c414ce77")
     modImplementation("dev.su5ed.sinytra.fabric-api:fabric-resource-loader-v0:0.11.12+4b4151c077")
     jarJar("dev.su5ed.sinytra:fabric-loader:2.7.11+0.16.5+1.20.1")
     jarJar("dev.su5ed.sinytra.fabric-api:fabric-api-base:0.4.32+ef105b4977")
     jarJar("dev.su5ed.sinytra.fabric-api:fabric-networking-api-v1:1.3.14+fb7c822677")
-    jarJar("dev.su5ed.sinytra.fabric-api:fabric-object-builder-api-v1:11.1.5+f8c414ce77")
     jarJar("dev.su5ed.sinytra.fabric-api:fabric-resource-loader-v0:0.11.12+4b4151c077")
 
 

src/main/java/net/lerariemann/infinity/access/ScreenAccess.java

···
-package net.lerariemann.infinity.access;
-
-import net.minecraft.client.gui.components.Renderable;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.narration.NarratableEntry;
-
-public interface ScreenAccess {
-    <T extends GuiEventListener & Renderable & NarratableEntry> T infinity$addWidget(T widget);
-}

src/main/java/net/lerariemann/infinity/mixin/core/ScreenMixin.java

···
-package net.lerariemann.infinity.mixin.core;
-
-import net.lerariemann.infinity.access.ScreenAccess;
-import net.minecraft.client.gui.components.Renderable;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.narration.NarratableEntry;
-import net.minecraft.client.gui.screens.Screen;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-@Mixin(Screen.class)
-public abstract class ScreenMixin implements ScreenAccess {
-    @Shadow
-    protected abstract <T extends GuiEventListener & Renderable & NarratableEntry> T addRenderableWidget(T widget);
-
-    @Override
-    public <T extends GuiEventListener & Renderable & NarratableEntry> T infinity$addWidget(T widget) {
-        return addRenderableWidget(widget);
-    }
-}

src/main/java/net/lerariemann/infinity/mixin/fixes/WorldChunkMixin.java

···
 @Mixin(LevelChunk.class)
 public class WorldChunkMixin {
     /* Silencing extensive log spam */
-    @Inject(method = "promotePendingBlockEntity", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V"), cancellable = true)
+    @Inject(method = "promotePendingBlockEntity", at = @At(value = "INVOKE", remap = false, target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V"), cancellable = true)
     private void silenceLogSpam(CallbackInfoReturnable<BlockEntity> cir) {
         cir.setReturnValue(null);
     }

src/main/java/net/lerariemann/infinity/mixin/qol/EditWorldScreenMixin.java

···
 package net.lerariemann.infinity.mixin.qol;
 
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
-import net.lerariemann.infinity.access.ScreenAccess;
 import net.lerariemann.infinity.util.InfinityMethods;
 //? if >1.21 {
 import net.minecraft.client.Minecraft;
···
     *///?}
     , CallbackInfo ci) {
         var screen = (EditWorldScreen) (Object) this;
-        ((ScreenAccess) screen).infinity$addWidget(Button.builder(Component.translatable("screen.infinity.delete_datapacks"), button -> {
+        screen.addRenderableWidget(Button.builder(Component.translatable("screen.infinity.delete_datapacks"), button -> {
             boolean bl = InfinityMethods.deleteLevel(session);
             this.callback.accept(!bl);
         }).width(200).tooltip(Tooltip.create(Component.translatable("screen.infinity.delete_datapacks.tooltip"), null)).build());

src/main/java/net/lerariemann/infinity/registry/core/ModEntities.java

···
 import net.minecraft.world.entity.SpawnPlacementTypes;
 import static net.minecraft.world.entity.SpawnPlacementTypes.*;
 //?} else {
-/*import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
-import static net.minecraft.world.entity.SpawnPlacements.Type.*;
+/*import static net.minecraft.world.entity.SpawnPlacements.Type.*;
 *///?}
 import net.minecraft.world.entity.animal.Animal;
 import net.minecraft.world.entity.monster.AbstractSkeleton;
···
 
     public static final RegistrySupplier<EntityType<ChaosSlime>> CHAOS_SLIME = INFINITY_ENTITIES
             .register("chaos_slime", () ->
-                    //? if >1.21 {
-                    
                     EntityType.Builder.of(ChaosSlime::new, MobCategory.MONSTER)
                     .sized(0.52f, 0.52f)
                     .clientTrackingRange(10)
-                    .build(type("chaos_slime"))
-                     //?} else {
-                    /*FabricEntityTypeBuilder.create(MobCategory.MONSTER, ChaosSlime::new)
-                    .dimensions(EntityDimensions.scalable(0.52f, 0.52f))
-                    .trackRangeBlocks(10)
-                    .build()
-                    *///?}
-            );
+                    .build(type("chaos_slime")));
     public static final RegistrySupplier<EntityType<ChaosSkeleton>> CHAOS_SKELETON = INFINITY_ENTITIES
             .register("chaos_skeleton", () -> EntityType.Builder.of(ChaosSkeleton::new, MobCategory.MONSTER)
                     .sized(0.6f, 1.99f)

src/main/resources/accesswideners/1.20.1.accesswidener

···
 accessible class net/minecraft/world/level/levelgen/SurfaceRules$SurfaceRule
 accessible class net/minecraft/world/entity/animal/AbstractFish$FishMoveControl
 accessible method net/minecraft/world/entity/Entity getRelativePortalPosition (Lnet/minecraft/core/Direction$Axis;Lnet/minecraft/BlockUtil$FoundRectangle;)Lnet/minecraft/world/phys/Vec3;
-accessible method net/minecraft/world/level/levelgen/structure/Structure findGenerationPoint (Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;)Ljava/util/Optional;
+accessible method net/minecraft/world/level/levelgen/structure/Structure findGenerationPoint (Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;)Ljava/util/Optional;
+accessible method net/minecraft/client/gui/screens/Screen addRenderableWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;

src/main/resources/accesswideners/1.21.1.accesswidener

···
 accessible class net/minecraft/world/level/levelgen/SurfaceRules$SurfaceRule
 accessible class net/minecraft/world/entity/animal/AbstractFish$FishMoveControl
 accessible method net/minecraft/world/level/block/NetherPortalBlock getDimensionTransitionFromExit (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;Lnet/minecraft/BlockUtil$FoundRectangle;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/portal/DimensionTransition$PostDimensionTransition;)Lnet/minecraft/world/level/portal/DimensionTransition;
-accessible method net/minecraft/world/level/levelgen/structure/Structure findGenerationPoint (Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;)Ljava/util/Optional;
+accessible method net/minecraft/world/level/levelgen/structure/Structure findGenerationPoint (Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;)Ljava/util/Optional;
+accessible method net/minecraft/client/gui/screens/Screen addRenderableWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;

src/main/resources/infinity-forge.mixins.json

···
   ],
   "client": [
     "SoundListMixin",
-    "core.ScreenMixin",
     "iridescence.LivingEntityRendererMixin",
     "iridescence.PostEffectProcessorMixin",
     "options.BackgroundRendererMixin",

src/main/resources/infinity.mixins.json

···
   ],
   "client": [
     "SoundListMixin",
-    "core.ScreenMixin",
     "iridescence.LivingEntityRendererMixin",
     "iridescence.PostEffectProcessorMixin",
     "options.BackgroundRendererMixin",

versions/1.20.1-forge/src/main/resources/META-INF/accesstransformer.cfg

···
 
 public net.minecraft.world.level.block.NetherPortalBlock
 public net.minecraft.world.level.levelgen.structure.Structure
+
+public net.minecraft.client.gui.screens.Screen m_142416_(Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener; # addRenderableWidget
+public net.minecraft.client.gui.screens.worldselection.CreateWorldScreen m_142416_(Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener; # addRenderableWidget

versions/1.21.1-neoforge/src/main/resources/META-INF/accesstransformer.cfg

···
 public net.minecraft.world.level.block.NetherPortalBlock
 public net.minecraft.world.level.levelgen.structure.Structure
 public net.minecraft.world.level.block.NetherPortalBlock getDimensionTransitionFromExit(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;Lnet/minecraft/BlockUtil$FoundRectangle;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/portal/DimensionTransition$PostDimensionTransition;)Lnet/minecraft/world/level/portal/DimensionTransition;
-public net.minecraft.world.level.levelgen.structure.Structure findGenerationPoint(Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;)Ljava/util/Optional;
+public net.minecraft.world.level.levelgen.structure.Structure findGenerationPoint(Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;)Ljava/util/Optional;
+
+public net.minecraft.client.gui.screens.worldselection.CreateWorldScreen addRenderableWidget(Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener; # addRenderableWidget
+public net.minecraft.client.gui.screens.Screen addRenderableWidget(Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener; # addRenderableWidget

versions/1.21.10-neoforge/src/main/resources/META-INF/accesstransformer.cfg

···
 public net.minecraft.world.level.levelgen.structure.Structure
 public net.minecraft.world.level.block.NetherPortalBlock getDimensionTransitionFromExit(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;Lnet/minecraft/BlockUtil$FoundRectangle;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition;)Lnet/minecraft/world/level/portal/TeleportTransition; # getDimensionTransitionFromExit
 public net.minecraft.world.level.levelgen.structure.Structure findGenerationPoint(Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;)Ljava/util/Optional;
-public net.minecraft.core.MappedRegistry$TagSet
+public net.minecraft.core.MappedRegistry$TagSet
+
+public net.minecraft.client.gui.screens.Screen addRenderableWidget(Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener; # addRenderableWidget

versions/1.21.8-neoforge/src/main/resources/META-INF/accesstransformer.cfg

···
 public net.minecraft.world.level.levelgen.structure.Structure
 public net.minecraft.world.level.block.NetherPortalBlock getDimensionTransitionFromExit(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;Lnet/minecraft/BlockUtil$FoundRectangle;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition;)Lnet/minecraft/world/level/portal/TeleportTransition; # getDimensionTransitionFromExit
 public net.minecraft.world.level.levelgen.structure.Structure findGenerationPoint(Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;)Ljava/util/Optional;
-public net.minecraft.core.MappedRegistry$TagSet
+public net.minecraft.core.MappedRegistry$TagSet
+
+public net.minecraft.client.gui.screens.Screen addRenderableWidget(Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener; # addRenderableWidget