Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Excavator Decoration Block Veins #5815

Merged
merged 3 commits into from
Dec 31, 2023
Merged

Excavator Decoration Block Veins #5815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b130212
Add in new decorative block veins
voidsong-dragonfly Dec 1, 2023
a0aa389
Update en_us.lang & Ancient Seabed vein, closes #5814
voidsong-dragonfly Dec 1, 2023
efa2326
Move lang file around to see if it fixes GH Actions
voidsong-dragonfly Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions src/api/java/blusunrize/immersiveengineering/api/crafting/builders/MineralMixBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public MineralMixBuilder addOverworldSpoils()
return this;
}

public MineralMixBuilder addSiltSpoils()
public MineralMixBuilder addSoilSpoils()
{
JsonObject coarseDirt = new JsonObject();
coarseDirt.addProperty("chance", 0.2f);
Expand All @@ -143,10 +143,27 @@ public MineralMixBuilder addSiltSpoils()
cobblestone.addProperty("chance", 0.5f);
cobblestone.add("output", serializeItemStack(new ItemStack(Items.COBBLESTONE)));
spoilsArray.add(cobblestone);
JsonObject deepslateCobblestone = new JsonObject();
deepslateCobblestone.addProperty("chance", 0.3f);
deepslateCobblestone.add("output", serializeItemStack(new ItemStack(Items.COBBLED_DEEPSLATE)));
spoilsArray.add(deepslateCobblestone);
JsonObject gravel = new JsonObject();
gravel.addProperty("chance", 0.3f);
gravel.add("output", serializeItemStack(new ItemStack(Items.GRAVEL)));
spoilsArray.add(gravel);
return this;
}

public MineralMixBuilder addSeabedSpoils()
{
JsonObject sandstone = new JsonObject();
sandstone.addProperty("chance", 0.6f);
sandstone.add("output", serializeItemStack(new ItemStack(Items.SANDSTONE)));
spoilsArray.add(sandstone);
JsonObject gravel = new JsonObject();
gravel.addProperty("chance", 0.3f);
gravel.add("output", serializeItemStack(new ItemStack(Items.GRAVEL)));
spoilsArray.add(gravel);
JsonObject sand = new JsonObject();
sand.addProperty("chance", 0.1f);
sand.add("output", serializeItemStack(new ItemStack(Items.SAND)));
spoilsArray.add(sand);
return this;
}

Expand Down
48 changes: 37 additions & 11 deletions src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,20 +1162,13 @@ private void mineralMixes(@Nonnull Consumer<FinishedRecipe> out)
TagKey<Item> emerald = Tags.Items.ORES_EMERALD;
Block prismarine = Blocks.PRISMARINE;
TagKey<Item> aquamarine = createItemWrapper(IETags.getGem("aquamarine"));

// Common things
//Dimensions
ResourceKey<DimensionType> overworld = BuiltinDimensionTypes.OVERWORLD;
ResourceKey<DimensionType> nether = BuiltinDimensionTypes.NETHER;

//Decorative Blocks
MineralMixBuilder.builder(overworld)
.addOverworldSpoils()
.addOre(Tags.Items.ORES_COAL, .8f)
.addOre(sulfur, .2f)
.addOre(phosphorus, .2f, getTagCondition(phosphorus))
.setWeight(25)
.setFailchance(.05f)
.build(out, toRL("mineral/bituminous_coal"));
MineralMixBuilder.builder(overworld)
.addSiltSpoils()
.addSoilSpoils()
.addOre(Items.CLAY, .5f)
.addOre(Items.SAND, .3f)
.addOre(Items.GRAVEL, .2f)
Expand All @@ -1191,6 +1184,39 @@ private void mineralMixes(@Nonnull Consumer<FinishedRecipe> out)
.setWeight(25)
.setFailchance(.05f)
.build(out, toRL("mineral/igneous_rock"));
MineralMixBuilder.builder(overworld)
.addSoilSpoils()
.addOre(Items.TERRACOTTA, .6f)
.addOre(Items.RED_SANDSTONE, .3f)
.addOre(Items.RED_SAND, .1f)
.setWeight(15)
.setFailchance(.05f)
.build(out, toRL("mineral/hardened_clay_pan"));
MineralMixBuilder.builder(overworld)
.addSeabedSpoils()
.addOre(Blocks.CALCITE, .65f)
.addOre(Blocks.DRIPSTONE_BLOCK, .3f)
.addOre(Blocks.BONE_BLOCK, .05f)
.setWeight(15)
.setFailchance(.05f)
.build(out, toRL("mineral/ancient_seabed"));
MineralMixBuilder.builder(overworld)
.addOverworldSpoils()
.addOre(Blocks.AMETHYST_BLOCK, .4f)
.addOre(Blocks.CALCITE, .3f)
.addOre(Blocks.SMOOTH_BASALT, .3f)
.setWeight(10)
.setFailchance(.1f)
.build(out, toRL("mineral/amethyst_crevasse"));
// Common things
MineralMixBuilder.builder(overworld)
.addOverworldSpoils()
.addOre(Tags.Items.ORES_COAL, .8f)
.addOre(sulfur, .2f)
.addOre(phosphorus, .2f, getTagCondition(phosphorus))
.setWeight(25)
.setFailchance(.05f)
.build(out, toRL("mineral/bituminous_coal"));
// Metals
MineralMixBuilder.builder(overworld)
.addOverworldSpoils()
Expand Down
45 changes: 24 additions & 21 deletions src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 48 additions & 0 deletions src/generated/resources/data/immersiveengineering/recipes/mineral/amethyst_crevasse.json
View file
Open in desktop

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

48 changes: 48 additions & 0 deletions src/generated/resources/data/immersiveengineering/recipes/mineral/ancient_seabed.json
View file
Open in desktop

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

48 changes: 48 additions & 0 deletions src/generated/resources/data/immersiveengineering/recipes/mineral/hardened_clay_pan.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/generated/resources/data/immersiveengineering/recipes/mineral/silt.json
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions src/main/resources/assets/immersiveengineering/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,9 @@
"desc.immersiveengineering.info.mineral.bituminous_coal": "Bituminous Coal",
"desc.immersiveengineering.info.mineral.silt": "Silt",
"desc.immersiveengineering.info.mineral.igneous_rock": "Igneous Rock",
"desc.immersiveengineering.info.mineral.amethyst_crevasse": "Amethyst Crevasse",
"desc.immersiveengineering.info.mineral.hardened_clay_pan": "Hardened Claypan",
"desc.immersiveengineering.info.mineral.ancient_seabed": "Ancient Seabed",
"desc.immersiveengineering.info.mineral.pentlandite": "Pentlandite",
"desc.immersiveengineering.info.mineral.chalcopyrite": "Chalcopyrite",
"desc.immersiveengineering.info.mineral.laterite": "Laterite",
Expand Down
Loading