1.21

constellation-mc · Aug 2, 2024 · 832c854 · 832c854
1 parent b0928af
commit 832c854
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 47 deletions.
diff --git a/...tter-data/src/main/java/me/melontini/dark_matter/api/data/codecs/JsonCodecDataLoader.java b/...tter-data/src/main/java/me/melontini/dark_matter/api/data/codecs/JsonCodecDataLoader.java
@@ -5,6 +5,8 @@
 import com.google.gson.JsonElement;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.JsonOps;
+import java.util.Map;
+import java.util.function.BiConsumer;
 import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener;
 import net.minecraft.resource.JsonDataLoader;
 import net.minecraft.resource.ResourceManager;
@@ -13,9 +15,6 @@
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Map;
-import java.util.function.BiConsumer;
-
 public abstract class JsonCodecDataLoader<T> extends JsonDataLoader
     implements IdentifiableResourceReloadListener {
 

diff --git a/...er-data/src/main/java/me/melontini/dark_matter/api/data/states/PersistentStateHelper.java b/...er-data/src/main/java/me/melontini/dark_matter/api/data/states/PersistentStateHelper.java
@@ -1,5 +1,10 @@
 package me.melontini.dark_matter.api.data.states;
 
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
 import lombok.experimental.UtilityClass;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.registry.RegistryWrapper;
@@ -8,12 +13,6 @@
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Optional;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 @UtilityClass
 @ApiStatus.Experimental
 public final class PersistentStateHelper {

diff --git a/...src/main/java/me/melontini/dark_matter/impl/data/mixin/loading/DataPackContentsMixin.java b/...src/main/java/me/melontini/dark_matter/impl/data/mixin/loading/DataPackContentsMixin.java
@@ -3,6 +3,9 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 import me.melontini.dark_matter.api.data.loading.ReloaderType;
 import me.melontini.dark_matter.impl.data.loading.InternalContentsAccessor;
 import me.melontini.dark_matter.impl.data.loading.InternalContext;
@@ -20,10 +23,6 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-
 @Mixin(value = DataPackContents.class, priority = 1100)
 abstract class DataPackContentsMixin implements InternalContentsAccessor {
 

diff --git a/dark-matter-enums/src/main/java/me/melontini/dark_matter/api/enums/Parameters.java b/dark-matter-enums/src/main/java/me/melontini/dark_matter/api/enums/Parameters.java
@@ -1,5 +1,6 @@
 package me.melontini.dark_matter.api.enums;
 
+import java.util.function.Supplier;
 import lombok.experimental.UtilityClass;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -9,8 +10,6 @@
 import net.minecraft.item.ItemStack;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.function.Supplier;
-
 @UtilityClass
 public class Parameters {
 

diff --git a/...litter/src/main/java/me/melontini/dark_matter/impl/glitter/particles/VanillaParticle.java b/...litter/src/main/java/me/melontini/dark_matter/impl/glitter/particles/VanillaParticle.java
@@ -78,28 +78,31 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
     matrixStack.mul(matrices.peek().getPositionMatrix());
     RenderSystem.applyModelViewMatrix();
 
-        Mirage.getAlwaysBrightLTM().enable();
+    Mirage.getAlwaysBrightLTM().enable();
 
     RenderSystem.setShader(GameRenderer::getParticleProgram);
     RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-    BufferBuilder bufferBuilder = particle.getType().begin(Tessellator.getInstance(), client.getTextureManager());
+    BufferBuilder bufferBuilder =
+        particle.getType().begin(Tessellator.getInstance(), client.getTextureManager());
 
     if (bufferBuilder != null) {
-            try {
-                particle.buildGeometry(bufferBuilder, CAMERA, delta);
-            } catch (Throwable var17) {
-                CrashReport crashReport = CrashReport.create(var17, "[Dark Matter Glitter] Rendering Particle On Screen");
-                CrashReportSection crashReportSection = crashReport.addElement("Particle being rendered on screen");
-                crashReportSection.add("Particle", particle::toString);
-                crashReportSection.add("Particle Type", particle.getType()::toString);
-                throw new CrashException(crashReport);
-            }
-
-            BuiltBuffer builtBuffer = bufferBuilder.endNullable();
-            if (builtBuffer != null) {
-                BufferRenderer.drawWithGlobalProgram(builtBuffer);
-            }
-        }
+      try {
+        particle.buildGeometry(bufferBuilder, CAMERA, delta);
+      } catch (Throwable var17) {
+        CrashReport crashReport =
+            CrashReport.create(var17, "[Dark Matter Glitter] Rendering Particle On Screen");
+        CrashReportSection crashReportSection =
+            crashReport.addElement("Particle being rendered on screen");
+        crashReportSection.add("Particle", particle::toString);
+        crashReportSection.add("Particle Type", particle.getType()::toString);
+        throw new CrashException(crashReport);
+      }
+
+      BuiltBuffer builtBuffer = bufferBuilder.endNullable();
+      if (builtBuffer != null) {
+        BufferRenderer.drawWithGlobalProgram(builtBuffer);
+      }
+    }
 
     Mirage.getAlwaysBrightLTM().disable();
     matrixStack.popMatrix();

diff --git a/...er-item-group/src/main/java/me/melontini/dark_matter/api/item_group/ItemGroupBuilder.java b/...er-item-group/src/main/java/me/melontini/dark_matter/api/item_group/ItemGroupBuilder.java
@@ -30,9 +30,10 @@ default ItemGroupBuilder icon(ItemConvertible item) {
   ItemGroupBuilder icon(Supplier<ItemStack> itemStackSupplier);
 
   default ItemGroupBuilder texture(String texture) {
-        return this.texture(Identifier.of(texture));
-    }
-    ItemGroupBuilder texture(Identifier texture);
+    return this.texture(Identifier.of(texture));
+  }
+
+  ItemGroupBuilder texture(Identifier texture);
 
   ItemGroupBuilder entries(DarkMatterEntries.Collector collector);
 

diff --git a/...raft/src/main/java/me/melontini/dark_matter/impl/minecraft/client/util/DrawInternals.java b/...raft/src/main/java/me/melontini/dark_matter/impl/minecraft/client/util/DrawInternals.java
@@ -16,13 +16,13 @@
 import net.minecraft.client.gui.tooltip.HoveredTooltipPositioner;
 import net.minecraft.client.gui.tooltip.TooltipComponent;
 import net.minecraft.client.gui.tooltip.TooltipPositioner;
-import net.minecraft.item.tooltip.TooltipData;
 import net.minecraft.client.render.*;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.json.ModelTransformationMode;
 import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.tooltip.TooltipData;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
 import org.joml.Matrix4f;
@@ -113,7 +113,8 @@ public static void fillGradient(
     RenderSystem.defaultBlendFunc();
     RenderSystem.setShader(GameRenderer::getPositionColorProgram);
     Tessellator tessellator = Tessellator.getInstance();
-    BufferBuilder bufferBuilder = tessellator.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR);
+    BufferBuilder bufferBuilder =
+        tessellator.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR);
     fillGradient(
         matrices.peek().getPositionMatrix(),
         bufferBuilder,
@@ -165,7 +166,8 @@ public static void fillGradientHorizontal(
     RenderSystem.defaultBlendFunc();
     RenderSystem.setShader(GameRenderer::getPositionColorProgram);
     Tessellator tessellator = Tessellator.getInstance();
-    BufferBuilder bufferBuilder = tessellator.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR);
+    BufferBuilder bufferBuilder =
+        tessellator.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR);
     fillGradientHorizontal(
         matrices.peek().getPositionMatrix(),
         bufferBuilder,
@@ -309,7 +311,8 @@ public static void drawTexturedQuad(
       float v0,
       float v1) {
     RenderSystem.setShader(GameRenderer::getPositionTexProgram);
-    BufferBuilder bufferBuilder = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE);
+    BufferBuilder bufferBuilder = Tessellator.getInstance()
+        .begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE);
     bufferBuilder.vertex(matrix, x0, y1, z).texture(u0, v1);
     bufferBuilder.vertex(matrix, x1, y1, z).texture(u1, v1);
     bufferBuilder.vertex(matrix, x1, y0, z).texture(u1, v0);

diff --git a/dark-matter-mirage/src/main/java/me/melontini/dark_matter/impl/mirage/FakeWorld.java b/dark-matter-mirage/src/main/java/me/melontini/dark_matter/impl/mirage/FakeWorld.java
@@ -4,6 +4,11 @@
 import com.google.common.collect.ImmutableList;
 import com.mojang.authlib.GameProfile;
 import com.mojang.serialization.Lifecycle;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.function.Supplier;
 import lombok.experimental.UtilityClass;
 import me.melontini.dark_matter.api.base.util.Utilities;
 import me.melontini.dark_matter.api.minecraft.client.events.AfterFirstReload;
@@ -26,12 +31,6 @@
 import net.minecraft.world.dimension.DimensionTypes;
 import net.minecraft.world.gen.WorldPresets;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
-import java.util.function.Supplier;
-
 @UtilityClass
 public class FakeWorld {
 
@@ -65,7 +64,8 @@ public class FakeWorld {
               Collections.emptyMap(),
               null,
               false,
-                    Collections.emptyMap(), ServerLinks.EMPTY));
+              Collections.emptyMap(),
+              ServerLinks.EMPTY));
 
       return new ClientWorld(
           networkHandler,

diff --git a/...pe-book/src/main/java/me/melontini/dark_matter/impl/recipe_book/RecipeBookPageButton.java b/...pe-book/src/main/java/me/melontini/dark_matter/impl/recipe_book/RecipeBookPageButton.java
@@ -12,7 +12,8 @@
 
 public class RecipeBookPageButton extends ButtonWidget {
 
-    private static final Identifier TEXTURE = Identifier.of("dark-matter-recipe-book", "textures/gui/recipe_book_buttons.png");
+  private static final Identifier TEXTURE =
+      Identifier.of("dark-matter-recipe-book", "textures/gui/recipe_book_buttons.png");
 
   private final boolean next;
   private final RecipeBookWidget widget;