Merge branch 'master' into architectury/1.21.4

common/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.util.InfinityMethods;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.world.EditWorldScreen;
+import net.minecraft.client.gui.tooltip.Tooltip;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.DirectionalLayoutWidget;
+import net.minecraft.text.Text;
+import net.minecraft.world.level.storage.LevelStorage;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(EditWorldScreen.class)
+public class EditWorldScreenMixin {
+
+    @Shadow @Final private BooleanConsumer callback;
+
+    @Inject(method = "<init>", at = @At(value = "RETURN", target = "Lnet/minecraft/world/GameRules;getBoolean(Lnet/minecraft/world/GameRules$Key;)Z"))
+    void addButton(MinecraftClient client, LevelStorage.Session session, String levelName, BooleanConsumer callback, CallbackInfo ci) {
+        var screen = (EditWorldScreen) (Object) this;
+        screen.addDrawableChild(ButtonWidget.builder(Text.translatable("screen.infinity.delete_datapacks"), button -> {
+            boolean bl = InfinityMethods.deleteLevel(session);
+            this.callback.accept(!bl);
+        }).width(200).tooltip(Tooltip.of(Text.translatable("screen.infinity.delete_datapacks.tooltip"), null)).build());
+    }
+}

common/src/main/java/net/lerariemann/infinity/mixin/qol/FireBlockMixin.java

···
 public class FireBlockMixin {
     /* Disabling fire tick in infdims */
     @ModifyExpressionValue(method = "scheduledTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/GameRules;getBoolean(Lnet/minecraft/world/GameRules$Key;)Z"))
-    boolean inj(boolean original, @Local(argsOnly = true) ServerWorld world) {
+    boolean disableFireTick(boolean original, @Local(argsOnly = true) ServerWorld world) {
         if (InfinityMethods.isInfinity(world)) return false;
         return original;
     }

common/src/main/java/net/lerariemann/infinity/util/InfinityMethods.java

···
 import net.minecraft.world.BlockRenderView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
+import net.minecraft.world.level.storage.LevelStorage;
+import org.apache.commons.io.FileUtils;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
···
     }
 
     static CustomModelDataComponent getColoredModel(int color) {
-        return new CustomModelDataComponent(List.of(), List.of(), List.of(), List.of(color));
+        return new CustomModelDataComponent(List.of(), List.of(), List.of(), List.of(color)); 
+    }
+    
+    static boolean deleteLevel(LevelStorage.Session session) {
+        return FileUtils.deleteQuietly(session.getDirectory().path().resolve("datapacks").toFile());
     }
 }

common/src/main/resources/assets/infinity/lang/en_us.json

···
   "recipe_info.portal.infinity.attuned": "The item is attuned to the portal used",
   "recipe_info.iridescence.infinity.key": "No matter the key provided, a random one is born",
   "recipe_info.iridescence.infinity.chromatic_matter": "Gets drenched with the liquid's hue",
+  "screen.infinity.delete_datapacks": "[Infinity] Delete Datapacks",
+  "screen.infinity.delete_datapacks.tooltip": "WARNING: This option will forcibly delete all datapacks in this world's files. Use to recover a world if a dimension is preventing the world from being loaded.",
   "stat.infinity.portals_opened_stat": "Infinity portals opened",
   "stat.infinity.dimensions_opened_stat": "Unique dimensions discovered",
   "stat.infinity.worlds_destroyed_stat": "Unique dimensions destroyed",

common/src/main/resources/infinity.accesswidener

···
 accessible class net/minecraft/entity/passive/FishEntity$FishMoveControl
 accessible class net/minecraft/registry/SimpleRegistry$TagLookup
 accessible field net/minecraft/loot/context/LootContextTypes MAP Lcom/google/common/collect/BiMap;
-accessible field net/minecraft/client/render/BackgroundRenderer fogEnabled Z
+accessible field net/minecraft/client/render/BackgroundRenderer fogEnabled Z
+accessible method net/minecraft/client/gui/screen/Screen addDrawableChild (Lnet/minecraft/client/gui/Element;)Lnet/minecraft/client/gui/Element;

common/src/main/resources/infinity.mixins.json

···
     "options.SkyRenderingMixin",
     "options.SoundSystemMixin",
     "options.WorldRendererMixin",
+    "qol.EditWorldScreenMixin",
     "qol.KeyboardMixin"
   ],
   "injectors": {

neoforge/src/main/java/net/lerariemann/infinity/neoforge/client/InfinityModNeoForgeClient.java

···
 import net.minecraft.fluid.FluidState;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ColorHelper;
 import net.minecraft.world.BlockRenderView;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
···
 
                 @Override
                 public int getTintColor() {
-                    return Iridescence.getTimeBasedColor();
+                    return ColorHelper.Argb.fullAlpha(Iridescence.getTimeBasedColor());
                 }
                 @Override
                 public int getTintColor(@NotNull FluidState state, @NotNull BlockRenderView getter, @NotNull BlockPos pos) {
-                    return Iridescence.getPosBasedColor(pos);
+                    return ColorHelper.Argb.fullAlpha(Iridescence.getPosBasedColor(pos));
                 }
 
             }, FluidTypes.IRIDESCENCE_TYPE.value());