finalize 1.20.1 update

AlmostReliable · Sep 10, 2023 · 8197796 · 8197796
1 parent fbace58
commit 8197796
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [0.3.0] - 2023-09-10
+- Update to KubeJS 6.3 1.20.1
+
 ## [0.2.0] - 2023-07-18
 - Update to KubeJS 6.1
 

diff --git a/Common/src/main/java/com/almostreliable/morejs/features/structure/PaletteWrapper.java b/Common/src/main/java/com/almostreliable/morejs/features/structure/PaletteWrapper.java
@@ -43,7 +43,8 @@ public void add(BlockPos pos, BlockState state, @Nullable CompoundTag tag) {
                 "Invalid position, z must be between 0 and " + borderSize.getZ());
 
         StructureTemplate.StructureBlockInfo info = get(pos);
-        if (info instanceof StructureBlockInfoModification mod) {
+        //noinspection ConstantValue
+        if (((Object)info) instanceof StructureBlockInfoModification mod) { // Direct cast seems not to work anymore. Have fun with this.
             mod.setVanillaBlockState(state);
             mod.setNbt(tag);
             return;
@@ -61,7 +62,7 @@ public void forEach(Consumer<StructureTemplate.StructureBlockInfo> consumer) {
     public void removeIf(Predicate<StructureTemplate.StructureBlockInfo> predicate) {
         palette.blocks().removeIf(block -> {
             if (predicate.test(block)) {
-                cache.remove(block.pos);
+                cache.remove(block.pos());
                 return true;
             }
             return false;
@@ -71,7 +72,7 @@ public void removeIf(Predicate<StructureTemplate.StructureBlockInfo> predicate)
     @Nullable
     public StructureTemplate.StructureBlockInfo get(BlockPos pos) {
         if (cache.isEmpty()) {
-            forEach(info -> cache.put(info.pos, info));
+            forEach(info -> cache.put(info.pos(), info));
         }
 
         return cache.get(pos);

diff --git a/Common/src/main/java/com/almostreliable/morejs/mixin/enchanting/EnchantmentScreenMixin.java b/Common/src/main/java/com/almostreliable/morejs/mixin/enchanting/EnchantmentScreenMixin.java
@@ -7,6 +7,7 @@
 import dev.latvian.mods.kubejs.bindings.TextWrapper;
 import dev.latvian.mods.kubejs.script.ScriptType;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.EnchantmentScreen;
 import net.minecraft.network.chat.Component;
@@ -31,8 +32,9 @@ public EnchantmentScreenMixin(EnchantmentMenu abstractContainerMenu, Inventory i
         super(abstractContainerMenu, inventory, component);
     }
 
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/inventory/EnchantmentScreen;renderComponentTooltip(Lcom/mojang/blaze3d/vertex/PoseStack;Ljava/util/List;II)V"), locals = LocalCapture.CAPTURE_FAILEXCEPTION)
-    private void render$InvokeEnchantmentTooltipMenu(PoseStack ps, int mx, int my, float pTick, CallbackInfo ci, boolean creative, int goldCount, int slot, int cost, Enchantment enchantment, int lClue, int level, List<Component> currentComponents) {
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;renderComponentTooltip(Lnet/minecraft/client/gui/Font;Ljava/util/List;II)V"), locals = LocalCapture.CAPTURE_FAILEXCEPTION)
+    // PoseStack ps, int mx, int my, float pTick, CallbackInfo ci, boolean creative, int goldCount, int slot, int cost, Enchantment enchantment, int lClue, int level, List<Component> currentComponents
+    private void render$InvokeEnchantmentTooltipMenu(GuiGraphics graphics, int mx, int my, float pTick, CallbackInfo ci, boolean creative, int goldCount, int slot, int cost, Enchantment enchantment, int lClue, int level, List<Component> currentComponents) {
         if (Minecraft.getInstance().level == null || Minecraft.getInstance().player == null) {
             return;
         }

diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml
@@ -20,7 +20,7 @@ side = "BOTH"
 [[dependencies.${modId}]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19,1.20)"
+versionRange = "[1.20.1,)"
 ordering = "NONE"
 side = "BOTH"
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # Project
-version = 0.2.0
+version = 0.3.0
 group = com.almostreliable.morejs
 license = GNU Lesser General Public License v3.0
 mixinVersion = 0.8.5
@@ -17,7 +17,7 @@ fabricLoaderVersion = 0.14.21
 
 # Dependencies
 extraModsDirectory = extra-mods
-kubejsVersion = 2001.6.2-build.15
+kubejsVersion = 2001.6.3-build.38
 rhinoVersion = 2001.2.2-build.6
 architecturyVersion = 9.1.12
 reiVersion = 12+