Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
96b9116
Update the GTNH build toolchain and compatibility dependencies
Worive Nov 20, 2026
6c50317
Cache optional mod detection
Worive Nov 20, 2026
2f8d449
Preserve modded block data in schematics
Worive Nov 20, 2026
0c1df8e
Improve client printing and previews for modded blocks
Worive Nov 20, 2026
1c4e3c0
fix: preserve metadata in schematic downloads
Worive Nov 20, 2026
6efed64
fix: clear stale schematic byte arrays
Worive Nov 20, 2026
48453ff
fix: load mixed multipart tiles safely
Worive Nov 20, 2026
d7f4012
fix: restore bounds after microblock probes
Worive Nov 20, 2026
d954f13
fix: preserve ArchitectureCraft shape state
Worive Nov 20, 2026
0a280cd
fix: allow direct placement without support
Worive Nov 20, 2026
2c0c0c7
fix: avoid opening protected Carpenter's safes
Worive Nov 20, 2026
a5f08aa
fix: count both halves of double slabs
Worive Nov 20, 2026
b45218e
fix: count one item per garage door column
Worive Nov 20, 2026
152ead7
fix: probe the optional kitchen dye API
Worive Nov 20, 2026
f8a78c5
fix: verify dye on both fridge halves
Worive Nov 20, 2026
10b63cc
fix: guard automatic Carpenter edits
Worive Nov 20, 2026
4f01f87
fix: match garage door hosts
Worive Nov 20, 2026
9238d45
fix: remap extended Carpenter item IDs
Worive Nov 20, 2026
88deaaf
fix: mirror angled roof ridges
Worive Nov 20, 2026
eab3aac
fix: compare ArchitectureCraft preview state
Worive Nov 20, 2026
fe06348
fix: restore bounds after microblock rays
Worive Nov 20, 2026
df97d31
fix: copy pick stacks before normalization
Worive Nov 20, 2026
e796271
fix: compare Carpenter torch and ladder directions
Worive Nov 21, 2026
7fe763b
fix: validate garage door columns across layers
Worive Nov 21, 2026
7d66800
fix: mirror Double Roof Tile cladding
Worive Nov 21, 2026
730e624
fix: match ArchitectureCraft stock by shape material
Worive Nov 21, 2026
c31aaf2
fix: place Carpenter shapes without mining clicks
Worive Nov 21, 2026
e87b6e4
fix: rotate capitals through server hammer clicks
Worive Nov 21, 2026
b7d7e20
fix: match and merge painted EnderIO slabs
Worive Nov 21, 2026
d9c0003
fix: choose the correct half for slab placement
Worive Nov 21, 2026
ee13cad
fix: wait for capital turns and retry rejected clicks
Worive Nov 21, 2026
96c17a6
fix: plan Carpenter shapes from native placement
Worive Nov 21, 2026
aaea8bb
fix: protect slab placement over snow and seamless slabs
Worive Nov 21, 2026
3981b0a
fix: identify slab paint in material exports
Worive Nov 21, 2026
647208d
fix: retain pending capital turns across refreshes
Worive Nov 21, 2026
dc5991e
fix: try wedge stock when native slope placement cannot finish
Worive Nov 21, 2026
e7a34d9
fix: skip non-multipart tile lookups
Worive Nov 21, 2026
6406bb2
fix: match saved player head owners
Worive Nov 21, 2026
880e53c
fix: guard extended downloads for older clients
Worive Nov 21, 2026
eba1580
fix: keep highlights outside Forge render passes
Worive Nov 21, 2026
fefdf7c
fix: preserve hidden schematic layers during transforms
Worive Nov 21, 2026
2aead71
fix: retain Carpenter clicks across printer refreshes
Worive Nov 21, 2026
177a6a1
fix: preserve placement direction and finish split slab stacks
Worive Nov 21, 2026
33f6199
fix: match survival stock to schematic block picks
Worive Nov 21, 2026
3038f1f
fix: identify cladding materials in material lists
Worive Nov 21, 2026
f6f1de9
Extract NBT strings as constants
Worive Nov 21, 2026
8c5ce1d
fix: preserve pending microblock placements across refreshes
Worive Nov 21, 2026
1e9757b
fix: let the server place Carpenter garage columns
Worive Nov 21, 2026
e0bac4d
fix: count white dye for kitchen recoloring
Worive Nov 21, 2026
6fea3f2
fix: include banner patterns in material exports
Worive Nov 21, 2026
18b3678
fix: reserve exact ingredients before counting block stock
Worive Nov 21, 2026
2077133
fix: guard downloads against legacy schemplus ID truncation
Worive Nov 21, 2026
59a08ee
fix: wait for garage door inventory updates
Worive Nov 21, 2026
739fe3f
fix: export every saved banner pattern
Worive Nov 21, 2026
a7ce89d
fix: retry denied garage doors after other columns
Worive Nov 21, 2026
bdd4dc1
fix: preserve Et Futurum chain orientation
Worive Nov 21, 2026
59fe4b4
fix: print Carpenter's collapsible blocks and posts
Worive Nov 21, 2026
aaf7003
fix: preserve wide IDs in schematic files and downloads
Worive Nov 21, 2026
fab3995
fix: compare saved skull and banner state
Worive Nov 21, 2026
4054d80
fix: guard Carpenter's printer interactions
Worive Nov 21, 2026
09ccfb0
fix: handle mixed multipart blocks
Worive Nov 21, 2026
26f52f6
fix: read dye colors from kitchen tiles
Worive Nov 21, 2026
2f812ea
docs: explain schematic compatibility
Worive Nov 21, 2026
d94a572
docs: trim schematic compatibility notes
Worive Nov 21, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,8 @@ Changes from Original:
- Store Coordinates & rotation of schematics per world/server. No more re-entering coordinates for large builds!
- Fix heavy lag when having lotr armor stands/weapon racks in loaded schematic
- Updated Chinese translation

### Schematic compatibility

- Schematica reads `.schematic` and `.schemplus` files automatically. New saves use classic block ID encoding up to 4095 and support IDs up to 24 bits when needed. Older readers may truncate wide IDs or extended metadata.
- Schematic downloads require matching download protocol versions on the client and server.
22 changes: 22 additions & 0 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,26 @@
dependencies {
implementation('com.github.GTNewHorizons:LunatriusCore:1.3.0-GTNH:dev')
compileOnly rfg.deobf('curse.maven:lotr-423748:4091561')
compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.7.18:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:CodeChickenCore:1.4.22:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ArchitectureCraft:1.12.19:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:CarpentersBlocks:3.7.3-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:CookingForBlockheads:1.4.14-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:EnderIO:2.10.49:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:EnderCore:0.5.15:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:Postea:1.2.7:dev') { transitive = false }

// Optional mods and their dependencies for the compatibility test client.
runtimeOnlyNonPublishable('com.github.GTNewHorizons:ForgeMultipart:1.7.18:dev') { transitive = false }
runtimeOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.4.22:dev') { transitive = false }
runtimeOnlyNonPublishable('com.github.GTNewHorizons:ArchitectureCraft:1.12.19:dev') { transitive = false }
runtimeOnlyNonPublishable('com.github.GTNewHorizons:CarpentersBlocks:3.7.3-GTNH:dev') { transitive = false }
runtimeOnlyNonPublishable('com.github.GTNewHorizons:Postea:1.2.7:dev') { transitive = false }
runtimeOnlyNonPublishable('com.github.GTNewHorizons:CookingForBlockheads:1.4.14-GTNH:dev') { transitive = false }
runtimeOnlyNonPublishable('com.github.GTNewHorizons:AppleCore:3.3.13:dev') { transitive = false }
runtimeOnlyNonPublishable('ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.65-GTNH:dev') { transitive = false }
runtimeOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.11.48:dev') { transitive = false }
runtimeOnlyNonPublishable('io.github.legacymoddingmc:unimixins:0.3.1:dev') { transitive = false }

testImplementation('junit:junit:4.13.2')
}
12 changes: 12 additions & 0 deletions gradle/gradle-daemon-jvm.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/50d5fe9033e125599b2aa94dc590a27d/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b4d79acf73eaf165b8c6bc8fba023764/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/50d5fe9033e125599b2aa94dc590a27d/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b4d79acf73eaf165b8c6bc8fba023764/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/54e1f31b8c26d88fb972744b5f1ba132/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/5d8d54de3a467a8da01a32410565830f/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/50d5fe9033e125599b2aa94dc590a27d/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b4d79acf73eaf165b8c6bc8fba023764/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a7c7be8a3ec5d8e677e7250d9c1ce3ed/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d0edfb63e02dc58e61e6c804b15e02e8/redirect
toolchainVersion=25
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.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.34'
}


Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@

import java.io.File;
import java.io.FileFilter;
import java.util.Locale;

import com.github.lunatrius.schematica.handler.ConfigurationHandler;
import com.github.lunatrius.schematica.util.FileUtils;

public class FileFilterSchematic implements FileFilter {

public static final String EXTENSION_SCHEMATIC = ".schematic";
public static final String EXTENSION_SCHEMPLUS = ".schemplus";

private final boolean directory;

public FileFilterSchematic(boolean dir) {
Expand All @@ -18,14 +22,58 @@ public boolean accept(File file) {
if (this.directory) {
return file.isDirectory();
}
if (ConfigurationHandler.useSchematicplusFormat) {
return file.getName()
.toLowerCase()
.endsWith(".schemplus");
} else {
return file.getName()
.toLowerCase()
.endsWith(".schematic");
return isSchematicName(file.getName());
}

public static boolean isSchematicName(String name) {
String lower = name.toLowerCase(Locale.ROOT);
return lower.endsWith(EXTENSION_SCHEMATIC) || lower.endsWith(EXTENSION_SCHEMPLUS);
}

public static boolean isSchemplusName(String name) {
return name.toLowerCase(Locale.ROOT)
.endsWith(EXTENSION_SCHEMPLUS);
}

public static String stripExtension(String filename) {
if (filename == null) {
return null;
}
String lower = filename.toLowerCase(Locale.ROOT);
if (lower.endsWith(EXTENSION_SCHEMPLUS)) {
return filename.substring(0, filename.length() - EXTENSION_SCHEMPLUS.length());
}
if (lower.endsWith(EXTENSION_SCHEMATIC)) {
return filename.substring(0, filename.length() - EXTENSION_SCHEMATIC.length());
}
return filename;
}

/**
* Finds {@code name}, {@code name.schematic}, or {@code name.schemplus} inside {@code directory}.
* A bare name prefers {@code .schematic} when both files exist.
*/
public static File resolve(File directory, String name) {
if (directory == null || name == null || name.isEmpty()) {
return null;
}

File direct = new File(directory, name);
if (isSchematicName(name) && FileUtils.contains(directory, direct) && direct.isFile()) {
return direct;
}
if (isSchematicName(name)) {
return null;
}

File schematic = new File(directory, name + EXTENSION_SCHEMATIC);
if (FileUtils.contains(directory, schematic) && schematic.isFile()) {
return schematic;
}
File schemplus = new File(directory, name + EXTENSION_SCHEMPLUS);
if (FileUtils.contains(directory, schemplus) && schemplus.isFile()) {
return schemplus;
}
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
public class PreSchematicSaveEvent extends Event {

private final Map<String, Short> mappings;
private final Map<String, Integer> mappings;

/**
* The schematic that will be saved.
Expand All @@ -27,11 +27,11 @@ public class PreSchematicSaveEvent extends Event {
public final NBTTagCompound extendedMetadata;

@Deprecated
public PreSchematicSaveEvent(Map<String, Short> mappings) {
public PreSchematicSaveEvent(Map<String, Integer> mappings) {
this(null, mappings);
}

public PreSchematicSaveEvent(ISchematic schematic, Map<String, Short> mappings) {
public PreSchematicSaveEvent(ISchematic schematic, Map<String, Integer> mappings) {
this.schematic = schematic;
this.mappings = mappings;
this.extendedMetadata = new NBTTagCompound();
Expand Down Expand Up @@ -59,7 +59,7 @@ public boolean replaceMapping(String oldName, String newName) throws DuplicateMa
newName));
}

Short id = this.mappings.get(oldName);
Integer id = this.mappings.get(oldName);
if (id != null) {
this.mappings.remove(oldName);
this.mappings.put(newName, id);
Expand Down
Loading