Skip to content

Commit

Permalink
Stygian Pomegranate retexture
Browse files Browse the repository at this point in the history
  • Loading branch information
brnbrd committed Sep 29, 2024
1 parent 6a9d68e commit 53f9152
Show file tree
Hide file tree
Showing 16 changed files with 28 additions and 32 deletions.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.1 2024-09-27T22:38:15.7593084 Registries
// 1.20.1 2024-09-29T06:53:48.32761 Registries
651bae8e70e104c165df481284c6d470552634a3 data/collectorsreap/trim_material/pearl.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-09-27T22:38:15.762311 Tags for minecraft:item mod id collectorsreap
// 1.20.1 2024-09-29T06:53:48.3346164 Tags for minecraft:item mod id collectorsreap
ae7e08f92dd075f34544c04d30c8a274b27bd792 data/atmospheric/tags/items/aloe_leaves.json
b1c02044b6eb4060b19a0ed4f40cbeaca19822c9 data/atmospheric/tags/items/passion_fruit.json
a740abeb613a7024a35910efe912a50a6ee62045 data/atmospheric/tags/items/yucca_fruit.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-09-27T22:38:15.7523025 Block States: collectorsreap
// 1.20.1 2024-09-29T06:53:48.3165999 Block States: collectorsreap
e674cff0fcbb19f9b0afff4f1e477315d0cae326 assets/collectorsreap/blockstates/black_candle_lime_cake.json
8dfd84c574e9c7ee59198b0943b5aac0e8b28740 assets/collectorsreap/blockstates/black_candle_pomegranate_cake.json
6d6114f63bd694ebbf674057ebd45184487bbaf1 assets/collectorsreap/blockstates/blue_candle_lime_cake.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-09-27T22:38:15.7583076 Loot Tables
// 1.20.1 2024-09-29T06:53:48.3256076 Loot Tables
f4a3c88fc95a893f684db7cc68e3f910e18b85fe data/collectorsreap/loot_tables/blocks/black_candle_lime_cake.json
d1c4a614122d59c6e0b808daecf41bda624609db data/collectorsreap/loot_tables/blocks/black_candle_pomegranate_cake.json
f88a0ece599f6eb71b969a4b3262f221540435a9 data/collectorsreap/loot_tables/blocks/blue_candle_lime_cake.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-09-27T22:38:15.7613101 Tags for minecraft:worldgen/biome mod id collectorsreap
// 1.20.1 2024-09-29T06:53:48.3326147 Tags for minecraft:worldgen/biome mod id collectorsreap
5caa141a3a5eff8ee89b5e2092eac7253dd52f57 data/collectorsreap/tags/worldgen/biome/has_spawn/chieftain_crab.json
74a855e481dd684fc14e843ffbf7634328669190 data/collectorsreap/tags/worldgen/biome/has_spawn/clam.json
4301fee991060a44225e5c74bedfd95e386538e1 data/collectorsreap/tags/worldgen/biome/has_spawn/lime.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-09-27T22:58:27.5260986 Recipes
// 1.20.1 2024-09-29T06:53:48.3286111 Recipes
6bed5b7d715399840f10473875efca57540c42e3 data/collectorsreap/advancements/recipes/chiseled_urchin_test_bricks.json
ffff41205e9b83cc8ab9d38ce39c06fa7e8f6ae7 data/collectorsreap/advancements/recipes/cutting/chieftain_claw.json
51d613fd6d246740518e1ed57afea6e6deea518e data/collectorsreap/advancements/recipes/cutting/chieftain_crab.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-09-27T22:38:15.7583076 Global Loot Modifiers : collectorsreap
// 1.20.1 2024-09-29T06:53:48.3266092 Global Loot Modifiers : collectorsreap
48ba606dd1af587f71212a0501539edb8b011f1e data/collectorsreap/loot_modifiers/cr_fishing.json
fc90485601f70b14ac274d5d5179aa07d47b040f data/collectorsreap/loot_modifiers/lime_in_abandoned_mineshaft.json
753e8d670c790ed4fa156b208d70e62856229cf5 data/collectorsreap/loot_modifiers/lime_seeds_in_dungeon.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-09-27T22:38:15.7553058 Tags for minecraft:block mod id collectorsreap
// 1.20.1 2024-09-29T06:53:48.321604 Tags for minecraft:block mod id collectorsreap
748e9338cb0e08e973af854da7e0a45c328db6fb data/autumnity/tags/blocks/snail_snacks.json
69bfc567eebda2cc6321f420e07d43720e9719f7 data/collectorsreap/tags/blocks/crab_spawnable_on.json
9fcca766e6223fb4dff1774d187235e66cf1ee7b data/collectorsreap/tags/blocks/pomegranate_fast_on.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.1 2024-09-27T23:46:53.2908468 Languages: en_us
// 1.20.1 2024-09-29T06:53:48.3336152 Languages: en_us
10f1d84e9bcb7773cf8a6d6a1d22442287ad26a8 assets/collectorsreap/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.20.1 2024-09-27T22:38:15.7563058 Tags for minecraft:entity_type mod id collectorsreap
// 1.20.1 2024-09-29T06:53:48.321604 Tags for minecraft:entity_type mod id collectorsreap
ddd907b6cb1b03c93f42247088b1f1fa5a81084f data/collectorsreap/tags/entity_types/involatile.json
01c3f5cebabec10bf259b13ce1d6ce40be8bda20 data/collectorsreap/tags/entity_types/volatility_immune.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-09-27T22:38:15.7563058 Item Models: collectorsreap
// 1.20.1 2024-09-29T06:53:48.3236058 Item Models: collectorsreap
b183daae948efe76cbf209119af41701e5b72e95 assets/collectorsreap/models/item/adzuki_gummy.json
56db9a7317e6d5a63c63af71a4011b16c66c00e7 assets/collectorsreap/models/item/aloe_gummy.json
b27cb012c75da3137768f12a8074eab65874647a assets/collectorsreap/models/item/apple_gummy.json
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGett
return new ItemStack(this.getSeeds());
}

public @Nullable Item getSpecialFruit() {
return null;
public ItemStack getSpecialFruit() {
return ItemStack.EMPTY;
}

public int getSpecialChance() {
Expand All @@ -119,9 +119,9 @@ public int getSpecialChance() {
public boolean isSpecial(Level level, BlockPos pos) {
int chance = this.getSpecialChance();
return (
this.getSpecialFruit() != null &&
chance != 0 &&
level.getRandom().nextInt(chance) == 0
!this.getSpecialFruit().isEmpty() &&
chance != 0 &&
level.getRandom().nextInt(chance) == 0
);
}

Expand Down Expand Up @@ -178,15 +178,15 @@ public boolean isBonemealSuccess(@NotNull Level level, @NotNull RandomSource ran
}

public int getNumFruit(int add) {
return 2 + add;
return 1 + add;
}

public void dropFruit(Level level, BlockPos pos) {
ItemStack stack;
if (this.isSpecial(level, pos)) { // Null-checks getSpecialFruit
stack = new ItemStack(Objects.requireNonNull(this.getSpecialFruit()), 1);
if (this.isSpecial(level, pos)) { // Empty-checks getSpecialFruit
stack = this.getSpecialFruit().copy();
} else {
int additional = level.getRandom().nextInt(2);
int additional = level.getRandom().nextIntBetweenInclusive(1, 2);
stack = new ItemStack(this.getFruit(), this.getNumFruit(additional));
}
Containers.dropItemStack(level, pos.getX(), pos.getY(), pos.getZ(), stack);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.animal.Bee;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelReader;
Expand Down Expand Up @@ -66,18 +67,13 @@ public Item getFruit() {
return CRItems.POMEGRANATE.get();
}

public Item getSpecialFruit() {
return CRItems.STYGIAN_POMEGRANATE.get();
public ItemStack getSpecialFruit() {
return new ItemStack(CRItems.STYGIAN_POMEGRANATE.get(), 1);
}

@Override
public int getSpecialChance() {
return 5;
}

@Override
public int getNumFruit(int add) {
return 1 + add;
return 6;
}

// Can receive boost from Nether or block below.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class Nutrition {
.nutrition(4).saturationMod(0.5F)
.effect(() -> new MobEffectInstance(CREffects.VOLATILITY.get(), 200, 0), 1.0F).build();
public static final FoodProperties STYGIAN_POMEGRANATE = (new FoodProperties.Builder())
.nutrition(10).saturationMod(0.4F)
.nutrition(10).saturationMod(0.4F).alwaysEat()
.effect(() -> new MobEffectInstance(CREffects.VOLATILITY.get(), 400, 4), 1.0F)
.effect(() -> new MobEffectInstance(MobEffects.REGENERATION, 400, 0), 1.0F)
.effect(() -> new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 400, 0), 1.0F)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ public StygianPomegranateItem(Properties properties) {

@Override
public @NotNull Rarity getRarity(@NotNull ItemStack stack) {
return Rarity.UNCOMMON;
return Rarity.RARE;
}

@Override
public @NotNull ItemStack finishUsingItem(@NotNull ItemStack stack, @NotNull Level level, @NotNull LivingEntity entity) {
if (this.loaded()) {
level.explode(entity, entity.getX(), entity.getY(), entity.getZ(), 3.0F, Level.ExplosionInteraction.MOB);
if (this.loaded() && !level.isClientSide()) {
level.explode(entity, entity.getX(), entity.getY(), entity.getZ(), 3.0F, Level.ExplosionInteraction.NONE);
}
return super.finishUsingItem(stack, level, entity);
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 53f9152

Please sign in to comment.