Fixed terracotta to glass map in Experiments for 1.17.x

kevinthegreat1 · Oct 18, 2022 · 2947fdf · 2947fdf
1 parent 99c3433
commit 2947fdf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,13 +4,13 @@ org.gradle.jvmargs = -Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
 	minecraft_version = 1.18.2
-	yarn_mappings = 1.18.2+build.3
-	loader_version = 0.14.7
+	yarn_mappings = 1.18.2+build.4
+	loader_version = 0.14.9
 
 # Mod Properties
-	mod_version = 1.7.0
+	mod_version = 1.7.5
 	maven_group = com.kevinthegreat.skyblockmod
-	archives_base_name = SkyblockMod
+	archives_base_name = skyblock-mod
 
 # Dependencies
-	fabric_version = 0.55.1+1.18.2
+	fabric_version = 0.59.1+1.18.2
diff --git a/src/main/java/com/kevinthegreat/skyblockmod/misc/Experiments.java b/src/main/java/com/kevinthegreat/skyblockmod/misc/Experiments.java
@@ -1,6 +1,5 @@
 package com.kevinthegreat.skyblockmod.misc;
 
-import com.google.common.collect.ImmutableMap;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
@@ -38,17 +37,17 @@ public enum State {
     public final Map<Integer, ItemStack> ultrasequencerSlots = new HashMap<>();
     public int ultrasequencerNextSlot;
 
-    public static final ImmutableMap<Item, Item> terracottaToGlass = ImmutableMap.ofEntries(
-            new AbstractMap.SimpleImmutableEntry<>(Items.RED_TERRACOTTA, Items.RED_STAINED_GLASS),
-            new AbstractMap.SimpleImmutableEntry<>(Items.ORANGE_TERRACOTTA, Items.ORANGE_STAINED_GLASS),
-            new AbstractMap.SimpleImmutableEntry<>(Items.YELLOW_TERRACOTTA, Items.YELLOW_STAINED_GLASS),
-            new AbstractMap.SimpleImmutableEntry<>(Items.LIME_TERRACOTTA, Items.LIME_STAINED_GLASS),
-            new AbstractMap.SimpleImmutableEntry<>(Items.GREEN_TERRACOTTA, Items.GREEN_STAINED_GLASS),
-            new AbstractMap.SimpleImmutableEntry<>(Items.CYAN_TERRACOTTA, Items.CYAN_STAINED_GLASS),
-            new AbstractMap.SimpleImmutableEntry<>(Items.LIGHT_BLUE_TERRACOTTA, Items.LIGHT_BLUE_STAINED_GLASS),
-            new AbstractMap.SimpleImmutableEntry<>(Items.BLUE_TERRACOTTA, Items.BLUE_STAINED_GLASS),
-            new AbstractMap.SimpleImmutableEntry<>(Items.PURPLE_TERRACOTTA, Items.PURPLE_STAINED_GLASS),
-            new AbstractMap.SimpleImmutableEntry<>(Items.PINK_TERRACOTTA, Items.PINK_STAINED_GLASS)
+    public static final Map<Item, Item> terracottaToGlass = Map.of(
+            Items.RED_TERRACOTTA, Items.RED_STAINED_GLASS,
+            Items.ORANGE_TERRACOTTA, Items.ORANGE_STAINED_GLASS,
+            Items.YELLOW_TERRACOTTA, Items.YELLOW_STAINED_GLASS,
+            Items.LIME_TERRACOTTA, Items.LIME_STAINED_GLASS,
+            Items.GREEN_TERRACOTTA, Items.GREEN_STAINED_GLASS,
+            Items.CYAN_TERRACOTTA, Items.CYAN_STAINED_GLASS,
+            Items.LIGHT_BLUE_TERRACOTTA, Items.LIGHT_BLUE_STAINED_GLASS,
+            Items.BLUE_TERRACOTTA, Items.BLUE_STAINED_GLASS,
+            Items.PURPLE_TERRACOTTA, Items.PURPLE_STAINED_GLASS,
+            Items.PINK_TERRACOTTA, Items.PINK_STAINED_GLASS
     );
 
     public Experiments() {