Skip to content

Commit

Permalink
EMI Compat
Browse files Browse the repository at this point in the history
  • Loading branch information
Starexify committed Jan 9, 2025
1 parent 35139b5 commit 5eaa2b1
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 80 deletions.
3 changes: 0 additions & 3 deletions src/generated/resources/assets/nmt/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
"container.ender_brewing": "Ender Brewing Stand",
"effect.nmt.burn": "Burn",
"emi.category.nmt.ender_brewing": "Ender Brewing",
"item.nmt.blazing_wither_soul": "Blazing Wither Soul",
"item.nmt.ender_wart": "Ender Wart",
"item.nmt.heart_of_the_hell": "Heart of the Hell",
"item.nmt.lingering_obsidian_potion.effect.awfully": "Lingering Awfully Potion",
"item.nmt.lingering_obsidian_potion.effect.cecity": "Lingering Potion of Cecity",
"item.nmt.lingering_obsidian_potion.effect.dimness": "Lingering Potion of Dimness",
Expand Down Expand Up @@ -63,7 +61,6 @@
"item.nmt.splash_obsidian_potion.effect.titan": "Splash Potion of the Titan",
"item.nmt.splash_obsidian_potion.effect.unluck": "Splash Potion of Unluck",
"item.nmt.splash_obsidian_potion.effect.withering": "Splash Potion of Withering",
"item.nmt.tear_of_the_nether": "Tear of the Nether",
"nmt.creativetab.main": "No More Things",
"nmt.creativetab.potions": "No More Things Potions"
}

This file was deleted.

This file was deleted.

This file was deleted.

22 changes: 0 additions & 22 deletions src/generated/resources/data/nmt/recipe/heart_of_the_hell.json

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/java/net/nova/nmt/data/LangProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ protected void addTranslations() {
addObsidianPotion(NMTItems.OBSIDIAN_TIPPED_ARROW, NMTPotions.UNLUCK, "Arrow of Unluck");
addObsidianPotion(NMTItems.OBSIDIAN_TIPPED_ARROW, NMTPotions.WITHERING, "Arrow of Withering");

addItem(NMTItems.TEAR_OF_THE_NETHER, "Tear of the Nether");
/*addItem(NMTItems.TEAR_OF_THE_NETHER, "Tear of the Nether");
addItem(NMTItems.BLAZING_WITHER_SOUL, "Blazing Wither Soul");
addItem(NMTItems.HEART_OF_THE_HELL, "Heart of the Hell");
addItem(NMTItems.HEART_OF_THE_HELL, "Heart of the Hell");*/

// Creative Tab
add(CreativeTab.MAIN_TAB_TITLE, "No More Things");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/nova/nmt/data/NMTItemModelProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ protected void registerModels() {
potionItem(NMTItems.SPLASH_OBSIDIAN_POTION.get());
potionItem(NMTItems.LINGERING_OBSIDIAN_POTION.get());
tippedArrowItem(NMTItems.OBSIDIAN_TIPPED_ARROW.get());
basicItem(NMTItems.TEAR_OF_THE_NETHER.get());
basicItem(NMTItems.BLAZING_WITHER_SOUL.get());
/*basicItem(NMTItems.TEAR_OF_THE_NETHER.get());
basicItem(NMTItems.BLAZING_WITHER_SOUL.get());*/
}

// Models
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/nova/nmt/data/recipe/CraftingRecipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ public void build() {
SpecialRecipeBuilder.special(ObsidianTippedArrowRecipe::new).save(recipeOutput, NoMoreThings.rl("obsidian_tipped_arrow"));

// Heart of the Hell
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, NMTItems.HEART_OF_THE_HELL)
/* ShapedRecipeBuilder.shaped(RecipeCategory.MISC, NMTItems.HEART_OF_THE_HELL)
.group(getItemName(NMTBlocks.OBSIDIAN_GLASS))
.define('#', NMTItems.TEAR_OF_THE_NETHER)
.define('H', Items.HEART_OF_THE_SEA)
.pattern("###")
.pattern("#H#")
.pattern("###")
.unlockedBy("has_" + getItemName(NMTItems.TEAR_OF_THE_NETHER), has(NMTItems.TEAR_OF_THE_NETHER))
.save(recipeOutput);
.save(recipeOutput);*/
}
}
6 changes: 3 additions & 3 deletions src/main/java/net/nova/nmt/init/CreativeTab.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class CreativeTab {
public static String POTIONS_TAB_TITLE = MODID + ".creativetab.potions";

public static final Holder<CreativeModeTab> MAIN_TAB = CREATIVE_TAB.register("no_more_things_tab", () -> CreativeModeTab.builder()
.icon(() -> new ItemStack(NMTItems.TEAR_OF_THE_NETHER.get())).title(Component.translatable(MAIN_TAB_TITLE))
.icon(() -> new ItemStack(NMTBlocks.OBSIDIAN_GLASS)).title(Component.translatable(MAIN_TAB_TITLE))
.withTabsAfter(CreativeTab.POTIONS_TAB.getKey())
.displayItems((itemDisplayParameters, output) -> {
// Blocks
Expand All @@ -34,9 +34,9 @@ public class CreativeTab {
output.accept(NMTItems.ENDER_WART);

// Tear of the Nether
output.accept(NMTItems.TEAR_OF_THE_NETHER);
/*output.accept(NMTItems.TEAR_OF_THE_NETHER);
output.accept(NMTItems.BLAZING_WITHER_SOUL);
output.accept(NMTItems.HEART_OF_THE_HELL);
output.accept(NMTItems.HEART_OF_THE_HELL);*/
}).build()
);

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/nova/nmt/init/NMTItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class NMTItems {
public static final DeferredItem<Item> OBSIDIAN_TIPPED_ARROW = ITEMS.register("obsidian_tipped_arrow", () -> new TippedArrowItem(new Item.Properties().component(DataComponents.POTION_CONTENTS, new PotionContents(NMTPotions.LAVA))));

// Tear of the Nether
public static final DeferredItem<Item> TEAR_OF_THE_NETHER = ITEMS.register("tear_of_the_nether", () -> new Item(new Item.Properties()));
/* public static final DeferredItem<Item> TEAR_OF_THE_NETHER = ITEMS.register("tear_of_the_nether", () -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BLAZING_WITHER_SOUL = ITEMS.register("blazing_wither_soul", () -> new Item(new Item.Properties()));
public static final DeferredItem<Item> HEART_OF_THE_HELL = ITEMS.register("heart_of_the_hell", () -> new Item(new Item.Properties()));
public static final DeferredItem<Item> HEART_OF_THE_HELL = ITEMS.register("heart_of_the_hell", () -> new Item(new Item.Properties()));*/
}

0 comments on commit 5eaa2b1

Please sign in to comment.