diff --git a/gradle.properties b/gradle.properties index 9a780ca..c26b096 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -mod_version=2.5.6 +mod_version=2.5.7 minecraft_version=1.16.2+ forge_version=1.16.2-33.0.21 diff --git a/src/main/java/cech12/ceramicbucket/compat/FinsAndTrailsCompat.java b/src/main/java/cech12/ceramicbucket/compat/FinsAndTrailsCompat.java new file mode 100644 index 0000000..e3b9b6a --- /dev/null +++ b/src/main/java/cech12/ceramicbucket/compat/FinsAndTrailsCompat.java @@ -0,0 +1,56 @@ +package cech12.ceramicbucket.compat; + +import cech12.ceramicbucket.api.data.ObtainableEntityType; +import net.minecraft.fluid.Fluids; +import net.minecraft.tags.FluidTags; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundEvent; +import net.minecraft.util.SoundEvents; +import net.minecraftforge.registries.ForgeRegistries; + +import java.util.ArrayList; +import java.util.List; + +public class FinsAndTrailsCompat extends ModCompat.Mod implements ModCompat.EntityTypeObtainingMod { + + private final List obtainableEntityTypes = new ArrayList<>(); + + public FinsAndTrailsCompat() { + super("fins"); + this.addFish("banded_redback_shrimp"); + this.addFish("blu_wee"); + this.addFish("flatback_sucker"); + this.addFish("golden_river_ray"); + this.addFish("high_finned_blue"); + this.addFish("night_light_squid"); + this.addFish("ornate_bugfish"); + this.addFish("pea_wee"); + + ObtainableEntityType.Builder builder = new ObtainableEntityType.Builder(new ResourceLocation(this.name, "penglil"), Fluids.EMPTY); + ResourceLocation fillSound = ForgeRegistries.SOUND_EVENTS.getKey(SoundEvents.ITEM_BUCKET_FILL); + if (fillSound != null) builder.setFillSound(fillSound); + ResourceLocation emptySound = new ResourceLocation(this.name, "fins.penglil.ambient"); + SoundEvent sound = ForgeRegistries.SOUND_EVENTS.getValue(emptySound); + if (sound != null) builder.setEmptySound(emptySound); + this.obtainableEntityTypes.add(builder.build()); + + this.addFish("phantom_nudibranch"); + this.addFish("red_bull_crab"); + this.addFish("spindly_gem_crab"); + this.addFish("swamp_mucker"); + this.addFish("teal_arrowfish"); + this.addFish("vibra_wee"); + this.addFish("wee_wee"); + this.addFish("white_bull_crab"); + } + + private void addFish(String fish) { + this.obtainableEntityTypes.add(new ObtainableEntityType.Builder(new ResourceLocation(this.name, fish), Fluids.WATER).addFluidTag(FluidTags.WATER).build()); + } + + @Override + public List getObtainableEntityTypes() { + return this.obtainableEntityTypes; + } + +} diff --git a/src/main/java/cech12/ceramicbucket/compat/ModCompat.java b/src/main/java/cech12/ceramicbucket/compat/ModCompat.java index b408fee..f4e16c1 100644 --- a/src/main/java/cech12/ceramicbucket/compat/ModCompat.java +++ b/src/main/java/cech12/ceramicbucket/compat/ModCompat.java @@ -22,6 +22,7 @@ public class ModCompat { new AxolotlCompat(), new CombustiveFishingCompat(), new EnvironmentalCompat(), + new FinsAndTrailsCompat(), new MilkAllTheMobs(), new QuarkCompat(), new TheUndergardenCompat(), diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/banded_redback_shrimp.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/banded_redback_shrimp.png new file mode 100644 index 0000000..6e776cb Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/banded_redback_shrimp.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/blu_wee.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/blu_wee.png new file mode 100644 index 0000000..d84ebae Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/blu_wee.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/flatback_sucker.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/flatback_sucker.png new file mode 100644 index 0000000..e4ead22 Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/flatback_sucker.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/golden_river_ray.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/golden_river_ray.png new file mode 100644 index 0000000..a02a5ce Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/golden_river_ray.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/high_finned_blue.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/high_finned_blue.png new file mode 100644 index 0000000..227443b Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/high_finned_blue.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/night_light_squid.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/night_light_squid.png new file mode 100644 index 0000000..b3cebf0 Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/night_light_squid.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/ornate_bugfish.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/ornate_bugfish.png new file mode 100644 index 0000000..515465f Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/ornate_bugfish.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/pea_wee.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/pea_wee.png new file mode 100644 index 0000000..5d6706f Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/pea_wee.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/penglil.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/penglil.png new file mode 100644 index 0000000..1d0a168 Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/penglil.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/phantom_nudibranch.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/phantom_nudibranch.png new file mode 100644 index 0000000..0350fb7 Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/phantom_nudibranch.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/red_bull_crab.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/red_bull_crab.png new file mode 100644 index 0000000..5e08485 Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/red_bull_crab.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/spindly_gem_crab.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/spindly_gem_crab.png new file mode 100644 index 0000000..3fb1f1c Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/spindly_gem_crab.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/swamp_mucker.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/swamp_mucker.png new file mode 100644 index 0000000..e6a6743 Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/swamp_mucker.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/teal_arrowfish.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/teal_arrowfish.png new file mode 100644 index 0000000..fb5dddb Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/teal_arrowfish.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/vibra_wee.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/vibra_wee.png new file mode 100644 index 0000000..8028119 Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/vibra_wee.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/wee_wee.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/wee_wee.png new file mode 100644 index 0000000..743aa21 Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/wee_wee.png differ diff --git a/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/white_bull_crab.png b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/white_bull_crab.png new file mode 100644 index 0000000..6b79649 Binary files /dev/null and b/src/main/resources/assets/ceramicbucket/textures/item/bucket_content/fins/white_bull_crab.png differ