diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83b1..c30b486a8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index a3185c7d3..656e22725 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,10 +8,10 @@ pluginManagement { gradlePluginPortal() } } -include 'v1_20_2' -include 'v1_20' -include 'v1_19_4' -include 'v1_19_3' -include 'v1_19' -include 'v1_18' -include 'v1_17' +include 'v1_20_4' +//include 'v1_20' +//include 'v1_19_4' +//include 'v1_19_3' +//include 'v1_19' +//include 'v1_18' +//include 'v1_17' diff --git a/v1_20_2/build.gradle.kts b/v1_20_4/build.gradle.kts similarity index 89% rename from v1_20_2/build.gradle.kts rename to v1_20_4/build.gradle.kts index c3b72eeb4..a0485044d 100644 --- a/v1_20_2/build.gradle.kts +++ b/v1_20_4/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("fabric-loom").version("1.0-SNAPSHOT") + id("fabric-loom").version("1.4-SNAPSHOT") id("maven-publish") } @@ -70,7 +70,7 @@ fun deleteOldFiles(sourceBase: File) { val syncImplementations = tasks.create("syncImplementations") { doFirst { val sourceStart = - this.project.projectDir.absolutePath + "/src/main/java/me/aleksilassila/litematica/printer/" + sourceModule + this.project.projectDir.absolutePath + "/src/main/java/me/aleksilassila/litematica/printer/" + sourceModule val sourceDir = file(sourceStart) deleteOldFiles(sourceDir) @@ -79,10 +79,10 @@ val syncImplementations = tasks.create("syncImplementations") { if (sourceFile.name.equals("implementation")) continue sourceFile.walk() - .filter { it.isFile } - .forEach { - copyFile(it) - } + .filter { it.isFile } + .forEach { + copyFile(it) + } } } } diff --git a/v1_20_2/gradle.properties b/v1_20_4/gradle.properties similarity index 63% rename from v1_20_2/gradle.properties rename to v1_20_4/gradle.properties index 8ae3243c5..0d793f826 100644 --- a/v1_20_2/gradle.properties +++ b/v1_20_4/gradle.properties @@ -1,13 +1,13 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G # https://masa.dy.fi/maven/fi/dy/masa/malilib/ -malilib_version=1.20.2:0.17.0 +malilib_version=1.20.4:0.18.0 # https://www.curseforge.com/minecraft/mc-mods/litematica/files -litematica_fileid=4789765 +litematica_fileid=4946471 litematica_projectid=308892 # Fabric Properties: https://fabricmc.net/develop/ -minecraft_version=1.20.2 -yarn_mappings=1.20.2+build.4 -loader_version=0.14.22 +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.3 +loader_version=0.15.3 #Fabric api -fabric_version=0.89.3+1.20.2 +fabric_version=0.91.3+1.20.4 \ No newline at end of file diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/ActionHandler.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/ActionHandler.java similarity index 89% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/ActionHandler.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/ActionHandler.java index 40fda3398..dd68156ba 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/ActionHandler.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/ActionHandler.java @@ -1,7 +1,7 @@ -package me.aleksilassila.litematica.printer.v1_20_2; +package me.aleksilassila.litematica.printer.v1_20_4; -import me.aleksilassila.litematica.printer.v1_20_2.actions.Action; -import me.aleksilassila.litematica.printer.v1_20_2.actions.PrepareAction; +import me.aleksilassila.litematica.printer.v1_20_4.actions.Action; +import me.aleksilassila.litematica.printer.v1_20_4.actions.PrepareAction; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/BlockHelper.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/BlockHelper.java similarity index 96% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/BlockHelper.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/BlockHelper.java index 9de545480..d6bb8f6a4 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/BlockHelper.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/BlockHelper.java @@ -1,4 +1,4 @@ -package me.aleksilassila.litematica.printer.v1_20_2; +package me.aleksilassila.litematica.printer.v1_20_4; import net.minecraft.block.*; import net.minecraft.item.Item; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/LitematicaMixinMod.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/LitematicaMixinMod.java similarity index 98% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/LitematicaMixinMod.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/LitematicaMixinMod.java index e1ab1cd1c..b4356cb9c 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/LitematicaMixinMod.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/LitematicaMixinMod.java @@ -1,4 +1,4 @@ -package me.aleksilassila.litematica.printer.v1_20_2; +package me.aleksilassila.litematica.printer.v1_20_4; import com.google.common.collect.ImmutableList; import fi.dy.masa.litematica.config.Configs; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/Printer.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/Printer.java similarity index 94% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/Printer.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/Printer.java index fc83778d2..d447a597f 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/Printer.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/Printer.java @@ -1,12 +1,12 @@ -package me.aleksilassila.litematica.printer.v1_20_2; +package me.aleksilassila.litematica.printer.v1_20_4; import fi.dy.masa.litematica.data.DataManager; import fi.dy.masa.litematica.util.RayTraceUtils; import fi.dy.masa.litematica.world.SchematicWorldHandler; import fi.dy.masa.litematica.world.WorldSchematic; -import me.aleksilassila.litematica.printer.v1_20_2.actions.Action; -import me.aleksilassila.litematica.printer.v1_20_2.guides.Guide; -import me.aleksilassila.litematica.printer.v1_20_2.guides.Guides; +import me.aleksilassila.litematica.printer.v1_20_4.actions.Action; +import me.aleksilassila.litematica.printer.v1_20_4.guides.Guide; +import me.aleksilassila.litematica.printer.v1_20_4.guides.Guides; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.entity.player.PlayerAbilities; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/SchematicBlockState.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/SchematicBlockState.java similarity index 95% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/SchematicBlockState.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/SchematicBlockState.java index 55be85bd5..baf1b35b1 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/SchematicBlockState.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/SchematicBlockState.java @@ -1,4 +1,4 @@ -package me.aleksilassila.litematica.printer.v1_20_2; +package me.aleksilassila.litematica.printer.v1_20_4; import fi.dy.masa.litematica.world.WorldSchematic; import net.minecraft.block.BlockState; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/UpdateChecker.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/UpdateChecker.java similarity index 87% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/UpdateChecker.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/UpdateChecker.java index d2c0250b0..d4c7c83ec 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/UpdateChecker.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/UpdateChecker.java @@ -1,17 +1,11 @@ -package me.aleksilassila.litematica.printer.v1_20_2; +package me.aleksilassila.litematica.printer.v1_20_4; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import org.apache.commons.io.IOUtils; -import java.io.BufferedReader; -import java.io.File; import java.io.InputStream; -import java.io.InputStreamReader; import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; import java.util.Scanner; public class UpdateChecker { diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/actions/Action.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/actions/Action.java similarity index 78% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/actions/Action.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/actions/Action.java index 4199dd502..150d547f0 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/actions/Action.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/actions/Action.java @@ -1,4 +1,4 @@ -package me.aleksilassila.litematica.printer.v1_20_2.actions; +package me.aleksilassila.litematica.printer.v1_20_4.actions; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/actions/InteractAction.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/actions/InteractAction.java similarity index 84% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/actions/InteractAction.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/actions/InteractAction.java index 022f6f7a0..e71d8aa6e 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/actions/InteractAction.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/actions/InteractAction.java @@ -1,7 +1,7 @@ -package me.aleksilassila.litematica.printer.v1_20_2.actions; +package me.aleksilassila.litematica.printer.v1_20_4.actions; -import me.aleksilassila.litematica.printer.v1_20_2.LitematicaMixinMod; -import me.aleksilassila.litematica.printer.v1_20_2.implementation.PrinterPlacementContext; +import me.aleksilassila.litematica.printer.v1_20_4.LitematicaMixinMod; +import me.aleksilassila.litematica.printer.v1_20_4.implementation.PrinterPlacementContext; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.util.Hand; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/actions/PrepareAction.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/actions/PrepareAction.java similarity index 96% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/actions/PrepareAction.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/actions/PrepareAction.java index ca5141dc8..608e04079 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/actions/PrepareAction.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/actions/PrepareAction.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.actions; +package me.aleksilassila.litematica.printer.v1_20_4.actions; -import me.aleksilassila.litematica.printer.v1_20_2.implementation.PrinterPlacementContext; +import me.aleksilassila.litematica.printer.v1_20_4.implementation.PrinterPlacementContext; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/actions/ReleaseShiftAction.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/actions/ReleaseShiftAction.java similarity index 88% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/actions/ReleaseShiftAction.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/actions/ReleaseShiftAction.java index cfe240632..f4342ebe8 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/actions/ReleaseShiftAction.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/actions/ReleaseShiftAction.java @@ -1,4 +1,4 @@ -package me.aleksilassila.litematica.printer.v1_20_2.actions; +package me.aleksilassila.litematica.printer.v1_20_4.actions; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/Guide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/Guide.java similarity index 94% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/Guide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/Guide.java index f219d049b..4670ca0f6 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/Guide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/Guide.java @@ -1,8 +1,8 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides; +package me.aleksilassila.litematica.printer.v1_20_4.guides; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; -import me.aleksilassila.litematica.printer.v1_20_2.actions.Action; -import me.aleksilassila.litematica.printer.v1_20_2.implementation.BlockHelperImpl; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.actions.Action; +import me.aleksilassila.litematica.printer.v1_20_4.implementation.BlockHelperImpl; import net.minecraft.block.BlockState; import net.minecraft.block.CoralBlock; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/Guides.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/Guides.java similarity index 88% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/Guides.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/Guides.java index cf18066cf..a3c4b3333 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/Guides.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/Guides.java @@ -1,12 +1,8 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides; +package me.aleksilassila.litematica.printer.v1_20_4.guides; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; -import me.aleksilassila.litematica.printer.v1_20_2.guides.interaction.*; -import me.aleksilassila.litematica.printer.v1_20_2.guides.placement.*; -import me.aleksilassila.litematica.printer.v1_20_2.guides.interaction.*; -import me.aleksilassila.litematica.printer.v1_20_2.guides.placement.*; -import me.aleksilassila.litematica.printer.v1_20_2.guides.interaction.*; -import me.aleksilassila.litematica.printer.v1_20_2.guides.placement.*; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.guides.interaction.*; +import me.aleksilassila.litematica.printer.v1_20_4.guides.placement.*; import net.minecraft.block.*; import net.minecraft.util.Pair; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/SkipGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/SkipGuide.java similarity index 80% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/SkipGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/SkipGuide.java index f3bbdac9e..26f1beab2 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/SkipGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/SkipGuide.java @@ -1,7 +1,7 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides; +package me.aleksilassila.litematica.printer.v1_20_4.guides; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; -import me.aleksilassila.litematica.printer.v1_20_2.actions.Action; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.actions.Action; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.item.ItemStack; import org.jetbrains.annotations.NotNull; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/CampfireExtinguishGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/CampfireExtinguishGuide.java similarity index 88% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/CampfireExtinguishGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/CampfireExtinguishGuide.java index 884351295..0d32058ce 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/CampfireExtinguishGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/CampfireExtinguishGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.interaction; +package me.aleksilassila.litematica.printer.v1_20_4.guides.interaction; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.CampfireBlock; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.item.ItemStack; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/CycleStateGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/CycleStateGuide.java similarity index 91% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/CycleStateGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/CycleStateGuide.java index 761f90edd..f4e843e83 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/CycleStateGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/CycleStateGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.interaction; +package me.aleksilassila.litematica.printer.v1_20_4.guides.interaction; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.BlockState; import net.minecraft.block.LeverBlock; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/EnderEyeGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/EnderEyeGuide.java similarity index 87% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/EnderEyeGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/EnderEyeGuide.java index c62a9e981..64d6c7212 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/EnderEyeGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/EnderEyeGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.interaction; +package me.aleksilassila.litematica.printer.v1_20_4.guides.interaction; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/FlowerPotFillGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/FlowerPotFillGuide.java similarity index 90% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/FlowerPotFillGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/FlowerPotFillGuide.java index 1798ff378..84905ea89 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/FlowerPotFillGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/FlowerPotFillGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.interaction; +package me.aleksilassila.litematica.printer.v1_20_4.guides.interaction; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.Block; import net.minecraft.block.FlowerPotBlock; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/InteractionGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/InteractionGuide.java similarity index 73% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/InteractionGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/InteractionGuide.java index e79982b81..f139368c5 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/InteractionGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/InteractionGuide.java @@ -1,12 +1,12 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.interaction; - -import me.aleksilassila.litematica.printer.v1_20_2.implementation.PrinterPlacementContext; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; -import me.aleksilassila.litematica.printer.v1_20_2.actions.Action; -import me.aleksilassila.litematica.printer.v1_20_2.actions.PrepareAction; -import me.aleksilassila.litematica.printer.v1_20_2.actions.ReleaseShiftAction; -import me.aleksilassila.litematica.printer.v1_20_2.guides.Guide; -import me.aleksilassila.litematica.printer.v1_20_2.implementation.actions.InteractActionImpl; +package me.aleksilassila.litematica.printer.v1_20_4.guides.interaction; + +import me.aleksilassila.litematica.printer.v1_20_4.implementation.PrinterPlacementContext; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.actions.Action; +import me.aleksilassila.litematica.printer.v1_20_4.actions.PrepareAction; +import me.aleksilassila.litematica.printer.v1_20_4.actions.ReleaseShiftAction; +import me.aleksilassila.litematica.printer.v1_20_4.guides.Guide; +import me.aleksilassila.litematica.printer.v1_20_4.implementation.actions.InteractActionImpl; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.hit.BlockHitResult; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/LightCandleGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/LightCandleGuide.java similarity index 89% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/LightCandleGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/LightCandleGuide.java index e2d90eaf8..f1677a058 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/LightCandleGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/LightCandleGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.interaction; +package me.aleksilassila.litematica.printer.v1_20_4.guides.interaction; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.AbstractCandleBlock; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.item.ItemStack; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/LogStrippingGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/LogStrippingGuide.java similarity index 83% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/LogStrippingGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/LogStrippingGuide.java index bb766b260..3be48f732 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/LogStrippingGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/LogStrippingGuide.java @@ -1,8 +1,8 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.interaction; +package me.aleksilassila.litematica.printer.v1_20_4.guides.interaction; -import me.aleksilassila.litematica.printer.v1_20_2.LitematicaMixinMod; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; -import me.aleksilassila.litematica.printer.v1_20_2.mixin.AxeItemAccessor; +import me.aleksilassila.litematica.printer.v1_20_4.LitematicaMixinMod; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.mixin.AxeItemAccessor; import net.minecraft.block.Block; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.item.Item; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/TillingGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/TillingGuide.java similarity index 84% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/TillingGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/TillingGuide.java index af6d91b6b..9ad7ea99b 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/interaction/TillingGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/interaction/TillingGuide.java @@ -1,7 +1,7 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.interaction; +package me.aleksilassila.litematica.printer.v1_20_4.guides.interaction; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; -import me.aleksilassila.litematica.printer.v1_20_2.guides.placement.FarmlandGuide; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.guides.placement.FarmlandGuide; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/BlockIndifferentGuesserGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/BlockIndifferentGuesserGuide.java similarity index 90% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/BlockIndifferentGuesserGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/BlockIndifferentGuesserGuide.java index cb8c198be..aea14bb9e 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/BlockIndifferentGuesserGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/BlockIndifferentGuesserGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.*; public class BlockIndifferentGuesserGuide extends GuesserGuide { @@ -14,7 +14,7 @@ protected boolean statesEqual(BlockState resultState, BlockState targetState) { Block resultBlock = resultState.getBlock(); if (targetBlock instanceof BambooBlock) { - return resultBlock instanceof BambooBlock || resultBlock instanceof BambooSaplingBlock; + return resultBlock instanceof BambooBlock || resultBlock instanceof BambooShootBlock; } if (targetBlock instanceof BigDripleafStemBlock) { diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/BlockReplacementGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/BlockReplacementGuide.java similarity index 91% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/BlockReplacementGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/BlockReplacementGuide.java index f2c41a21f..e88fcf258 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/BlockReplacementGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/BlockReplacementGuide.java @@ -1,8 +1,8 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.implementation.PrinterPlacementContext; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; -import me.aleksilassila.litematica.printer.v1_20_2.guides.Guide; +import me.aleksilassila.litematica.printer.v1_20_4.implementation.PrinterPlacementContext; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.guides.Guide; import net.minecraft.block.CandleBlock; import net.minecraft.block.SeaPickleBlock; import net.minecraft.block.SlabBlock; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/ChestGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/ChestGuide.java similarity index 96% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/ChestGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/ChestGuide.java index 56c360597..724eff513 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/ChestGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/ChestGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.BlockState; import net.minecraft.block.ChestBlock; import net.minecraft.block.enums.ChestType; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/FallingBlockGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/FallingBlockGuide.java similarity index 87% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/FallingBlockGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/FallingBlockGuide.java index c9ee83219..30b52aaed 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/FallingBlockGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/FallingBlockGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.BlockState; import net.minecraft.block.FallingBlock; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/FarmlandGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/FarmlandGuide.java similarity index 85% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/FarmlandGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/FarmlandGuide.java index 518dbb917..81086c802 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/FarmlandGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/FarmlandGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/FlowerPotGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/FlowerPotGuide.java similarity index 79% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/FlowerPotGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/FlowerPotGuide.java index 47ae98c7d..dd2b0dd1f 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/FlowerPotGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/FlowerPotGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import org.jetbrains.annotations.NotNull; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/GeneralPlacementGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/GeneralPlacementGuide.java similarity index 95% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/GeneralPlacementGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/GeneralPlacementGuide.java index 623130d21..9c17376ef 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/GeneralPlacementGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/GeneralPlacementGuide.java @@ -1,7 +1,7 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.implementation.PrinterPlacementContext; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.implementation.PrinterPlacementContext; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.SlabBlock; import net.minecraft.block.enums.SlabType; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/GuesserGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/GuesserGuide.java similarity index 94% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/GuesserGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/GuesserGuide.java index c760a0cc5..ada31ba38 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/GuesserGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/GuesserGuide.java @@ -1,8 +1,8 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.LitematicaMixinMod; -import me.aleksilassila.litematica.printer.v1_20_2.implementation.PrinterPlacementContext; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.LitematicaMixinMod; +import me.aleksilassila.litematica.printer.v1_20_4.implementation.PrinterPlacementContext; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.BlockState; import net.minecraft.block.ChestBlock; import net.minecraft.block.SlabBlock; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/LogGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/LogGuide.java similarity index 86% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/LogGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/LogGuide.java index 51c3d068e..fd7c8be60 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/LogGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/LogGuide.java @@ -1,8 +1,8 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.LitematicaMixinMod; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; -import me.aleksilassila.litematica.printer.v1_20_2.guides.interaction.LogStrippingGuide; +import me.aleksilassila.litematica.printer.v1_20_4.LitematicaMixinMod; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.guides.interaction.LogStrippingGuide; import net.minecraft.block.Block; import net.minecraft.block.PillarBlock; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/PlacementGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/PlacementGuide.java similarity index 89% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/PlacementGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/PlacementGuide.java index 51bc9f74f..a919a3b62 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/PlacementGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/PlacementGuide.java @@ -1,13 +1,13 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; - -import me.aleksilassila.litematica.printer.v1_20_2.LitematicaMixinMod; -import me.aleksilassila.litematica.printer.v1_20_2.implementation.PrinterPlacementContext; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; -import me.aleksilassila.litematica.printer.v1_20_2.actions.Action; -import me.aleksilassila.litematica.printer.v1_20_2.actions.PrepareAction; -import me.aleksilassila.litematica.printer.v1_20_2.actions.ReleaseShiftAction; -import me.aleksilassila.litematica.printer.v1_20_2.guides.Guide; -import me.aleksilassila.litematica.printer.v1_20_2.implementation.actions.InteractActionImpl; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; + +import me.aleksilassila.litematica.printer.v1_20_4.LitematicaMixinMod; +import me.aleksilassila.litematica.printer.v1_20_4.implementation.PrinterPlacementContext; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.actions.Action; +import me.aleksilassila.litematica.printer.v1_20_4.actions.PrepareAction; +import me.aleksilassila.litematica.printer.v1_20_4.actions.ReleaseShiftAction; +import me.aleksilassila.litematica.printer.v1_20_4.guides.Guide; +import me.aleksilassila.litematica.printer.v1_20_4.implementation.actions.InteractActionImpl; import net.minecraft.block.*; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.item.BlockItem; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/PropertySpecificGuesserGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/PropertySpecificGuesserGuide.java similarity index 93% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/PropertySpecificGuesserGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/PropertySpecificGuesserGuide.java index b2b2be7d1..4ce973336 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/PropertySpecificGuesserGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/PropertySpecificGuesserGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.*; import net.minecraft.state.property.Properties; import net.minecraft.state.property.Property; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/RailGuesserGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/RailGuesserGuide.java similarity index 97% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/RailGuesserGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/RailGuesserGuide.java index e4fa36402..9c0fe60fe 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/RailGuesserGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/RailGuesserGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.BlockState; import net.minecraft.block.enums.RailShape; import net.minecraft.state.property.Properties; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/RotatingBlockGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/RotatingBlockGuide.java similarity index 85% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/RotatingBlockGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/RotatingBlockGuide.java index 475e52975..0f66b465c 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/RotatingBlockGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/RotatingBlockGuide.java @@ -1,9 +1,9 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.implementation.PrinterPlacementContext; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; -import me.aleksilassila.litematica.printer.v1_20_2.actions.Action; -import me.aleksilassila.litematica.printer.v1_20_2.actions.PrepareAction; +import me.aleksilassila.litematica.printer.v1_20_4.implementation.PrinterPlacementContext; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.actions.Action; +import me.aleksilassila.litematica.printer.v1_20_4.actions.PrepareAction; import net.minecraft.block.*; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.state.property.Properties; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/SlabGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/SlabGuide.java similarity index 92% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/SlabGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/SlabGuide.java index 0d92f37b4..a062973d8 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/SlabGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/SlabGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.BlockState; import net.minecraft.block.SlabBlock; import net.minecraft.block.enums.SlabType; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/TorchGuide.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/TorchGuide.java similarity index 87% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/TorchGuide.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/TorchGuide.java index d919203dd..bd5d37df2 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/guides/placement/TorchGuide.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/guides/placement/TorchGuide.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.guides.placement; +package me.aleksilassila.litematica.printer.v1_20_4.guides.placement; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; import net.minecraft.block.Block; import net.minecraft.block.HorizontalFacingBlock; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/implementation/BlockHelperImpl.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/implementation/BlockHelperImpl.java similarity index 65% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/implementation/BlockHelperImpl.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/implementation/BlockHelperImpl.java index a96d4992d..28cc06f2a 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/implementation/BlockHelperImpl.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/implementation/BlockHelperImpl.java @@ -1,6 +1,6 @@ -package me.aleksilassila.litematica.printer.v1_20_2.implementation; +package me.aleksilassila.litematica.printer.v1_20_4.implementation; -import me.aleksilassila.litematica.printer.v1_20_2.BlockHelper; +import me.aleksilassila.litematica.printer.v1_20_4.BlockHelper; import net.minecraft.block.ButtonBlock; import java.util.Arrays; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/implementation/PrinterPlacementContext.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/implementation/PrinterPlacementContext.java similarity index 97% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/implementation/PrinterPlacementContext.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/implementation/PrinterPlacementContext.java index bad322c77..cea7d344e 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/implementation/PrinterPlacementContext.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/implementation/PrinterPlacementContext.java @@ -1,4 +1,4 @@ -package me.aleksilassila.litematica.printer.v1_20_2.implementation; +package me.aleksilassila.litematica.printer.v1_20_4.implementation; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/implementation/actions/InteractActionImpl.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/implementation/actions/InteractActionImpl.java similarity index 77% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/implementation/actions/InteractActionImpl.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/implementation/actions/InteractActionImpl.java index ef73ac6c1..7028e84bf 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/implementation/actions/InteractActionImpl.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/implementation/actions/InteractActionImpl.java @@ -1,7 +1,7 @@ -package me.aleksilassila.litematica.printer.v1_20_2.implementation.actions; +package me.aleksilassila.litematica.printer.v1_20_4.implementation.actions; -import me.aleksilassila.litematica.printer.v1_20_2.implementation.PrinterPlacementContext; -import me.aleksilassila.litematica.printer.v1_20_2.actions.InteractAction; +import me.aleksilassila.litematica.printer.v1_20_4.implementation.PrinterPlacementContext; +import me.aleksilassila.litematica.printer.v1_20_4.actions.InteractAction; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.util.Hand; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/implementation/mixin/MixinClientPlayerEntity.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/implementation/mixin/MixinClientPlayerEntity.java similarity index 92% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/implementation/mixin/MixinClientPlayerEntity.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/implementation/mixin/MixinClientPlayerEntity.java index d60d4b0ab..837020c6f 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/implementation/mixin/MixinClientPlayerEntity.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/implementation/mixin/MixinClientPlayerEntity.java @@ -1,12 +1,12 @@ -package me.aleksilassila.litematica.printer.v1_20_2.implementation.mixin; +package me.aleksilassila.litematica.printer.v1_20_4.implementation.mixin; import com.mojang.authlib.GameProfile; import fi.dy.masa.litematica.world.SchematicWorldHandler; import fi.dy.masa.litematica.world.WorldSchematic; -import me.aleksilassila.litematica.printer.v1_20_2.LitematicaMixinMod; -import me.aleksilassila.litematica.printer.v1_20_2.Printer; -import me.aleksilassila.litematica.printer.v1_20_2.SchematicBlockState; -import me.aleksilassila.litematica.printer.v1_20_2.UpdateChecker; +import me.aleksilassila.litematica.printer.v1_20_4.LitematicaMixinMod; +import me.aleksilassila.litematica.printer.v1_20_4.Printer; +import me.aleksilassila.litematica.printer.v1_20_4.SchematicBlockState; +import me.aleksilassila.litematica.printer.v1_20_4.UpdateChecker; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.SignBlockEntity; import net.minecraft.client.MinecraftClient; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/AxeItemAccessor.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/AxeItemAccessor.java similarity index 88% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/AxeItemAccessor.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/AxeItemAccessor.java index 2d838c775..8f86d138e 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/AxeItemAccessor.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/AxeItemAccessor.java @@ -1,4 +1,4 @@ -package me.aleksilassila.litematica.printer.v1_20_2.mixin; +package me.aleksilassila.litematica.printer.v1_20_4.mixin; import net.minecraft.block.Block; import net.minecraft.item.AxeItem; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/ConfigsMixin.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/ConfigsMixin.java similarity index 92% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/ConfigsMixin.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/ConfigsMixin.java index 1043e8f6a..b97d301d2 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/ConfigsMixin.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/ConfigsMixin.java @@ -1,10 +1,10 @@ -package me.aleksilassila.litematica.printer.v1_20_2.mixin; +package me.aleksilassila.litematica.printer.v1_20_4.mixin; import com.google.common.collect.ImmutableList; import fi.dy.masa.litematica.config.Configs; import fi.dy.masa.malilib.config.IConfigBase; import fi.dy.masa.malilib.config.options.ConfigHotkey; -import me.aleksilassila.litematica.printer.v1_20_2.LitematicaMixinMod; +import me.aleksilassila.litematica.printer.v1_20_4.LitematicaMixinMod; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/GuiConfigsMixin.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/GuiConfigsMixin.java similarity index 93% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/GuiConfigsMixin.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/GuiConfigsMixin.java index 45534a3d0..91ea26d0f 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/GuiConfigsMixin.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/GuiConfigsMixin.java @@ -1,10 +1,10 @@ -package me.aleksilassila.litematica.printer.v1_20_2.mixin; +package me.aleksilassila.litematica.printer.v1_20_4.mixin; import com.google.common.collect.ImmutableList; import fi.dy.masa.litematica.gui.GuiConfigs; import fi.dy.masa.malilib.config.IConfigBase; import fi.dy.masa.malilib.config.options.ConfigHotkey; -import me.aleksilassila.litematica.printer.v1_20_2.LitematicaMixinMod; +import me.aleksilassila.litematica.printer.v1_20_4.LitematicaMixinMod; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/InputHandlerMixin.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/InputHandlerMixin.java similarity index 87% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/InputHandlerMixin.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/InputHandlerMixin.java index d648bc15d..1f269c67a 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/InputHandlerMixin.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/InputHandlerMixin.java @@ -1,8 +1,8 @@ -package me.aleksilassila.litematica.printer.v1_20_2.mixin; +package me.aleksilassila.litematica.printer.v1_20_4.mixin; import fi.dy.masa.litematica.event.InputHandler; import fi.dy.masa.malilib.config.options.ConfigHotkey; -import me.aleksilassila.litematica.printer.v1_20_2.LitematicaMixinMod; +import me.aleksilassila.litematica.printer.v1_20_4.LitematicaMixinMod; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/PlayerMoveC2SPacketMixin.java b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/PlayerMoveC2SPacketMixin.java similarity index 84% rename from v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/PlayerMoveC2SPacketMixin.java rename to v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/PlayerMoveC2SPacketMixin.java index 789b53c5d..d078e89ac 100644 --- a/v1_20_2/src/main/java/me/aleksilassila/litematica/printer/v1_20_2/mixin/PlayerMoveC2SPacketMixin.java +++ b/v1_20_4/src/main/java/me/aleksilassila/litematica/printer/v1_20_4/mixin/PlayerMoveC2SPacketMixin.java @@ -1,8 +1,8 @@ -package me.aleksilassila.litematica.printer.v1_20_2.mixin; +package me.aleksilassila.litematica.printer.v1_20_4.mixin; -import me.aleksilassila.litematica.printer.v1_20_2.LitematicaMixinMod; -import me.aleksilassila.litematica.printer.v1_20_2.Printer; -import me.aleksilassila.litematica.printer.v1_20_2.actions.PrepareAction; +import me.aleksilassila.litematica.printer.v1_20_4.LitematicaMixinMod; +import me.aleksilassila.litematica.printer.v1_20_4.Printer; +import me.aleksilassila.litematica.printer.v1_20_4.actions.PrepareAction; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/v1_20_2/src/main/resources/assets/modid/icon.png b/v1_20_4/src/main/resources/assets/modid/icon.png similarity index 100% rename from v1_20_2/src/main/resources/assets/modid/icon.png rename to v1_20_4/src/main/resources/assets/modid/icon.png diff --git a/v1_20_2/src/main/resources/fabric.mod.json b/v1_20_4/src/main/resources/fabric.mod.json similarity index 89% rename from v1_20_2/src/main/resources/fabric.mod.json rename to v1_20_4/src/main/resources/fabric.mod.json index 0f7517c71..b5a506957 100644 --- a/v1_20_2/src/main/resources/fabric.mod.json +++ b/v1_20_4/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "environment": "*", "entrypoints": { "main": [ - "me.aleksilassila.litematica.printer.v1_20_2.LitematicaMixinMod" + "me.aleksilassila.litematica.printer.v1_20_4.LitematicaMixinMod" ] }, "mixins": [ @@ -26,7 +26,7 @@ "depends": { "fabricloader": ">=0.14.7", "fabric": "*", - "minecraft": "1.20.2", + "minecraft": ">=1.20.3", "java": ">=17" }, "custom": { diff --git a/v1_20_2/src/main/resources/litematica-printer-implementation.mixins.json b/v1_20_4/src/main/resources/litematica-printer-implementation.mixins.json similarity index 76% rename from v1_20_2/src/main/resources/litematica-printer-implementation.mixins.json rename to v1_20_4/src/main/resources/litematica-printer-implementation.mixins.json index 51f6b6f54..f9edeb46d 100644 --- a/v1_20_2/src/main/resources/litematica-printer-implementation.mixins.json +++ b/v1_20_4/src/main/resources/litematica-printer-implementation.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "me.aleksilassila.litematica.printer.v1_20_2.implementation.mixin", + "package": "me.aleksilassila.litematica.printer.v1_20_4.implementation.mixin", "compatibilityLevel": "JAVA_16", "mixins": [ ], diff --git a/v1_20_2/src/main/resources/litematica-printer.mixins.json b/v1_20_4/src/main/resources/litematica-printer.mixins.json similarity index 81% rename from v1_20_2/src/main/resources/litematica-printer.mixins.json rename to v1_20_4/src/main/resources/litematica-printer.mixins.json index ce01acafd..d63dd6c33 100644 --- a/v1_20_2/src/main/resources/litematica-printer.mixins.json +++ b/v1_20_4/src/main/resources/litematica-printer.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "me.aleksilassila.litematica.printer.v1_20_2.mixin", + "package": "me.aleksilassila.litematica.printer.v1_20_4.mixin", "compatibilityLevel": "JAVA_16", "mixins": [ ],