diff --git a/build.gradle b/build.gradle index bf05217..619cbe1 100644 --- a/build.gradle +++ b/build.gradle @@ -389,7 +389,8 @@ dependencies { } if (hasIntegration("confluence")) { - confluenceLocalImplementation("maven.modrinth:9kp7blvl:${confluence_version}") + confluenceLocalImplementation("maven.modrinth:geckolib:${geckolib_version}") + confluenceLocalImplementation("curse.maven:confluence-1209464:${confluence_version}") } if (hasIntegration("vanillabackport")) { diff --git a/gradle.properties b/gradle.properties index 04e5f57..536ff09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -48,8 +48,8 @@ tide_version_range = [2.1.1,3) cloth_config_version = 15.0.140 starcatcher_version = 8431589 starcatcher_version_range = [3.0.6,4) -confluence_version = SvvNcTJh -confluence_version_range = [1.2.4,2) +confluence_version = 9146510 +confluence_version_range = [1.2.9,2) ### v1.1.7.10 vanilla_backport_version = 8229724 vanilla_backport_version_range = [1.1.7.10,2) diff --git a/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/client/model/ConfluenceDuckModelConverter.java b/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/client/model/ConfluenceDuckModelConverter.java index 3c9148a..88d3757 100644 --- a/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/client/model/ConfluenceDuckModelConverter.java +++ b/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/client/model/ConfluenceDuckModelConverter.java @@ -47,9 +47,9 @@ final class ConfluenceDuckModelConverter { private static final ResourceLocation MODEL = ResourceLocation.fromNamespaceAndPath( - "terra_entity", "geo/entity/animal/duck.geo.json"); + "confluence", "geo/entity/animal/duck.geo.json"); private static final ResourceLocation ANIMATIONS = ResourceLocation.fromNamespaceAndPath( - "terra_entity", "animations/entity/animal/duck.animation.json"); + "confluence", "animations/entity/animal/duck.animation.json"); private static final String IDLE_ANIMATION = "misc.idle"; private static final float GROUND_HEIGHT = 4.0F / 16.0F; private static final Object CACHE_LOCK = new Object(); diff --git a/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/ranching/roost/ConfluenceDuckRoostBlock.java b/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/ranching/roost/ConfluenceDuckRoostBlock.java index b5ca03d..3dbacd8 100644 --- a/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/ranching/roost/ConfluenceDuckRoostBlock.java +++ b/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/ranching/roost/ConfluenceDuckRoostBlock.java @@ -18,7 +18,6 @@ package plus.dragons.createintegratedfarming.integration.confluence.ranching.roost; -import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.core.Holder; @@ -29,17 +28,17 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; -import org.confluence.terraentity.entity.animal.Duck; -import org.confluence.terraentity.init.TESounds; -import org.confluence.terraentity.init.entity.TEAnimals; +import org.confluence.mod.common.entity.animal.Duck; +import org.confluence.mod.common.init.ModSoundEvents; +import org.confluence.mod.common.init.entity.CritterEntities; import org.jetbrains.annotations.Nullable; import plus.dragons.createintegratedfarming.common.ranching.roost.BirdRoostBlock; import plus.dragons.createintegratedfarming.integration.confluence.registry.ConfluenceBlockEntities; public class ConfluenceDuckRoostBlock extends BirdRoostBlock { - private final int variant; + private final Duck.Variant variant; - public ConfluenceDuckRoostBlock(Properties properties, Holder empty, int variant) { + public ConfluenceDuckRoostBlock(Properties properties, Holder empty, Duck.Variant variant) { super(properties, empty); this.variant = variant; } @@ -51,7 +50,7 @@ protected Class getBirdClass() { @Override protected EntityType getBirdType() { - return TEAnimals.DUCK.get(); + return CritterEntities.DUCK.get(); } @Override @@ -69,12 +68,12 @@ protected SoundEvent getEggSound() { @Override protected SoundEvent getHurtSound() { - return TESounds.ROUTINE_HURT.get(); + return ModSoundEvents.ROUTINE_HURT.get(); } @Override protected boolean isBirdJockey(Duck bird) { - return bird.isChickenJockey(); + return false; } @Override @@ -82,7 +81,7 @@ protected MapCodec codec() { return RecordCodecBuilder.mapCodec(instance -> instance.group( propertiesCodec(), BuiltInRegistries.BLOCK.holderByNameCodec().fieldOf("empty").forGetter(block -> block.empty), - Codec.intRange(Duck.MALLARD_ID, Duck.COMMON_ID) + Duck.Variant.CODEC .fieldOf("variant") .forGetter(block -> block.variant)) .apply(instance, ConfluenceDuckRoostBlock::new)); diff --git a/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/registry/ConfluenceBlocks.java b/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/registry/ConfluenceBlocks.java index 99429b0..c81b979 100644 --- a/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/registry/ConfluenceBlocks.java +++ b/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/registry/ConfluenceBlocks.java @@ -28,18 +28,18 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.neoforge.data.loading.DatagenModLoader; import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent; -import org.confluence.terraentity.entity.animal.Duck; +import org.confluence.mod.common.entity.animal.Duck; import plus.dragons.createintegratedfarming.common.registry.CIFCreativeModeTabs; import plus.dragons.createintegratedfarming.integration.confluence.ranching.roost.ConfluenceDuckRoostBlock; public final class ConfluenceBlocks { - public static final BlockEntry DUCK_ROOST_MALLARD = registerDuckRoost("confluence_duck_roost_mallard", "Mallard Duck Roost", Duck.MALLARD_ID); - public static final BlockEntry DUCK_ROOST_COMMON = registerDuckRoost("confluence_duck_roost_common", "Common Duck Roost", Duck.COMMON_ID); + public static final BlockEntry DUCK_ROOST_MALLARD = registerDuckRoost("confluence_duck_roost_mallard", "Mallard Duck Roost", Duck.Variant.MALLARD); + public static final BlockEntry DUCK_ROOST_COMMON = registerDuckRoost("confluence_duck_roost_common", "Common Duck Roost", Duck.Variant.COMMON); private ConfluenceBlocks() {} private static BlockEntry registerDuckRoost( - String path, String name, int variant) { + String path, String name, Duck.Variant variant) { return REGISTRATE.block(path, properties -> new ConfluenceDuckRoostBlock(properties, ROOST, variant)) .lang(name) .properties(properties -> { diff --git a/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/registry/ConfluenceHarvestBehaviours.java b/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/registry/ConfluenceHarvestBehaviours.java index e66d598..464b484 100644 --- a/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/registry/ConfluenceHarvestBehaviours.java +++ b/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/registry/ConfluenceHarvestBehaviours.java @@ -33,13 +33,13 @@ public static void register() { register(NatureBlocks.STELLAR_BLOSSOM.get(), FoodItems.STELLAR_BLOSSOM_SEED.get()); register(NatureBlocks.CLOUDWEAVER.get(), FoodItems.CLOUDWEAVER_SEED.get()); register(NatureBlocks.FLOATING_WHEAT.get(), FoodItems.FLOATING_WHEAT_SEED.get()); - register(ModBlocks.WATERLEAF.get(), FoodItems.WATERLEAF_SEED.get()); - register(ModBlocks.FIREBLOSSOM.get(), FoodItems.FIREBLOSSOM_SEED.get()); - register(ModBlocks.MOONGLOW.get(), FoodItems.MOONGLOW_SEED.get()); - register(ModBlocks.BLINKROOT.get(), FoodItems.BLINKROOT_SEED.get()); - register(ModBlocks.SHIVERTHORN.get(), FoodItems.SHIVERTHORN_SEED.get()); - register(ModBlocks.DAYBLOOM.get(), FoodItems.DAYBLOOM_SEED.get()); - register(ModBlocks.DEATHWEED.get(), FoodItems.DEATHWEED_SEED.get()); + register(NatureBlocks.WATERLEAF.get(), FoodItems.WATERLEAF_SEED.get()); + register(NatureBlocks.FIREBLOSSOM.get(), FoodItems.FIREBLOSSOM_SEED.get()); + register(NatureBlocks.MOONGLOW.get(), FoodItems.MOONGLOW_SEED.get()); + register(NatureBlocks.BLINKROOT.get(), FoodItems.BLINKROOT_SEED.get()); + register(NatureBlocks.SHIVERTHORN.get(), FoodItems.SHIVERTHORN_SEED.get()); + register(NatureBlocks.DAYBLOOM.get(), FoodItems.DAYBLOOM_SEED.get()); + register(NatureBlocks.DEATHWEED.get(), FoodItems.DEATHWEED_SEED.get()); } private static void register(CropBlock crop, Item seed) { diff --git a/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/registry/ConfluenceRoostCapturables.java b/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/registry/ConfluenceRoostCapturables.java index b6a3b82..a1cc2c5 100644 --- a/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/registry/ConfluenceRoostCapturables.java +++ b/src/integration/confluence/java/plus/dragons/createintegratedfarming/integration/confluence/registry/ConfluenceRoostCapturables.java @@ -18,16 +18,17 @@ package plus.dragons.createintegratedfarming.integration.confluence.registry; -import org.confluence.terraentity.entity.animal.Duck; -import org.confluence.terraentity.init.entity.TEAnimals; +import static org.confluence.mod.common.init.entity.CritterEntities.DUCK; + +import org.confluence.mod.common.entity.animal.Duck; import plus.dragons.createintegratedfarming.common.ranching.roost.RoostCapturableProvider; public final class ConfluenceRoostCapturables { private ConfluenceRoostCapturables() {} public static void register() { - RoostCapturableProvider.REGISTRY.register(TEAnimals.DUCK.get(), entity -> { - if (entity instanceof Duck duck && duck.getVariant() == Duck.COMMON_ID) + RoostCapturableProvider.REGISTRY.register(DUCK.get(), entity -> { + if (entity instanceof Duck duck && duck.getVariant() == Duck.Variant.COMMON) return ConfluenceBlocks.DUCK_ROOST_COMMON.get(); return ConfluenceBlocks.DUCK_ROOST_MALLARD.get(); }); diff --git a/src/integration/confluence/resources/assets/create_integrated_farming/models/block/confluence_duck_roost_common.json b/src/integration/confluence/resources/assets/create_integrated_farming/models/block/confluence_duck_roost_common.json index 501a44f..83bc08c 100644 --- a/src/integration/confluence/resources/assets/create_integrated_farming/models/block/confluence_duck_roost_common.json +++ b/src/integration/confluence/resources/assets/create_integrated_farming/models/block/confluence_duck_roost_common.json @@ -13,8 +13,8 @@ }, "render_type": "minecraft:cutout", "textures": { - "duck": "terra_entity:entity/animal/duck/duck_2", - "particle": "terra_entity:entity/animal/duck/duck_2" + "duck": "confluence:entity/animal/duck/duck_2", + "particle": "confluence:entity/animal/duck/duck_2" } } }, diff --git a/src/integration/confluence/resources/assets/create_integrated_farming/models/block/confluence_duck_roost_mallard.json b/src/integration/confluence/resources/assets/create_integrated_farming/models/block/confluence_duck_roost_mallard.json index 5b700ea..b0c1318 100644 --- a/src/integration/confluence/resources/assets/create_integrated_farming/models/block/confluence_duck_roost_mallard.json +++ b/src/integration/confluence/resources/assets/create_integrated_farming/models/block/confluence_duck_roost_mallard.json @@ -13,8 +13,8 @@ }, "render_type": "minecraft:cutout", "textures": { - "duck": "terra_entity:entity/animal/duck/duck_1", - "particle": "terra_entity:entity/animal/duck/duck_1" + "duck": "confluence:entity/animal/duck/duck_1", + "particle": "confluence:entity/animal/duck/duck_1" } } }, diff --git a/src/main/resources/assets/minecraft/atlases/blocks.json b/src/main/resources/assets/minecraft/atlases/blocks.json index 70682fb..d066089 100644 --- a/src/main/resources/assets/minecraft/atlases/blocks.json +++ b/src/main/resources/assets/minecraft/atlases/blocks.json @@ -7,11 +7,11 @@ }, { "type": "single", - "resource": "terra_entity:entity/animal/duck/duck_1" + "resource": "confluence:entity/animal/duck/duck_1" }, { "type": "single", - "resource": "terra_entity:entity/animal/duck/duck_2" + "resource": "confluence:entity/animal/duck/duck_2" }, { "type": "single",