Skip to content

Commit

Permalink
GoG changes relevant to non/void nether
Browse files Browse the repository at this point in the history
- Pebbles are now 100% chance instead of 80%
- Living root drops 4 instead of 2-4
- Soul soil can be made from soul sand with an alchemy catalyst (in general, not just
in GoG)
- Fel blazes now consistently drop 10 blaze powder when killed by a player (up to 16
with looting), and 6 when not
  • Loading branch information
anoomolu authored and artemisSystem committed Dec 30, 2023
1 parent c423371 commit 5e2f6d6
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 14 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import net.minecraft.world.level.storage.loot.predicates.MatchTool;
import net.minecraft.world.level.storage.loot.providers.nbt.ContextNbtProvider;
import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -210,7 +209,7 @@ protected static LootTable.Builder genSolidVine(Block b) {

protected static LootTable.Builder genRoot(Block b) {
LootPoolEntryContainer.Builder<?> entry = LootItem.lootTableItem(BotaniaItems.livingroot)
.apply(SetItemCountFunction.setCount(UniformGenerator.between(2, 4)))
.apply(SetItemCountFunction.setCount(ConstantValue.exactly(4)))
.apply(ApplyExplosionDecay.explosionDecay());
return LootTable.lootTable().withPool(LootPool.lootPool().setRolls(ConstantValue.exactly(1)).add(entry));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ public void buildRecipes(Consumer<net.minecraft.data.recipes.FinishedRecipe> con
consumer.accept(deconstruct("brick_deconstruct", Items.BRICK, Blocks.BRICKS));

consumer.accept(FinishedRecipe.alchemy(id("coarse_dirt"), new ItemStack(Blocks.COARSE_DIRT), ingr(Blocks.DIRT), 120));
consumer.accept(FinishedRecipe.alchemy(id("soul_soil"), new ItemStack(Blocks.SOUL_SOIL), ingr(Blocks.SOUL_SAND), 120));

consumer.accept(FinishedRecipe.alchemy(id("stone_to_andesite"), new ItemStack(Blocks.ANDESITE), ingr(Blocks.STONE), 200));
cycle(consumer, 200, "botania:stone_cycle", Blocks.DIORITE, Blocks.GRANITE, Blocks.ANDESITE);
Expand Down
1 change: 1 addition & 0 deletions Xplat/src/main/resources/assets/botania/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -2443,6 +2443,7 @@
"botania.page.manaAlchemy38": "Brick & Clay Ball",
"botania.page.manaAlchemy22": "Breaking down $(item)Clay$(0) and $(item)Bricks$(0)",
"botania.page.manaAlchemy23": "Making $(item)Coarse Dirt$(0)",
"botania.page.manaAlchemy44": "Making $(item)Soul Soil$(0)",
"botania.page.manaAlchemy39": "Grass",
"botania.page.manaAlchemy24": "Transmuting $(item)Tall Grasses$(0)",
"botania.page.manaAlchemy40": "Flower",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,11 @@
"text": "botania.page.manaAlchemy23",
"recipes": "botania:mana_infusion/coarse_dirt"
},
{
"type": "botania:mana_infusion",
"text": "botania.page.manaAlchemy44",
"recipes": "botania:mana_infusion/soul_soil"
},
{
"type": "botania:mana_infusion",
"heading": "botania.page.manaAlchemy41",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"type": "item",
"entryName": "normal_death_powder",
"name": "minecraft:blaze_powder",
"conditions": [
{ "condition": "inverted", "term": {"condition": "killed_by_player"}}
],
"functions": [
{ "function": "set_count", "count": 6 }
]
Expand Down
6 changes: 0 additions & 6 deletions garden_of_glass/data/gardenofglass/loot_tables/pebbles.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
"type": "minecraft:item",
"name": "botania:pebble"
}
],
"conditions": [
{
"condition": "minecraft:random_chance",
"chance": 0.8
}
]
}
]
Expand Down

0 comments on commit 5e2f6d6

Please sign in to comment.