Skip to content

Commit df2b707

Browse files
authored
Merge pull request #20 from SkyBlade1978/master-26.1.2-neo
Correct NeoForge 26.1.2 snowy grass slab caps
2 parents 8b0e170 + 6f73fda commit df2b707

11 files changed

Lines changed: 52 additions & 18 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ jobs:
111111
if-no-files-found: error
112112
retention-days: 30
113113
path: |
114-
build/libs/SkysGrassSlabs-1.1.1.2601022.jar
115-
build/libs/SkysGrassSlabs-1.1.1.2601022-sources.jar
116-
build/libs/SkysGrassSlabs-1.1.1.2601022-javadoc.jar
114+
build/libs/SkysGrassSlabs-1.1.2.2601022.jar
115+
build/libs/SkysGrassSlabs-1.1.2.2601022-sources.jar
116+
build/libs/SkysGrassSlabs-1.1.2.2601022-javadoc.jar
117117
build/release/SHA256SUMS
118118
CHANGELOG.md
119119

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 1.1.2.2601022 - Minecraft 26.1.2 (NeoForge)
4+
5+
- Corrected snowy grass slabs so their exposed top uses the snow texture
6+
instead of remaining biome coloured green.
7+
- Preserved the existing snowy side edges and all world data.
8+
39
## 1.1.1.2601022 - Minecraft 26.1.2 (NeoForge)
410

511
- Added the NeoForge 26.1.2 build with the same blocks, recipes, world

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ thin layer of turf. Grass spreads naturally between full blocks and slabs,
55
while new Overworld terrain uses grass slabs to soften suitable one block
66
steps.
77

8-
This branch is for Minecraft 26.1.2. Version `1.1.1.2601022` requires NeoForge
8+
This branch is for Minecraft 26.1.2. Version `1.1.2.2601022` requires NeoForge
99
26.1.2.94 and Java 25.
1010

1111
## Installation
@@ -34,7 +34,7 @@ or updating world changing mods.
3434
- [Gameplay and recipes](docs/GAMEPLAY.md)
3535
- [Configuration](docs/CONFIGURATION.md)
3636
- [Upgrading an older world](docs/WORLD-UPGRADES.md)
37-
- [Release notes](docs/RELEASE-1.1.1.2601022.md)
37+
- [Release notes](docs/RELEASE-1.1.2.2601022.md)
3838

3939
## License
4040

‎docs/RELEASE-1.1.2.2601022.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Sky's Grass Slabs 1.1.2 for Minecraft 26.1.2
2+
3+
This update corrects the snowy appearance of grass slabs. When a grass slab
4+
shows snowy side edges, its exposed top now uses the matching snow texture
5+
instead of remaining green.
6+
7+
All blocks, recipes, configuration options and world data remain compatible
8+
with the previous NeoForge 26.1.2 release.
9+
10+
Requires Minecraft 26.1.2, NeoForge 26.1.2.94 and Java 25.

‎docs/WORLD-UPGRADES.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ world has been checked in game.
66

77
## Sky's Grass Slabs content
88

9-
Install `SkysGrassSlabs-1.1.1.2601022.jar` before opening a world that used an
9+
Install `SkysGrassSlabs-1.1.2.2601022.jar` before opening a world that used an
1010
earlier release. The permanent dirt slab, grass slab, path slab and turf IDs
1111
are unchanged.
1212

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ mod_name=Sky's Grass Slabs
4040
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
4141
mod_license=LGPL-2.1-only
4242
# The mod version. See https://semver.org/
43-
mod_version=1.1.1.2601022
43+
mod_version=1.1.2.2601022
4444
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
4545
# This should match the base package used for the mod sources.
4646
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html

‎src/main/java/zone/moddev/mc/skysgrassslabs/SkysGrassSlabs.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public final class SkysGrassSlabs {
2727
/** Stable mod identifier and resource namespace. */
2828
public static final String MOD_ID = "skysgrassslabs";
2929
public static final String NAME = "Sky's Grass Slabs";
30-
public static final String VERSION = "1.1.1.2601022";
30+
public static final String VERSION = "1.1.2.2601022";
3131
public static final Logger LOGGER = LogManager.getLogger();
3232

3333
/** Registers content, configuration, world generation, and persistent state. */

‎src/main/resources/assets/skysgrassslabs/models/block/grass_slab_snow.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"parent": "minecraft:block/block",
33
"render_type": "minecraft:cutout",
4-
"textures": { "particle": "minecraft:block/dirt", "bottom": "minecraft:block/dirt", "top": "minecraft:block/grass_block_top", "side": "minecraft:block/grass_block_snow" },
4+
"textures": { "particle": "minecraft:block/dirt", "bottom": "minecraft:block/dirt", "top": "minecraft:block/snow", "side": "minecraft:block/grass_block_snow" },
55
"elements": [{
66
"from": [0, 0, 0], "to": [16, 8, 16],
77
"faces": {
88
"down": { "uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down" },
9-
"up": { "uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up", "tintindex": 0 },
9+
"up": { "uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up" },
1010
"north": { "uv": [0, 0, 16, 8], "texture": "#side", "cullface": "north" },
1111
"south": { "uv": [0, 0, 16, 8], "texture": "#side", "cullface": "south" },
1212
"west": { "uv": [0, 0, 16, 8], "texture": "#side", "cullface": "west" },

‎src/main/resources/assets/skysgrassslabs/models/block/grass_slab_top_snow.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"parent": "minecraft:block/block",
33
"render_type": "minecraft:cutout",
4-
"textures": { "particle": "minecraft:block/dirt", "bottom": "minecraft:block/dirt", "top": "minecraft:block/grass_block_top", "side": "minecraft:block/grass_block_snow" },
4+
"textures": { "particle": "minecraft:block/dirt", "bottom": "minecraft:block/dirt", "top": "minecraft:block/snow", "side": "minecraft:block/grass_block_snow" },
55
"elements": [{
66
"from": [0, 8, 0], "to": [16, 16, 16],
77
"faces": {
88
"down": { "uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down" },
9-
"up": { "uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up", "tintindex": 0 },
9+
"up": { "uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up" },
1010
"north": { "uv": [0, 0, 16, 8], "texture": "#side", "cullface": "north" },
1111
"south": { "uv": [0, 0, 16, 8], "texture": "#side", "cullface": "south" },
1212
"west": { "uv": [0, 0, 16, 8], "texture": "#side", "cullface": "west" },

‎src/test/java/zone/moddev/mc/skysgrassslabs/ProjectContractTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ public void playerAndMaintainerDocumentsExist() {
3333
assertTrue(Files.isRegularFile(Path.of("docs/GAMEPLAY.md")));
3434
assertTrue(Files.isRegularFile(Path.of("docs/WORLD-UPGRADES.md")));
3535
assertFalse(Files.exists(Path.of("docs/REPOSITORY.md")));
36-
assertTrue(Files.isRegularFile(Path.of("docs/RELEASE-1.1.1.2601022.md")));
36+
assertTrue(Files.isRegularFile(Path.of("docs/RELEASE-1.1.2.2601022.md")));
3737
assertTrue(Files.isRegularFile(Path.of("docs/BETA-0.2.0.118021.md")));
3838
}
3939

4040
@Test
4141
public void releaseIdentityAndLicenseAreStable() throws Exception {
4242
String properties = Files.readString(Path.of("gradle.properties"), StandardCharsets.UTF_8);
43-
assertTrue(properties.contains("mod_version=1.1.1.2601022"));
43+
assertTrue(properties.contains("mod_version=1.1.2.2601022"));
4444
assertTrue(properties.contains("mod_license=LGPL-2.1-only"));
4545
assertEquals("LGPL-2.1-only", Files.readString(Path.of("LICENSE.spdx"), StandardCharsets.UTF_8).trim());
4646
assertTrue(Files.readString(Path.of("NOTICE"), StandardCharsets.UTF_8)
@@ -114,7 +114,7 @@ public void commonConfigAndWorldStateUsePermanentKeys() throws Exception {
114114
assertTrue(config.contains("push(\"compat\")"));
115115
assertTrue(config.contains("define(FORCE_REPLACE_BUILDINGBRICKS_SLABS, false)"));
116116
assertTrue(config.contains("define(FORCE_REPLACE_GRASS_SLABS_MOD_CONTENT, false)"));
117-
assertTrue(main.contains("VERSION = \"1.1.1.2601022\""));
117+
assertTrue(main.contains("VERSION = \"1.1.2.2601022\""));
118118
assertTrue(state.contains("skysgrassslabs_world_state"));
119119
assertTrue(state.contains("SCHEMA_VERSION = 1"));
120120
assertTrue(state.contains("schema_version"));
@@ -292,9 +292,9 @@ public void continuousIntegrationTargetsTheStableBranchAndArtifacts() throws Exc
292292
}
293293
String ci = Files.readString(Path.of(".github/workflows/ci.yml"),
294294
StandardCharsets.UTF_8);
295-
assertTrue(ci.contains("SkysGrassSlabs-1.1.1.2601022.jar"));
296-
assertTrue(ci.contains("SkysGrassSlabs-1.1.1.2601022-sources.jar"));
297-
assertTrue(ci.contains("SkysGrassSlabs-1.1.1.2601022-javadoc.jar"));
295+
assertTrue(ci.contains("SkysGrassSlabs-1.1.2.2601022.jar"));
296+
assertTrue(ci.contains("SkysGrassSlabs-1.1.2.2601022-sources.jar"));
297+
assertTrue(ci.contains("SkysGrassSlabs-1.1.2.2601022-javadoc.jar"));
298298
assertTrue(ci.contains("if-no-files-found: error"));
299299
assertTrue(ci.contains("java-version: '25.0.3+9.0.LTS'"));
300300
assertTrue(ci.contains("--offline --no-daemon"));

0 commit comments

Comments
 (0)