Skip to content

Commit

Permalink
Temporary release for 1.20.4
Browse files Browse the repository at this point in the history
aleksilassila committed Dec 23, 2023
1 parent 36c98ba commit 7311a2f
Showing 53 changed files with 150 additions and 160 deletions.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
14 changes: 7 additions & 7 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -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'
12 changes: 6 additions & 6 deletions v1_20_2/build.gradle.kts → v1_20_4/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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)
}
}
}
}
12 changes: 6 additions & 6 deletions v1_20_2/gradle.properties → v1_20_4/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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;

Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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 {
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;

Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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) {
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Loading

0 comments on commit 7311a2f

Please sign in to comment.