Skip to content

Update Confluence support to 1.2.9 #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ironnoob73 wants to merge 2 commits into
base: 1.21.1/6.0.0-dev
Choose a base branch
from
Open

Update Confluence support to 1.2.9 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a15b15d
Update Confluence support to 1.2.8
Ironnoob73 Oct 10, 2026
6a1c677
Update Confluence support to 1.2.9
Ironnoob73 Oct 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions ...teintegratedfarming/integration/confluence/client/model/ConfluenceDuckModelConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
19 changes: 9 additions & 10 deletions ...eateintegratedfarming/integration/confluence/ranching/roost/ConfluenceDuckRoostBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<Duck, ConfluenceDuckRoostBlockEntity> {
private final int variant;
private final Duck.Variant variant;

public ConfluenceDuckRoostBlock(Properties properties, Holder<Block> empty, int variant) {
public ConfluenceDuckRoostBlock(Properties properties, Holder<Block> empty, Duck.Variant variant) {
super(properties, empty);
this.variant = variant;
}
Expand All @@ -51,7 +50,7 @@ protected Class<Duck> getBirdClass() {

@Override
protected EntityType<Duck> getBirdType() {
return TEAnimals.DUCK.get();
return CritterEntities.DUCK.get();
}

@Override
Expand All @@ -69,20 +68,20 @@ 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
protected MapCodec<? extends ConfluenceDuckRoostBlock> 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));
Expand Down
8 changes: 4 additions & 4 deletions ...lus/dragons/createintegratedfarming/integration/confluence/registry/ConfluenceBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ConfluenceDuckRoostBlock> DUCK_ROOST_MALLARD = registerDuckRoost("confluence_duck_roost_mallard", "Mallard Duck Roost", Duck.MALLARD_ID);
public static final BlockEntry<ConfluenceDuckRoostBlock> DUCK_ROOST_COMMON = registerDuckRoost("confluence_duck_roost_common", "Common Duck Roost", Duck.COMMON_ID);
public static final BlockEntry<ConfluenceDuckRoostBlock> DUCK_ROOST_MALLARD = registerDuckRoost("confluence_duck_roost_mallard", "Mallard Duck Roost", Duck.Variant.MALLARD);
public static final BlockEntry<ConfluenceDuckRoostBlock> DUCK_ROOST_COMMON = registerDuckRoost("confluence_duck_roost_common", "Common Duck Roost", Duck.Variant.COMMON);

private ConfluenceBlocks() {}

private static BlockEntry<ConfluenceDuckRoostBlock> 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 -> {
Expand Down
14 changes: 7 additions & 7 deletions .../createintegratedfarming/integration/confluence/registry/ConfluenceHarvestBehaviours.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
9 changes: 5 additions & 4 deletions ...s/createintegratedfarming/integration/confluence/registry/ConfluenceRoostCapturables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand Down
4 changes: 2 additions & 2 deletions ...resources/assets/create_integrated_farming/models/block/confluence_duck_roost_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions ...esources/assets/create_integrated_farming/models/block/confluence_duck_roost_mallard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/minecraft/atlases/blocks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down