make matchTiles work the way it's supposed to

TwilightFlower · May 9, 2020 · fa21be3 · fa21be3
1 parent 1fc61e2
commit fa21be3
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,7 +19,7 @@ classes/
 bin/
 .classpath
 .project
-
+*.launch
 # fabric
 
 run/
diff --git a/connected-block-textures_client.launch b/connected-block-textures_client.launch
diff --git a/connected-block-textures_server.launch b/connected-block-textures_server.launch
diff --git a/src/main/java/io/github/nuclearfarts/cbt/config/BaseCTMConfig.java b/src/main/java/io/github/nuclearfarts/cbt/config/BaseCTMConfig.java
@@ -50,13 +50,13 @@ public abstract class BaseCTMConfig<Self extends BaseCTMConfig<Self>> implements
 
 	public BaseCTMConfig(Properties properties, Identifier location, ResourceManager manager, SpriteProviderFactory<Self> bakedModelFactory, String packName) throws IOException {
 		if(properties.containsKey("matchTiles")) {
-			tileMatcher = Arrays.stream(properties.getProperty("matchTiles").split(" ")).map(Identifier::new).collect(Collectors.toCollection(HashSet::new))::contains;
+			tileMatcher = Arrays.stream(properties.getProperty("matchTiles").split(" ")).map(s -> CBTUtil.prependId(new Identifier(s), "block/")).collect(Collectors.toCollection(HashSet::new))::contains;
 		} else {
 			tileMatcher = null;
 		}
 
 		if(properties.containsKey("matchBlocks")) {
-			blockMatcher = Arrays.stream(properties.getProperty("matchBlocks").split(" ")).map(ModelIdentifier::new).map(CBTUtil::stripBlankVariants).collect(Collectors.toCollection(HashSet::new))::contains;
+			blockMatcher = Arrays.stream(properties.getProperty("matchBlocks").split(" ")).map(Identifier::new).collect(Collectors.toCollection(HashSet::new))::contains;
 		} else {
 			blockMatcher = Predicates.alwaysTrue();
 		}

diff --git a/src/main/resources/assets/minecraft/optifine/ctm/sandstone/red_sandstone.properties b/src/main/resources/assets/minecraft/optifine/ctm/sandstone/red_sandstone.properties
@@ -1,4 +1,4 @@
-matchTiles=block/red_sandstone
+matchTiles=red_sandstone
 connect=tile
 method=top
 faces=sides

diff --git a/src/main/resources/assets/minecraft/optifine/ctm/sandstone/sandstone.properties b/src/main/resources/assets/minecraft/optifine/ctm/sandstone/sandstone.properties
@@ -1,4 +1,4 @@
-matchTiles=block/sandstone
+matchTiles=sandstone
 connect=tile
 method=top
 faces=sides