Skip to content

Commit

Permalink
Remove Sanity Meter
Browse files Browse the repository at this point in the history
  • Loading branch information
stal111 committed Oct 29, 2024
1 parent 1da764b commit 7dc43b4
Show file tree
Hide file tree
Showing 16 changed files with 5 additions and 171 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-10-26T11:36:41.86745 Model Definitions
// 1.21.1 2024-10-29T12:32:36.2791036 Model Definitions
34ad95938d26fabd02ada3d848eea405894667d7 assets/forbidden_arcanus/blockstates/arcane_crystal_block.json
5c7ff49b4565c2b9aa7e79629685cfdad6a408aa assets/forbidden_arcanus/blockstates/arcane_crystal_obelisk.json
1a89b2964d08308be3317bac20e12091320695d5 assets/forbidden_arcanus/blockstates/arcane_crystal_ore.json
Expand Down Expand Up @@ -620,7 +620,6 @@ b8de30767e199fb3f89fea2500259f3d381aca91 assets/forbidden_arcanus/models/item/re
9785534629f4ed91a0132eb8a521b08e1156e8b2 assets/forbidden_arcanus/models/item/runic_glass.json
2b47b3ba9d03d9f255cbd882a86961f5237d5f97 assets/forbidden_arcanus/models/item/runic_glass_pane.json
7a0b3ec194169d359a86eba974ea76047419e627 assets/forbidden_arcanus/models/item/runic_stone.json
61cf897499ef2f79a64e34b84d7766c4243812f1 assets/forbidden_arcanus/models/item/sanity_meter.json
4c104f7fa4f5580997a218fdfd34983d05fd8ab8 assets/forbidden_arcanus/models/item/sea_prism.json
aec87092ae2fe7e3dd46fd75e14d02ce5a3ee10f assets/forbidden_arcanus/models/item/silver_dragon_scale.json
eae04d975a1d16f72493bdf412a45e4c830b03bd assets/forbidden_arcanus/models/item/smelter_prism.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21.1 2024-10-29T12:11:58.3753863 Languages: en_us for mod: forbidden_arcanus
d2b8780a492fed60f9762a8333a99a9e8165dc5e assets/forbidden_arcanus/lang/en_us.json
// 1.21.1 2024-10-29T12:32:36.3733138 Languages: en_us for mod: forbidden_arcanus
271838891dff690913c98c57e1d0855e3a538f6c assets/forbidden_arcanus/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-10-29T12:11:58.3036049 Recipes
// 1.21.1 2024-10-29T12:32:36.3386536 Recipes
23e3971ab65829a4a3e4e11d193a181486910d2b data/forbidden_arcanus/advancement/recipes/apply_modifier/smithing/apply_aquatic_modifier.json
a78e1a205e8c9268ed7ea3f8c79c054150443c19 data/forbidden_arcanus/advancement/recipes/apply_modifier/smithing/apply_demolishing_modifier.json
2602ab88dabe4475c62ffcc8748bfa0e50d8af63 data/forbidden_arcanus/advancement/recipes/apply_modifier/smithing/apply_eternal_modifier.json
Expand Down Expand Up @@ -178,7 +178,6 @@ a7980f46da0a220f1ec84f146e0bbb2101fcbd41 data/forbidden_arcanus/advancement/reci
5a56c7c62e04fc4fa3aac348faa550aa1eed951b data/forbidden_arcanus/advancement/recipes/tools/pink_quantum_catcher.json
84fc275524c7a3481d207e8c995197d03265cfe4 data/forbidden_arcanus/advancement/recipes/tools/purple_quantum_catcher.json
e10cbee6e6ba64b88d834e356ddf5bb56f1b1e6a data/forbidden_arcanus/advancement/recipes/tools/red_quantum_catcher.json
c45dfd5a445e13865f92afc3a728c1330a624e73 data/forbidden_arcanus/advancement/recipes/tools/sanity_meter.json
83886582e5b8e8892476d38a4dc48e572fd2742c data/forbidden_arcanus/advancement/recipes/tools/soul_extractor.json
47349ed064cef0f061ff7fa61a7f4f4cef68f1c5 data/forbidden_arcanus/advancement/recipes/tools/stone_blacksmith_gavel.json
d1220c171afc3f6aa3c80f93b6221e06ac022502 data/forbidden_arcanus/advancement/recipes/tools/white_quantum_catcher.json
Expand Down Expand Up @@ -341,7 +340,6 @@ e3b373478b5d95d391dae54bf42eaf48497b954d data/forbidden_arcanus/recipe/red_quant
b3d70aa4699f55241f3c375199e65c2a11957bac data/forbidden_arcanus/recipe/rune_from_rune_block.json
c273736e180a2faf240bdf8736b85c7b92eb49cb data/forbidden_arcanus/recipe/runic_glass.json
1657bcac1e2a4f8c20d129ce6dbd2f7369258c2b data/forbidden_arcanus/recipe/runic_glass_pane.json
caaa87cfb6e080df1553ac02fd65e03ee4e04abb data/forbidden_arcanus/recipe/sanity_meter.json
31f89bbf420ddc1816a6fbba33c00aa85f333b44 data/forbidden_arcanus/recipe/silver_dragon_scale.json
271723dbdbc634663f1b6a7b2e999ace9a896946 data/forbidden_arcanus/recipe/smelting/arcane_crystal_dust_from_smelting.json
035c781c2c9c4fdfd9f519e2ed9d94436d4eea51 data/forbidden_arcanus/recipe/smelting/arcane_crystal_from_smelting.json
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@
"item.forbidden_arcanus.red_quantum_catcher": "Red Quantum Catcher",
"item.forbidden_arcanus.reinforced_deorum_blacksmith_gavel": "Reinforced Deorum Blacksmith Gavel",
"item.forbidden_arcanus.rune": "Rune",
"item.forbidden_arcanus.sanity_meter": "Sanity Meter",
"item.forbidden_arcanus.sea_prism": "Sea Prism",
"item.forbidden_arcanus.silver_dragon_scale": "Silver Dragon Scale",
"item.forbidden_arcanus.smelter_prism": "Smelter Prism",
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.stal111.forbidden_arcanus.client.gui.label.QuantumCatcherFlyingLabel;
import com.stal111.forbidden_arcanus.client.gui.overlay.AurealMeterOverlay;
import com.stal111.forbidden_arcanus.client.gui.overlay.FlyingLabelOverlay;
import com.stal111.forbidden_arcanus.client.gui.overlay.SanityMeterOverlay;
import com.stal111.forbidden_arcanus.client.gui.screen.ClibanoScreen;
import com.stal111.forbidden_arcanus.client.gui.screen.HephaestusForgeScreen;
import com.stal111.forbidden_arcanus.client.gui.screen.research.ResearchScreen;
Expand Down Expand Up @@ -144,7 +143,6 @@ private void registerCosmetics() {

@SubscribeEvent
public void onRegisterGuiOverlays(RegisterGuiLayersEvent event) {
event.registerAbove(VanillaGuiLayers.EXPERIENCE_BAR, ForbiddenArcanus.location("sanity_meter"), new SanityMeterOverlay());
event.registerAbove(VanillaGuiLayers.EXPERIENCE_BAR, ForbiddenArcanus.location("aureal_meter"), new AurealMeterOverlay());
event.registerAbove(VanillaGuiLayers.EXPERIENCE_BAR, ForbiddenArcanus.location("flying_label"), new FlyingLabelOverlay());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.stal111.forbidden_arcanus.ForbiddenArcanus;
import com.stal111.forbidden_arcanus.common.block.entity.forge.essence.EssenceType;
import com.stal111.forbidden_arcanus.common.essence.EssenceHelper;
import com.stal111.forbidden_arcanus.core.init.ModItems;
import net.minecraft.client.DeltaTracker;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
Expand All @@ -13,8 +12,6 @@
import net.minecraft.world.entity.player.Player;
import org.jetbrains.annotations.NotNull;

import java.util.Collections;

public class AurealMeterOverlay implements LayeredDraw.Layer {

private static final ResourceLocation TEXTURE = ForbiddenArcanus.location("textures/gui/hud.png");
Expand All @@ -33,7 +30,7 @@ public void render(@NotNull GuiGraphics guiGraphics, @NotNull DeltaTracker delta
Window window = Minecraft.getInstance().getWindow();
Player player = Minecraft.getInstance().player;

if (player == null || !player.getInventory().hasAnyOf(Collections.singleton(ModItems.SANITY_METER.get()))) {
if (player == null) {
return;
}

Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ public class ModItems implements RegistryClass {
public static final ItemRegistryEntry<Item> DIVINE_PACT = HELPER.register("divine_pact", () -> new Item(new Item.Properties().component(ModDataComponents.ENHANCER.value(), ModEnhancerDefinitions.DIVINE_PACT)));
public static final ItemRegistryEntry<Item> MALEDICTUS_PACT = HELPER.register("maledictus_pact", () -> new Item(new Item.Properties().component(ModDataComponents.ENHANCER.value(), ModEnhancerDefinitions.MALEDICTUS_PACT)));

public static final ItemRegistryEntry<Item> SANITY_METER = HELPER.register("sanity_meter", () -> new SanityMeterItem(new Item.Properties().stacksTo(1)));
public static final ItemRegistryEntry<Item> AUREAL_TANK = HELPER.register("aureal_tank", () -> new AurealTankItem(new Item.Properties().stacksTo(1).component(ModDataComponents.ESSENCE_STORAGE, AurealTankItem.DEFAULT_DATA)));

public static final ItemRegistryEntry<BlockItem> UTREM_JAR = HELPER.register("utrem_jar", () -> new BlockItem(ModBlocks.UTREM_JAR.get(), new Item.Properties()));
Expand Down Expand Up @@ -148,7 +147,6 @@ public class ModItems implements RegistryClass {

public static class Stacks {

public static final ItemStack SANITY_METER = new ItemStack(ModItems.SANITY_METER.get());
public static final ItemStack ARCANE_CRYSTAL_DUST_SPECK = new ItemStack(ModItems.ARCANE_CRYSTAL_DUST_SPECK.get());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ public class ModCreativeModeTabs implements RegistryClass {
output.accept(ModItems.QUANTUM_CATCHER.get());
ModItems.DYED_QUANTUM_CATCHERS.forEach((color, registryEntry) -> output.accept(registryEntry.get()));
output.accept(ModItems.BOSS_CATCHER.get());
output.accept(ModItems.SANITY_METER.get());

output.accept(EssenceHelper.createStorageItem(ModItems.AUREAL_TANK.get(), EssenceType.AUREAL, 0, AurealTankItem.DEFAULT_CAPACITY));
output.accept(EssenceHelper.createStorageItem(ModItems.AUREAL_TANK.get(), EssenceType.AUREAL, AurealTankItem.DEFAULT_CAPACITY, AurealTankItem.DEFAULT_CAPACITY));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ protected void addTranslations() {
this.addItem(ModItems.EDELWOOD_STICK, "Edelwood Stick");
this.addItem(ModItems.WAX, "Wax");
this.addItem(ModItems.SPAWNER_SCRAP, "Spawner Scrap");
this.addItem(ModItems.SANITY_METER, "Sanity Meter");
this.addItem(ModItems.AUREAL_TANK, "Aureal Tank");
this.addItem(ModItems.EDELWOOD_BUCKET, "Edelwood Bucket");
this.addItem(ModItems.EDELWOOD_WATER_BUCKET, "Edelwood Water Bucket");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public ModItemModels(ItemModelGenerators defaultGenerators) {

@Override
public void generate() {
this.generateFlatItem(ModItems.SANITY_METER);
this.generateFlatItem(ModItems.EDELWOOD_BUCKET);
this.generateFlatItem(ModItems.EDELWOOD_WATER_BUCKET);
this.generateFlatItem(ModItems.EDELWOOD_LAVA_BUCKET);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ protected void registerRecipes(HolderLookup.Provider lookupProvider) {
FABlockFamilies.getAllFamilies().filter(BlockFamily::shouldGenerateRecipe).forEach(family -> RecipeProvider.generateRecipes(this.provider.getRecipeOutput(), family, FeatureFlagSet.of(FeatureFlags.VANILLA)));

//Shaped Recipes
this.shaped(RecipeCategory.TOOLS, ModItems.SANITY_METER, builder -> builder.pattern("AXA").pattern("X#X").pattern("AXA").define('X', Tags.Items.INGOTS_GOLD).define('#', Tags.Items.ENDER_PEARLS).define('A', ModItems.ARCANE_CRYSTAL_DUST).unlockedBy(this, RecipePart.of(Tags.Items.INGOTS_GOLD)));
this.shaped(RecipeCategory.DECORATIONS, ModBlocks.UTREM_JAR.get(), builder -> builder.pattern("#X#").pattern("# #").pattern("###").define('#', Tags.Items.GLASS_BLOCKS_COLORLESS).define('X', ModBlocks.EDELWOOD_PLANKS.get()).unlockedBy(this, RecipePart.of(Tags.Items.GLASS_BLOCKS_COLORLESS)));
this.shaped(RecipeCategory.MISC, ModItems.ARCANE_CRYSTAL_DUST, builder -> builder.pattern("###").pattern("###").pattern("###").define('#', ModItems.ARCANE_CRYSTAL_DUST_SPECK).unlockedBy(this, ModItems.ARCANE_CRYSTAL_DUST_SPECK));
this.shaped(RecipeCategory.TOOLS, ModItems.SOUL_EXTRACTOR, builder -> builder.pattern("U ").pattern("##X").pattern("Q ").define('U', ModBlocks.UTREM_JAR.get()).define('#', Blocks.NETHER_BRICKS).define('X', Blocks.QUARTZ_BLOCK).define('Q', Items.QUARTZ).unlockedBy(this, ModBlocks.UTREM_JAR.get()));
Expand Down

0 comments on commit 7dc43b4

Please sign in to comment.