1.18.2 test

constellation-mc · Jul 1, 2023 · 995e532 · 995e532
1 parent cb7e740
commit 995e532
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 23 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -35,7 +35,7 @@ jobs:
           version: ${{ env.VERSION_PLAIN }}
 
           game-versions: |
-            1.19.2
+            1.18.2
 
           loaders: |
             fabric

diff --git a/dark-matter-content/src/main/resources/fabric.mod.json b/dark-matter-content/src/main/resources/fabric.mod.json
@@ -18,7 +18,7 @@
   ],
   "depends": {
     "fabricloader": "*",
-    "minecraft": ">=1.19",
+    "minecraft": ">=1.18",
     "dark-matter-base": "*"
   },
   "custom": {

diff --git a/...er-glitter/src/main/java/me/melontini/dark_matter/glitter/mixin/MinecraftClientMixin.java b/...er-glitter/src/main/java/me/melontini/dark_matter/glitter/mixin/MinecraftClientMixin.java
@@ -2,9 +2,6 @@
 
 import me.melontini.dark_matter.glitter.client.util.ScreenParticleHelper;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.resource.ResourcePackManager;
-import net.minecraft.server.SaveLoader;
-import net.minecraft.world.level.storage.LevelStorage;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -27,8 +24,8 @@ public abstract class MinecraftClientMixin {
         if (this.dark_matter$init) ScreenParticleHelper.tickParticles();
     }
 
-    @Inject(method = "startIntegratedServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/LevelLoadingScreen;tick()V"))
-    private void dark_matter$tickScreen(String levelName, LevelStorage.Session session, ResourcePackManager dataPackManager, SaveLoader saveLoader, CallbackInfo ci) {
+    @Inject(method = "startIntegratedServer(Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Function;ZLnet/minecraft/client/MinecraftClient$WorldLoadAction;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/LevelLoadingScreen;tick()V"))
+    private void dark_matter$tickScreen(CallbackInfo ci) {
         if (this.dark_matter$init) ScreenParticleHelper.tickParticles();
     }
 }
diff --git a/dark-matter-glitter/src/main/resources/fabric.mod.json b/dark-matter-glitter/src/main/resources/fabric.mod.json
@@ -18,7 +18,7 @@
   ],
   "depends": {
     "fabricloader": "*",
-    "minecraft": ">=1.19",
+    "minecraft": ">=1.18",
     "dark-matter-base": "*"
   },
   "custom": {

diff --git a/...tter-minecraft/src/main/java/me/melontini/dark_matter/minecraft/client/util/DrawUtil.java b/...tter-minecraft/src/main/java/me/melontini/dark_matter/minecraft/client/util/DrawUtil.java
@@ -165,7 +165,7 @@ public static void drawTexturedQuad(Matrix4f matrix, float x0, float x1, float y
         bufferBuilder.vertex(matrix, x1, y1, z).texture(u1, v1).next();
         bufferBuilder.vertex(matrix, x1, y0, z).texture(u1, v0).next();
         bufferBuilder.vertex(matrix, x0, y0, z).texture(u0, v0).next();
-        BufferRenderer.drawWithShader(bufferBuilder.end());
+        BufferRenderer.draw(bufferBuilder);
     }
 
     public static void renderGuiItemModelCustomMatrixNoTransform(MatrixStack matrixStack, ItemStack stack, BakedModel model) {
@@ -235,7 +235,9 @@ public void reset(MinecraftClient client, int width, int height) {
             this.textRenderer = client.textRenderer;
             this.width = width;
             this.height = height;
-            this.clearAndInit();
+            this.clearChildren();
+            this.setFocused(null);
+            this.init();
         }
     }
 }
diff --git a/dark-matter-minecraft/src/main/java/me/melontini/dark_matter/minecraft/util/TextUtil.java b/dark-matter-minecraft/src/main/java/me/melontini/dark_matter/minecraft/util/TextUtil.java
@@ -1,21 +1,22 @@
 package me.melontini.dark_matter.minecraft.util;
 
+import net.minecraft.text.LiteralText;
 import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
 
 public class TextUtil {
     private TextUtil() {
         throw new UnsupportedOperationException();
     }
     public static MutableText translatable(String key) {
-        return Text.translatable(key);
+        return new TranslatableText(key);
     }
 
     public static MutableText translatable(String key, Object... args) {
-        return Text.translatable(key, args);
+        return new TranslatableText(key, args);
     }
 
     public static MutableText literal(String text) {
-        return Text.literal(text);
+        return new LiteralText(text);
     }
 }
diff --git a/dark-matter-minecraft/src/main/resources/dark-matter.accesswidener b/dark-matter-minecraft/src/main/resources/dark-matter.accesswidener
@@ -12,7 +12,6 @@ transitive-accessible method net/minecraft/client/gui/screen/Screen renderToolti
 transitive-accessible method net/minecraft/entity/projectile/ProjectileEntity <init> (Lnet/minecraft/entity/EntityType;Lnet/minecraft/world/World;)V
 transitive-accessible method net/minecraft/entity/FallingBlockEntity <init> (Lnet/minecraft/world/World;DDDLnet/minecraft/block/BlockState;)V
 transitive-accessible method net/minecraft/text/TextColor <init> (ILjava/lang/String;)V
-transitive-accessible method net/minecraft/entity/vehicle/AbstractMinecartEntity getItem ()Lnet/minecraft/item/Item;
 transitive-accessible method net/minecraft/client/world/ClientWorld getEntityLookup ()Lnet/minecraft/world/entity/EntityLookup;
 transitive-accessible method net/minecraft/world/World getEntityLookup ()Lnet/minecraft/world/entity/EntityLookup;
 

diff --git a/dark-matter-minecraft/src/main/resources/fabric.mod.json b/dark-matter-minecraft/src/main/resources/fabric.mod.json
@@ -19,7 +19,7 @@
   ],
   "depends": {
     "fabricloader": "*",
-    "minecraft": ">=1.19",
+    "minecraft": ">=1.18",
     "dark-matter-base": "*"
   },
   "custom": {

diff --git a/dark-matter-mirage/src/main/java/me/melontini/dark_matter/mirage/FakeWorld.java b/dark-matter-mirage/src/main/java/me/melontini/dark_matter/mirage/FakeWorld.java
@@ -11,7 +11,7 @@
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.World;
-import net.minecraft.world.dimension.DimensionTypes;
+import net.minecraft.world.dimension.DimensionType;
 
 import java.util.UUID;
 
@@ -25,7 +25,7 @@ private FakeWorld() {
         super(new ClientPlayNetworkHandler(MinecraftClient.getInstance(), null, new ClientConnection(NetworkSide.CLIENTBOUND), new GameProfile(UUID.randomUUID(), "fake_profile_ratio"), null),
                 new Properties(Difficulty.EASY, false, false),
                 World.OVERWORLD,
-                DynamicRegistryManager.BUILTIN.get().get(Registry.DIMENSION_TYPE_KEY).entryOf(DimensionTypes.OVERWORLD),
+                DynamicRegistryManager.BUILTIN.get().get(Registry.DIMENSION_TYPE_KEY).entryOf(DimensionType.OVERWORLD_REGISTRY_KEY),
                 0, 0, null,
                 MinecraftClient.getInstance().worldRenderer, true, 0);
     }

diff --git a/dark-matter-mirage/src/main/resources/fabric.mod.json b/dark-matter-mirage/src/main/resources/fabric.mod.json
@@ -18,7 +18,7 @@
   ],
   "depends": {
     "fabricloader": "*",
-    "minecraft": ">=1.19",
+    "minecraft": ">=1.18",
     "dark-matter-base": "*"
   },
   "custom": {

diff --git a/gradle.properties b/gradle.properties
@@ -4,11 +4,11 @@ org.gradle.jvmargs=-Xmx2G
 fabric.loom.multiProjectOptimisation=true
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.19.2
-yarn_mappings=1.19.2+build.28
+minecraft_version=1.18.2
+yarn_mappings=1.18.2+build.4
 loader_version=0.14.19
 # Mod Properties
-mod_version=0.6.1-1.19.2
+mod_version=0.6.1-1.18.2
 maven_group=me.melontini
 archives_base_name=dark-matter
 # Dependencies

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -13,7 +13,7 @@
   "environment": "*",
   "depends": {
     "fabricloader": "*",
-    "minecraft": ">=1.19"
+    "minecraft": ">=1.18"
   },
   "custom": {
     "modmenu": {