Skip to content

Commit

Permalink
feat: replace Glass Vial with disposable Organic Vial
Browse files Browse the repository at this point in the history
  • Loading branch information
Elenterius committed Jun 16, 2023
1 parent 93726a4 commit c33cf50
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ private void addItemTranslations() {
addItem(ModItems.VOLATILE_FLUID, "Volatile Fluid", "Combustible extract, needs further processing to be more dangerous.");
addItem(ModItems.BILE, "Bile", "Organic base material which is often used in bio-alchemy.");

addItem(ModItems.DESPOIL_SICKLE, "[WIP] Flesh Plunderer", "[WIP] A specialized tool for pillaging special loot from dying mobs.");
addItem(ModItems.GLASS_VIAL, "Glass Vial", "Glass is transparent... very brittle, yet strong and rigid. Very high alchemical resistance, seems perfect for holding reactive substances.");
addItem(ModItems.DESPOIL_SICKLE, "[PH] Flesh Plunderer", "A very brittle yet highly specialized tool for pillaging special loot from dying mobs.\nWhen last hitting mobs the tool receives less damage.");
addItem(ModItems.VIAL, "Organic Vial", "A small organic container with very high alchemical resistance, perfect for holding reactive substances.\nThe vial dissolves on use.");
addItem(ModItems.LIVING_FLESH, "Living Flesh", "It's alive!\nBut it looks too dumb to be the brain of a mob. You should turn it into a construct.");
addItem(ModItems.PRIMORDIAL_CORE, "Primordial Core", "[WIP] A ominous artifact made of flesh. It makes you feel uneasy...");
// addItem(ModItems.PRIMORDIAL_LIVING_OCULUS, "Primordial Oculus", "A ominous eye is gazing at you...");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@ protected void registerModels() {
basicItem(ModItems.CREATOR_MIX.get());
basicItem(ModItems.NUTRIENT_PASTE.get());
basicItem(ModItems.NUTRIENT_BAR.get());
basicItem(ModItems.GLASS_VIAL.get());
basicItem(ModItems.FLESH_DOOR.get());
basicItem(ModItems.FULL_FLESH_DOOR.get());

serumItem(ModItems.VIAL.get());

serumItem(ModItems.REJUVENATION_SERUM.get());
serumItem(ModItems.AGEING_SERUM.get());
serumItem(ModItems.ENLARGEMENT_SERUM.get());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class BioLabRecipeBuilder implements IRecipeBuilder {
private final ItemData result;
private final List<IngredientStack> ingredients = new ArrayList<>();
private final Advancement.Builder advancement = Advancement.Builder.advancement();
private Ingredient reactant = Ingredient.of(ModItems.GLASS_VIAL.get());
private Ingredient reactant = Ingredient.of(ModItems.VIAL.get());
private int craftingTime = 4 * 20;

private BioLabRecipeBuilder(ResourceLocation recipeId, ItemData result) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,12 @@ private void registerWorkbenchRecipes(Consumer<FinishedRecipe> consumer) {
// .requires(ModItems.MOB_FANG.get())
// .unlockedBy(hasName(ModItems.PRIMORDIAL_LIVING_FLESH.get()), has(ModItems.PRIMORDIAL_LIVING_FLESH.get())).save(consumer);

WorkbenchRecipeBuilder.shaped(ModItems.GLASS_VIAL.get(), 8)
.define('G', Tags.Items.GLASS).define('T', Items.CLAY_BALL)
.pattern("GTG")
.pattern("G G")
.pattern(" G ")
.unlockedBy(hasName(Items.GLASS), has(Tags.Items.GLASS)).save(consumer);
// WorkbenchRecipeBuilder.shaped(ModItems.VIAL.get(), 8)
// .define('G', Tags.Items.GLASS).define('T', Items.CLAY_BALL)
// .pattern("GTG")
// .pattern("G G")
// .pattern(" G ")
// .unlockedBy(hasName(Items.GLASS), has(Tags.Items.GLASS)).save(consumer);

// machines ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -922,6 +922,11 @@ private void registerBioForgeRecipes(Consumer<FinishedRecipe> consumer) {
.setCategory(ModBioForgeTabs.WEAPONS)
.unlockedBy(ModItems.FLESH_BITS.get()).save(consumer);

BioForgeRecipeBuilder.create(new ItemData(ModItems.VIAL.get()))
.addIngredient(ModItems.ELASTIC_FIBERS.get(), 1)
.setCategory(ModBioForgeTabs.WEAPONS)
.unlockedBy(ModItems.ELASTIC_FIBERS.get()).save(consumer);

//////////// MISC ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////

BioForgeRecipeBuilder.create(ModItems.CREATOR_MIX.get())
Expand Down
8 changes: 4 additions & 4 deletions src/generated/resources/assets/biomancy/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
"item.biomancy.volatile_fluid.tooltip": "Combustible extract, needs further processing to be more dangerous.",
"item.biomancy.bile": "Bile",
"item.biomancy.bile.tooltip": "Organic base material which is often used in bio-alchemy.",
"item.biomancy.despoil_sickle": "[WIP] Flesh Plunderer",
"item.biomancy.despoil_sickle.tooltip": "[WIP] A specialized tool for pillaging special loot from dying mobs.",
"item.biomancy.glass_vial": "Glass Vial",
"item.biomancy.glass_vial.tooltip": "Glass is transparent... very brittle, yet strong and rigid. Very high alchemical resistance, seems perfect for holding reactive substances.",
"item.biomancy.despoil_sickle": "[PH] Flesh Plunderer",
"item.biomancy.despoil_sickle.tooltip": "A very brittle yet highly specialized tool for pillaging special loot from dying mobs.\nWhen last hitting mobs the tool receives less damage.",
"item.biomancy.vial": "Organic Vial",
"item.biomancy.vial.tooltip": "A small organic container with very high alchemical resistance, perfect for holding reactive substances.\nThe vial dissolves on use.",
"item.biomancy.living_flesh": "Living Flesh",
"item.biomancy.living_flesh.tooltip": "It's alive!\nBut it looks too dumb to be the brain of a mob. You should turn it into a construct.",
"item.biomancy.primordial_core": "Primordial Core",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ public static void handleMissingItems(List<Mapping<Item>> mappings) {
switch (path) {
case "mascot_pattern", "mascot_outline_pattern", "mascot_accent_pattern" -> mapping.remap(ModItems.MASCOT_BANNER_PATTERNS.get());

case "glass_vial" -> mapping.remap(ModItems.VIAL.get());

case "creator" -> mapping.remap(ModItems.PRIMORDIAL_CRADLE.get());
case "flesh_block" -> mapping.remap(ModItems.FLESH_BLOCK.get());
case "flesh_block_slab" -> mapping.remap(ModItems.FLESH_SLAB.get());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public final class ModItems {
public static final RegistryObject<SimpleItem> VOLATILE_FLUID = registerSimpleItem("volatile_fluid");

//# Serum
public static final RegistryObject<SimpleItem> GLASS_VIAL = registerSimpleItem("glass_vial");
public static final RegistryObject<SimpleItem> VIAL = registerSimpleItem("vial");
public static final RegistryObject<SimpleItem> ORGANIC_COMPOUND = registerSimpleVialItem("organic_compound");
public static final RegistryObject<UnstableCompoundItem> UNSTABLE_COMPOUND = registerItem("unstable_compound", UnstableCompoundItem::new);
public static final RegistryObject<SimpleItem> GENETIC_COMPOUND = registerSimpleVialItem("genetic_compound");
Expand Down Expand Up @@ -199,11 +199,11 @@ private static <T extends EntityType<? extends Mob>> RegistryObject<ForgeSpawnEg
}

private static <T extends Serum> RegistryObject<SerumItem> registerSerumItem(RegistryObject<T> registryObject) {
return ITEMS.register(registryObject.getId().getPath(), () -> new SerumItem(createProperties().craftRemainder(ModItems.GLASS_VIAL.get()).stacksTo(8).rarity(ModRarities.UNCOMMON), registryObject));
return ITEMS.register(registryObject.getId().getPath(), () -> new SerumItem(createProperties().stacksTo(8).rarity(ModRarities.UNCOMMON), registryObject));
}

private static RegistryObject<SimpleItem> registerSimpleVialItem(String name) {
return ITEMS.register(name, () -> new SimpleItem(createProperties().craftRemainder(GLASS_VIAL.get())));
return ITEMS.register(name, () -> new SimpleItem(createProperties()));
}

private static RegistryObject<SimpleItem> registerSimpleItem(String name) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ private static BasicItemListing sellToPlayer(Item item, int amount, int emeralds

private static void addClericTrades(Int2ObjectMap<List<VillagerTrades.ItemListing>> trades) {
TradeLevel.JOURNEYMAN.addItemListings(trades,
buyFromPlayer(ModItems.GLASS_VIAL.get(), 4, 1, 12, 20)
buyFromPlayer(ModItems.VIAL.get(), 4, 1, 12, 20)
);

TradeLevel.EXPERT.addItemListings(trades,
Expand Down

0 comments on commit c33cf50

Please sign in to comment.