Skip to content

Commit f476359

Browse files
committed
Updated Travelers Backpack compat. Fixes #1224
1 parent 0a7ce8e commit f476359

3 files changed

Lines changed: 13 additions & 12 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ ears_version=1.4.6
4949
# https://modrinth.com/mod/idwtialsimmoedm/versions
5050
idwtialsimmoedm_version=0.3.1+1.20
5151
# https://modrinth.com/mod/travelersbackpack/
52-
travelers_backpack_version=xa2rNDt3
52+
travelers_backpack_version=XjQxivlU
5353
# https://modrinth.com/mod/botania/
5454
botania_version=1.20.1-446-fabric
5555
auth_me_version=7.0.2+1.20

src/main/java/de/dafuqs/spectrum/compat/travelersbackpack/TravelersBackpackCompat.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package de.dafuqs.spectrum.compat.travelersbackpack;
22

3+
import com.tiviacz.travelersbackpack.api.fluids.*;
34
import com.tiviacz.travelersbackpack.fluids.*;
5+
import com.tiviacz.travelersbackpack.inventory.*;
46
import de.dafuqs.spectrum.compat.*;
57
import de.dafuqs.spectrum.helpers.*;
68
import de.dafuqs.spectrum.registries.*;
79
import net.fabricmc.api.*;
8-
import net.fabricmc.fabric.api.transfer.v1.fluid.*;
9-
import net.fabricmc.fabric.api.transfer.v1.storage.*;
1010
import net.minecraft.enchantment.*;
1111
import net.minecraft.entity.*;
1212
import net.minecraft.entity.effect.*;
@@ -22,12 +22,10 @@ public class TravelersBackpackCompat extends SpectrumIntegrationPacks.ModIntegra
2222
public abstract static class SpectrumEffectFluid extends EffectFluid {
2323

2424
public SpectrumEffectFluid(String id, Fluid fluid) {
25-
super(id, fluid, 81000L);
25+
super(id, fluid, 81000);
2626
}
2727

28-
public abstract void affectDrinker(StorageView<FluidVariant> fluidStack, World world, Entity entity);
29-
30-
public boolean canExecuteEffect(StorageView<FluidVariant> stack, World world, Entity entity) {
28+
public boolean canExecuteEffect(FluidVariantWrapper stack, World world, Entity entity) {
3129
return stack.getAmount() >= this.amountRequired;
3230
}
3331

@@ -36,19 +34,21 @@ public boolean canExecuteEffect(StorageView<FluidVariant> stack, World world, En
3634
@Override
3735
public void register() {
3836
EffectFluidRegistry.registerFluidEffect(new SpectrumEffectFluid("spectrum:mud", SpectrumFluids.MUD.getStill()) {
37+
3938
@Override
40-
public void affectDrinker(StorageView<FluidVariant> fluidStack, World world, Entity entity) {
39+
public void affectDrinker(FluidVariantWrapper fluidVariantWrapper, World world, Entity entity) {
4140
if (entity instanceof LivingEntity livingEntity) {
4241
livingEntity.addStatusEffect(new StatusEffectInstance(StatusEffects.NAUSEA, 200));
4342
livingEntity.addStatusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 400, 2));
4443
livingEntity.addStatusEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 600, 3));
4544
}
4645
}
46+
4747
});
4848

4949
EffectFluidRegistry.registerFluidEffect(new SpectrumEffectFluid("spectrum:liquid_crystal", SpectrumFluids.LIQUID_CRYSTAL.getStill()) {
5050
@Override
51-
public void affectDrinker(StorageView<FluidVariant> fluidStack, World world, Entity entity) {
51+
public void affectDrinker(FluidVariantWrapper fluidStack, World world, Entity entity) {
5252
if (entity instanceof PlayerEntity player) {
5353
player.addStatusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 400, 1));
5454
}
@@ -57,7 +57,7 @@ public void affectDrinker(StorageView<FluidVariant> fluidStack, World world, Ent
5757

5858
EffectFluidRegistry.registerFluidEffect(new SpectrumEffectFluid("spectrum:midnight_solution", SpectrumFluids.MIDNIGHT_SOLUTION.getStill()) {
5959
@Override
60-
public void affectDrinker(StorageView<FluidVariant> fluidStack, World world, Entity entity) {
60+
public void affectDrinker(FluidVariantWrapper fluidStack, World world, Entity entity) {
6161
if (entity instanceof PlayerEntity player) {
6262
player.addExperience(-20);
6363

@@ -80,7 +80,7 @@ public void affectDrinker(StorageView<FluidVariant> fluidStack, World world, Ent
8080

8181
EffectFluidRegistry.registerFluidEffect(new SpectrumEffectFluid("spectrum:dragonrot", SpectrumFluids.DRAGONROT.getStill()) {
8282
@Override
83-
public void affectDrinker(StorageView<FluidVariant> fluidStack, World world, Entity entity) {
83+
public void affectDrinker(FluidVariantWrapper fluidStack, World world, Entity entity) {
8484
if (entity instanceof LivingEntity livingEntity) {
8585
livingEntity.addStatusEffect(new StatusEffectInstance(SpectrumStatusEffects.LIFE_DRAIN, 600, 3));
8686
livingEntity.damage(SpectrumDamageTypes.dragonrot(world), 1000); // 💀

src/main/resources/fabric.mod.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
},
9292
"breaks": {
9393
"idwtialsimmoedm": "<0.3.0-",
94-
"enchancement": "<=1.20-26"
94+
"enchancement": "<=1.20-26",
95+
"travelersbackpack": "<9.1.31"
9596
}
9697
}

0 commit comments

Comments
 (0)