Skip to content

Commit 5200a09

Browse files
gniftygnomegniftygnome
committed
Update for 1.21.5.
- Update for 1.21.5 * Major armor trim changes * Use Loom 10 and Gradle 8.12.1 * Update the gradle wrapper validation
1 parent 829c6fd commit 5200a09

29 files changed

+153
-134
lines changed

‎.github/workflows/check_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424
- name: Validate Gradle wrapper
25-
uses: gradle/wrapper-validation-action@v2
25+
uses: gradle/actions/wrapper-validation@v4
2626
- name: Setup JDK ${{ matrix.java }}
2727
uses: actions/setup-java@v4
2828
with:

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Fetch tags
3737
run: git fetch --tags
3838
- name: Validate Gradle wrapper
39-
uses: gradle/wrapper-validation-action@v2
39+
uses: gradle/actions/wrapper-validation@v4
4040
- name: Setup JDK ${{ matrix.java }}
4141
uses: actions/setup-java@v4
4242
with:

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'maven-publish'
44
id 'idea'
55
id 'eclipse'
6-
id 'fabric-loom' version '1.9.+'
6+
id 'fabric-loom' version '1.10.+'
77
}
88

99
apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.7/ferry.gradle'

‎client/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesArmorTrimItemModels.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void runEvent(EventContext<JsonElement> context) {
8585
for (int i = 0; i < sources.size(); ++i) {
8686
JsonObject source = sources.get(i).getAsJsonObject();
8787

88-
if ("paletted_permutations".equals(source.getAsJsonPrimitive("type").getAsString())) {
88+
if ("minecraft:paletted_permutations".equals(source.getAsJsonPrimitive("type").getAsString())) {
8989
JsonObject permutations = source.getAsJsonObject("permutations");
9090

9191
CinderscapesArmorTrimMaterials.TRIM_MATERIALS.forEach(trim ->

‎common/src/main/java/com/terraformersmc/cinderscapes/Cinderscapes.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public class Cinderscapes implements ModInitializer {
2222
public void onInitialize() {
2323
CinderscapesConfig.init();
2424

25+
CinderscapesArmorTrimAssets.init();
2526
CinderscapesSpawnRestrictions.init();
2627
CinderscapesBlocks.init();
2728
CinderscapesItems.init();

‎common/src/main/java/com/terraformersmc/cinderscapes/biome/AshyShoalsBiome.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ private static SpawnSettings createSpawnSettings() {
9696
SpawnSettings.Builder builder = new SpawnSettings.Builder();
9797

9898
// SPAWNS
99-
builder.spawn(SpawnGroup.MONSTER, new SpawnSettings.SpawnEntry(EntityType.ZOMBIFIED_PIGLIN, 1, 1, 4));
100-
builder.spawn(SpawnGroup.MONSTER, new SpawnSettings.SpawnEntry(EntityType.ZOGLIN, 1, 1, 1));
101-
builder.spawn(SpawnGroup.MONSTER, new SpawnSettings.SpawnEntry(EntityType.ENDERMAN, 1, 4, 4));
102-
builder.spawn(SpawnGroup.CREATURE, new SpawnSettings.SpawnEntry(EntityType.STRIDER, 60, 1, 2));
103-
builder.spawn(SpawnGroup.MONSTER, new SpawnSettings.SpawnEntry(EntityType.SKELETON, 20, 5, 5));
104-
builder.spawn(SpawnGroup.MONSTER, new SpawnSettings.SpawnEntry(EntityType.GHAST, 50, 4, 4));
99+
builder.spawn(SpawnGroup.MONSTER, 1, new SpawnSettings.SpawnEntry(EntityType.ZOMBIFIED_PIGLIN, 1, 4));
100+
builder.spawn(SpawnGroup.MONSTER, 1, new SpawnSettings.SpawnEntry(EntityType.ZOGLIN, 1, 1));
101+
builder.spawn(SpawnGroup.MONSTER, 1, new SpawnSettings.SpawnEntry(EntityType.ENDERMAN, 4, 4));
102+
builder.spawn(SpawnGroup.CREATURE, 60, new SpawnSettings.SpawnEntry(EntityType.STRIDER, 1, 2));
103+
builder.spawn(SpawnGroup.MONSTER, 20, new SpawnSettings.SpawnEntry(EntityType.SKELETON, 5, 5));
104+
builder.spawn(SpawnGroup.MONSTER, 50, new SpawnSettings.SpawnEntry(EntityType.GHAST, 4, 4));
105105

106106
return builder.build();
107107
}

‎common/src/main/java/com/terraformersmc/cinderscapes/biome/BlackstoneShalesBiome.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ private static SpawnSettings createSpawnSettings() {
8888
SpawnSettings.Builder builder = new SpawnSettings.Builder();
8989

9090
// SPAWNS
91-
builder.spawn(SpawnGroup.MONSTER, new SpawnSettings.SpawnEntry(EntityType.GHAST, 40, 1, 1));
92-
builder.spawn(SpawnGroup.MONSTER, new SpawnSettings.SpawnEntry(EntityType.PIGLIN, 15, 4, 4));
93-
builder.spawn(SpawnGroup.MONSTER, new SpawnSettings.SpawnEntry(EntityType.ZOMBIFIED_PIGLIN, 100, 4, 4));
94-
builder.spawn(SpawnGroup.MONSTER, new SpawnSettings.SpawnEntry(EntityType.MAGMA_CUBE, 100, 2, 5));
95-
builder.spawn(SpawnGroup.CREATURE, new SpawnSettings.SpawnEntry(EntityType.STRIDER, 60, 1, 2));
91+
builder.spawn(SpawnGroup.MONSTER, 40, new SpawnSettings.SpawnEntry(EntityType.GHAST, 1, 1));
92+
builder.spawn(SpawnGroup.MONSTER, 15, new SpawnSettings.SpawnEntry(EntityType.PIGLIN, 4, 4));
93+
builder.spawn(SpawnGroup.MONSTER, 100, new SpawnSettings.SpawnEntry(EntityType.ZOMBIFIED_PIGLIN, 4, 4));
94+
builder.spawn(SpawnGroup.MONSTER, 100, new SpawnSettings.SpawnEntry(EntityType.MAGMA_CUBE, 2, 5));
95+
builder.spawn(SpawnGroup.CREATURE, 60, new SpawnSettings.SpawnEntry(EntityType.STRIDER, 1, 2));
9696

9797
return builder.build();
9898
}

‎common/src/main/java/com/terraformersmc/cinderscapes/biome/LuminousGroveBiome.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private static SpawnSettings createSpawnSettings() {
8787
SpawnSettings.Builder builder = new SpawnSettings.Builder();
8888

8989
// SPAWNS
90-
builder.spawn(SpawnGroup.CREATURE, new SpawnSettings.SpawnEntry(EntityType.STRIDER, 60, 1, 2));
90+
builder.spawn(SpawnGroup.CREATURE, 60, new SpawnSettings.SpawnEntry(EntityType.STRIDER, 1, 2));
9191

9292
return builder.build();
9393
}

‎common/src/main/java/com/terraformersmc/cinderscapes/biome/QuartzCavernBiome.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ private static SpawnSettings createSpawnSettings() {
9797
SpawnSettings.Builder builder = new SpawnSettings.Builder();
9898

9999
// SPAWNS
100-
builder.spawn(SpawnGroup.MONSTER, new SpawnSettings.SpawnEntry(EntityType.ZOMBIFIED_PIGLIN, 50, 4, 4));
101-
builder.spawn(SpawnGroup.MONSTER, new SpawnSettings.SpawnEntry(EntityType.MAGMA_CUBE, 15, 2, 4));
102-
builder.spawn(SpawnGroup.MONSTER, new SpawnSettings.SpawnEntry(EntityType.ENDERMAN, 1, 4, 4));
103-
builder.spawn(SpawnGroup.MONSTER, new SpawnSettings.SpawnEntry(EntityType.PIGLIN, 20, 4, 4));
104-
builder.spawn(SpawnGroup.CREATURE, new SpawnSettings.SpawnEntry(EntityType.STRIDER, 60, 1, 2));
100+
builder.spawn(SpawnGroup.MONSTER, 50, new SpawnSettings.SpawnEntry(EntityType.ZOMBIFIED_PIGLIN, 4, 4));
101+
builder.spawn(SpawnGroup.MONSTER, 15, new SpawnSettings.SpawnEntry(EntityType.MAGMA_CUBE, 2, 4));
102+
builder.spawn(SpawnGroup.MONSTER, 1, new SpawnSettings.SpawnEntry(EntityType.ENDERMAN, 4, 4));
103+
builder.spawn(SpawnGroup.MONSTER, 20, new SpawnSettings.SpawnEntry(EntityType.PIGLIN, 4, 4));
104+
builder.spawn(SpawnGroup.CREATURE, 60, new SpawnSettings.SpawnEntry(EntityType.STRIDER, 1, 2));
105105

106106
return builder.build();
107107
}

‎common/src/main/java/com/terraformersmc/cinderscapes/block/BrambleBerryBushBlock.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.minecraft.block.ShapeContext;
1010
import net.minecraft.block.SweetBerryBushBlock;
1111
import net.minecraft.entity.Entity;
12+
import net.minecraft.entity.EntityCollisionHandler;
1213
import net.minecraft.entity.EntityType;
1314
import net.minecraft.entity.LivingEntity;
1415
import net.minecraft.entity.player.PlayerEntity;
@@ -42,7 +43,7 @@ public ItemStack getPickStack(WorldView world, BlockPos pos, BlockState state, b
4243
}
4344

4445
@Override
45-
public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
46+
public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity, EntityCollisionHandler handler) {
4647
if (entity instanceof LivingEntity && entity.getType() != EntityType.HOGLIN && entity.getType() != EntityType.ZOGLIN) {
4748
entity.slowMovement(state, new Vec3d(0.800000011920929D, 0.75D, 0.800000011920929D));
4849
if (!world.isClient && state.get(AGE) > 0 && (entity.lastRenderX != entity.getX() || entity.lastRenderZ != entity.getZ())) {

0 commit comments

Comments
 (0)