Skip to content

Commit 32d1b80

Browse files
committed
1.21.10
1 parent a9399f8 commit 32d1b80

File tree

9 files changed

+23
-17
lines changed

9 files changed

+23
-17
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
versions:
1212
description: 'List of versions to be published'
1313
required: true
14-
default: "['1.21.1', '1.21.4', '1.21.5', '1.21.8']"
14+
default: "['1.21.1', '1.21.4', '1.21.5', '1.21.8', '1.21.10']"
1515
type: string
1616

1717
jobs:

common/src/main/java/com/faboslav/friendsandfoes/common/entity/CopperGolemEntity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
import net.minecraft.world.entity.ai.control.LookControl;
4747
import net.minecraft.world.entity.ai.control.MoveControl;
4848
import net.minecraft.world.entity.animal.AbstractGolem;
49+
import net.minecraft.world.entity.animal.coppergolem.CopperGolem;
50+
import net.minecraft.world.entity.npc.Villager;
4951
import net.minecraft.world.entity.player.Player;
5052
import net.minecraft.world.item.AxeItem;
5153
import net.minecraft.world.item.Item;

common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesEntityDataSerializers.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@
33
import com.faboslav.friendsandfoes.common.entity.CopperGolemEntity;
44
import com.faboslav.friendsandfoes.common.platform.PlatformHooks;
55
import net.minecraft.network.syncher.EntityDataSerializer;
6+
import net.minecraft.network.syncher.EntityDataSerializers;
67

8+
/**
9+
* @see net.minecraft.network.syncher.EntityDataSerializers
10+
*/
711
public class FriendsAndFoesEntityDataSerializers
812
{
913
//? if >= 1.21.9 {
1014
public static final EntityDataSerializer<CopperGolemEntity.EntitySnapshot> COPPER_GOLEM_SNAPSHOT = EntityDataSerializer.forValueType(CopperGolemEntity.EntitySnapshot.STREAM_CODEC);
1115

1216
public static void init() {
17+
//EntityDataSerializers.registerSerializer(COPPER_GOLEM_SNAPSHOT);
1318
PlatformHooks.ENTITY_SERIALIZERS.register("copper_golem_snapshot", COPPER_GOLEM_SNAPSHOT);
1419
}
1520
//?}

common/src/main/java/com/faboslav/friendsandfoes/common/mixin/VillagerHostilesSensorMixin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import com.faboslav.friendsandfoes.common.init.FriendsAndFoesEntityTypes;
44
import com.google.common.collect.ImmutableMap;
5+
import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
56
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
6-
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
77
import net.minecraft.world.entity.EntityType;
8+
import net.minecraft.world.entity.LivingEntity;
89
import net.minecraft.world.entity.ai.sensing.VillagerHostilesSensor;
910
import org.spongepowered.asm.mixin.Mixin;
1011
import org.spongepowered.asm.mixin.Unique;
@@ -41,9 +42,8 @@ public final class VillagerHostilesSensorMixin
4142
@WrapMethod(
4243
method = "isHostile"
4344
)
44-
private static ImmutableMap<EntityType<?>, Float> addDanger(
45-
ImmutableMap.Builder<EntityType<?>, Float> instance,
46-
Operation<ImmutableMap<EntityType<?>, Float>> original
45+
private boolean friendsandfoes$isHostile(
46+
LivingEntity entity, Operation<Boolean> original
4747
) {
4848
if(original.call(entity)) {
4949
return true;

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ deps.parchment=
2626

2727
# Stonecutter
2828
stonecutter_enabled_platforms=fabric, neoforge
29-
stonecutter_enabled_common_versions=1.21.1, 1.21.4, 1.21.5, 1.21.8, 1.21.9
30-
stonecutter_enabled_fabric_versions=1.21.1, 1.21.4, 1.21.5, 1.21.8, 1.21.9
31-
stonecutter_enabled_neoforge_versions=1.21.1, 1.21.4, 1.21.5, 1.21.8, 1.21.9
29+
stonecutter_enabled_common_versions=1.21.1, 1.21.4, 1.21.5, 1.21.8, 1.21.10
30+
stonecutter_enabled_fabric_versions=1.21.1, 1.21.4, 1.21.5, 1.21.8, 1.21.10
31+
stonecutter_enabled_neoforge_versions=1.21.1, 1.21.4, 1.21.5, 1.21.8, 1.21.10
3232

3333
# Fabric https://fabricmc.net/versions.html
3434
deps.fabric-loader=

neoforge/src/main/java/com/faboslav/friendsandfoes/neoforge/platform/EntitySerializers.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77

88
public final class EntitySerializers implements com.faboslav.friendsandfoes.common.platform.EntitySerializers
99
{
10-
11-
public static final DeferredRegister<EntityDataSerializer<?>> ENTITY_DATA_SERIALIZERS = DeferredRegister
12-
.create(NeoForgeRegistries.ENTITY_DATA_SERIALIZERS, FriendsAndFoes.MOD_ID);
10+
public static final DeferredRegister<EntityDataSerializer<?>> ENTITY_DATA_SERIALIZERS = DeferredRegister.create(NeoForgeRegistries.ENTITY_DATA_SERIALIZERS, FriendsAndFoes.MOD_ID);
1311

1412
@Override
1513
public void register(String id, EntityDataSerializer<?> serializer) {
14+
FriendsAndFoes.getLogger().info("Registering entity data serializer: {}", id);
1615
ENTITY_DATA_SERIALIZERS.register(id, () -> serializer);
1716
}
1817
}

stonecutter.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
if (IS_CI) stonecutter active null
10-
else stonecutter active "1.21.9" /* [SC] DO NOT EDIT */
10+
else stonecutter active "1.21.10" /* [SC] DO NOT EDIT */
1111

1212
stonecutter {
1313
parameters {

versions/1.21.9/gradle.properties renamed to versions/1.21.10/gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ stonecutter_enabled_platforms=fabric, neoforge
55
java.version=21
66

77
# Minecraft
8-
minecraft_version=1.21.9
8+
minecraft_version=1.21.10
99
min_minecraft_version=1.21.9
1010

1111
# Mappings
12-
deps.parchment=2025.10.05
12+
deps.parchment=
1313

1414
# Fabric
15-
deps.fabric-loader=0.17.2
16-
deps.fabric-api=0.133.7
15+
deps.fabric-loader=0.17.3
16+
deps.fabric-api=0.135.0
1717

1818
# NeoForge
19-
deps.neoforge=21.9.0-beta
19+
deps.neoforge=21.10.18-beta
2020

2121
# Dependencies
2222
deps.resourceful-lib.mc=1.21.9

0 commit comments

Comments
 (0)