Skip to content

Commit 511fcb6

Browse files
committed
bug: Fixed class error in FluidBuilder
1 parent 2bf2e04 commit 511fcb6

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

forge/src/main/java/rbasamoyai/createbigcannons/forge/index/fluid_utils/ForgeFluidBuilder.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515

1616
import net.minecraft.resources.ResourceLocation;
1717
import net.minecraft.tags.TagKey;
18+
import net.minecraft.world.item.BucketItem;
1819
import net.minecraft.world.item.Item;
1920
import net.minecraft.world.level.block.Block;
2021
import net.minecraft.world.level.block.LiquidBlock;
2122
import net.minecraft.world.level.material.Fluid;
2223
import rbasamoyai.createbigcannons.index.fluid_utils.CBCFlowingFluid;
2324
import rbasamoyai.createbigcannons.index.fluid_utils.FluidBuilder;
2425
import rbasamoyai.createbigcannons.utils.CBCRegistryUtils;
26+
import rbasamoyai.createbigcannons.utils.CBCUtils;
2527

2628
public class ForgeFluidBuilder<T extends CBCFlowingFluid, P> extends FluidBuilder<T, P> {
2729

@@ -61,8 +63,8 @@ protected <B extends Block> void acceptBlockstate(DataGenContext<Block, B> ctx,
6163
}
6264

6365
@Override
64-
protected <I extends Item> void acceptItemModel(DataGenContext<Item, I> ctx, RegistrateItemModelProvider prov) {
65-
prov.generated(ctx, new ResourceLocation(this.getOwner().getModid(), "item/" + this.bucketName));
66+
protected <I extends BucketItem> void acceptItemModel(DataGenContext<Item, I> ctx, RegistrateItemModelProvider prov) {
67+
prov.generated(ctx, CBCUtils.location(this.getOwner().getModid(), "item/" + this.bucketName));
6668
}
6769

6870
}

src/main/java/rbasamoyai/createbigcannons/index/fluid_utils/FluidBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ public <I extends BucketItem> ItemBuilder<I, FluidBuilder<T, P>> bucket(NonNullB
159159
}
160160
return getOwner().<I, FluidBuilder<T, P>>item(this, bucketName, p -> ((NonNullBiFunction<CBCFlowingFluid, Item.Properties, ? extends I>) factory).apply(this.source.get(), p))
161161
.properties(p -> p.craftRemainder(Items.BUCKET).stacksTo(1))
162-
.model((ctx, prov) -> prov.generated(ctx, CBCUtils.location(getOwner().getModid(), "item/" + bucketName)));
162+
.model(this::acceptItemModel);
163163
}
164164

165-
protected abstract <I extends Item> void acceptItemModel(DataGenContext<Item, I> ctx, RegistrateItemModelProvider prov);
165+
protected abstract <I extends BucketItem> void acceptItemModel(DataGenContext<Item, I> ctx, RegistrateItemModelProvider prov);
166166

167167
@Beta
168168
public FluidBuilder<T, P> noBucket() {

0 commit comments

Comments
 (0)