Skip to content

Commit 584746c

Browse files
committed
The Version Juggler Update. Resolves #144
- Cinderscapes for 1.19.x is known broken by TerraBlender 2.0.1.127. - Cinderscapes now works on all versions of Minecraft 1.19.
1 parent f15b709 commit 584746c

File tree

5 files changed

+26
-13
lines changed

5 files changed

+26
-13
lines changed

common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockLootTableProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ protected void generateBlockLootTables() {
9595
// wood building blocks
9696
// TODO: Consider bringing over the WoodBlocks interface from Terrestria
9797
addDrop(CinderscapesBlocks.SCORCHED_BUTTON);
98-
addDrop(CinderscapesBlocks.SCORCHED_DOOR, BlockLootTableGenerator::doorDrops);
98+
addDrop(CinderscapesBlocks.SCORCHED_DOOR, BlockLootTableGenerator::addDoorDrop);
9999
addDrop(CinderscapesBlocks.SCORCHED_FENCE);
100100
addDrop(CinderscapesBlocks.SCORCHED_FENCE_GATE);
101101
addDrop(CinderscapesBlocks.SCORCHED_HYPHAE);
@@ -111,7 +111,7 @@ protected void generateBlockLootTables() {
111111
addDrop(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE);
112112

113113
addDrop(CinderscapesBlocks.UMBRAL_BUTTON);
114-
addDrop(CinderscapesBlocks.UMBRAL_DOOR, BlockLootTableGenerator::doorDrops);
114+
addDrop(CinderscapesBlocks.UMBRAL_DOOR, BlockLootTableGenerator::addDoorDrop);
115115
addDrop(CinderscapesBlocks.UMBRAL_FENCE);
116116
addDrop(CinderscapesBlocks.UMBRAL_FENCE_GATE);
117117
addDrop(CinderscapesBlocks.UMBRAL_FUNGUS);

common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesItems.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.terraformersmc.cinderscapes.Cinderscapes;
44
import com.terraformersmc.cinderscapes.item.CinderscapesMusicDiscItem;
5+
import net.minecraft.MinecraftVersion;
56
import net.minecraft.block.ComposterBlock;
67
import net.minecraft.entity.effect.StatusEffectInstance;
78
import net.minecraft.entity.effect.StatusEffects;
@@ -33,15 +34,25 @@ public class CinderscapesItems {
3334
public static final Item SMOKY_QUARTZ = add("smoky_quartz", new Item(new Item.Settings().group(ItemGroup.MATERIALS)));
3435
public static final Item SULFUR_QUARTZ = add("sulfur_quartz", new Item(new Item.Settings().group(ItemGroup.MATERIALS)));
3536

36-
public static final Item MUSIC_DISC_LUMINOUS_PLANTATION = add("music_disc_luminous_plantation", new CinderscapesMusicDiscItem(14, CinderscapesSoundEvents.MUSIC_DISC_LUMINOUS_PLANTATION, 231));
37-
public static final Item MUSIC_DISC_CHILLING_IN_HELL = add("music_disc_chilling_in_hell", new CinderscapesMusicDiscItem(14, CinderscapesSoundEvents.MUSIC_DISC_CHILLING_IN_HELL, 136));
37+
// TODO: Fails in 1.19.0 where Minecraft does not want to know the length.
38+
// Rip out if{} block in init() and restore the two lines below in 1.20.
39+
//public static final Item MUSIC_DISC_LUMINOUS_PLANTATION = add("music_disc_luminous_plantation", new CinderscapesMusicDiscItem(14, CinderscapesSoundEvents.MUSIC_DISC_LUMINOUS_PLANTATION, 231));
40+
//public static final Item MUSIC_DISC_CHILLING_IN_HELL = add("music_disc_chilling_in_hell", new CinderscapesMusicDiscItem(14, CinderscapesSoundEvents.MUSIC_DISC_CHILLING_IN_HELL, 136));
41+
public static Item MUSIC_DISC_LUMINOUS_PLANTATION;
42+
public static Item MUSIC_DISC_CHILLING_IN_HELL;
3843

3944
private static <I extends Item> I add(String name, I item) {
4045
ITEMS.put(Cinderscapes.id(name), item);
4146
return item;
4247
}
4348

4449
public static void init() {
50+
// TODO: I've said it before but ... WTH does Mojang think dot releases are for?
51+
// STOP MODIFYING THE API IN DOT RELEASES, MOJANG! STOP IT!!!
52+
if (MinecraftVersion.CURRENT.toString().startsWith("1.19.")) {
53+
MUSIC_DISC_LUMINOUS_PLANTATION = add("music_disc_luminous_plantation", new CinderscapesMusicDiscItem(14, CinderscapesSoundEvents.MUSIC_DISC_LUMINOUS_PLANTATION, 231));
54+
MUSIC_DISC_CHILLING_IN_HELL = add("music_disc_chilling_in_hell", new CinderscapesMusicDiscItem(14, CinderscapesSoundEvents.MUSIC_DISC_CHILLING_IN_HELL, 136));
55+
}
4556

4657
for (Identifier id : ITEMS.keySet()) {
4758
Registry.register(Registry.ITEM, id, ITEMS.get(id));

common/src/main/resources/cinderscapes-common.accesswidener

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ accessWidener v1 named
33
accessible method net/minecraft/util/math/Vec3i setX (I)Lnet/minecraft/util/math/Vec3i;
44
accessible method net/minecraft/util/math/Vec3i setY (I)Lnet/minecraft/util/math/Vec3i;
55
accessible method net/minecraft/util/math/Vec3i setZ (I)Lnet/minecraft/util/math/Vec3i;
6+
accessible method net/minecraft/entity/SpawnRestriction register (Lnet/minecraft/entity/EntityType;Lnet/minecraft/entity/SpawnRestriction$Location;Lnet/minecraft/world/Heightmap$Type;Lnet/minecraft/entity/SpawnRestriction$SpawnPredicate;)V

gradle.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G
33
maven_group=com.terraformersmc
44
archive_name=cinderscapes
55

6-
minecraft_version=1.19.2
7-
yarn_mappings=1.19.2+build.8
6+
minecraft_version=1.19.1
7+
yarn_mappings=1.19.1+build.6
88
loader_version=0.14.9
9-
fabric_version=0.60.0+1.19.2
9+
fabric_version=0.58.0+1.19.1
1010

1111
# Terraform modules
1212
terraform_biome_remapper_api_version=4.1.1
@@ -15,7 +15,7 @@ terraform_wood_api_version=4.1.1
1515

1616
# Other Things
1717
clothconfig_version=8.0.75
18-
modmenu_version=4.0.6
18+
modmenu_version=4.0.5
1919
vistas_version=2.3.0
2020

2121
# Project Metadata
@@ -29,14 +29,14 @@ default_release_type=stable
2929
# CurseForge Metadata
3030
curseforge_slug=cinderscapes
3131
curseforge_id=391429
32-
curseforge_game_versions=1.19.2, Fabric
32+
curseforge_game_versions=1.19, 1.19.1, 1.19.2, Fabric
3333
curseforge_required_dependencies=fabric-api
3434
curseforge_optional_dependencies=
3535

3636
# Modrinth Metadata
3737
modrinth_slug=cinderscapes
3838
modrinth_id=QC4wcUXZ
39-
modrinth_game_versions=1.19.2
39+
modrinth_game_versions=1.19, 1.19.1, 1.19.2
4040
modrinth_mod_loaders=fabric
4141

4242
# Mod Loader Metadata

src/main/resources/fabric.mod.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@
3636
},
3737
"depends": {
3838
"fabricloader": ">=0.13.2",
39-
"fabric": ">=0.60.0",
40-
"minecraft": ">=1.19.2"
39+
"fabric": ">=0.58.0",
40+
"minecraft": ">=1.19"
4141
},
4242
"breaks": {
43-
"modmenu": "<2.0.0"
43+
"modmenu": "<2.0.0",
44+
"terrablender": "2.0.1.127"
4445
},
4546
"custom": {
4647
"modupdater": {

0 commit comments

Comments
 (0)