DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Make mod actually run

Browse Source
This commit is contained in:
DBotThePony 2024-01-02 11:31:41 +07:00
parent fa67353eae
commit 2220a7039f
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/ru/dbotthepony/mc/otm/mixin/ItemMixin.java
View File

@ -17,10 +17,14 @@ public abstract class ItemMixin {
cancellable = true cancellable = true
) )
public void getItemCategory$hook(CallbackInfoReturnable<CreativeModeTab> info) { public void getItemCategory$hook(CallbackInfoReturnable<CreativeModeTab> info) {
try {
if (MCreativeTabsKt.getMainTabContents().contains((Item) ((Object) this))) { if (MCreativeTabsKt.getMainTabContents().contains((Item) ((Object) this))) {
info.setReturnValue(OverdriveThatMatters.INSTANCE.CREATIVE_TAB); info.setReturnValue(OverdriveThatMatters.INSTANCE.CREATIVE_TAB);
} else if (MCreativeTabsKt.getDecorativeTabContents().contains((Item) ((Object) this))) { } else if (MCreativeTabsKt.getDecorativeTabContents().contains((Item) ((Object) this))) {
info.setReturnValue(OverdriveThatMatters.INSTANCE.CREATIVE_TAB_DECORATIVE); info.setReturnValue(OverdriveThatMatters.INSTANCE.CREATIVE_TAB_DECORATIVE);
} }
} catch(Throwable err) {
info.setReturnValue(CreativeModeTab.TAB_MISC); // fuck you shapedrecipebuilder
}
} }
} }

5
src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt
View File

@ -285,5 +285,6 @@ private fun addDecorativeTabItems(consumer: CreativeTabOutput) {
} }
} }
val MainTabContents = CreativeTabOutput().also { addMainCreativeTabItems(it) } // lazy is to prevent "exception in initializer" and allow to re-initialize in future
val DecorativeTabContents = CreativeTabOutput().also { addDecorativeTabItems(it) } val MainTabContents by lazy { CreativeTabOutput().also { addMainCreativeTabItems(it) } }
val DecorativeTabContents by lazy { CreativeTabOutput().also { addDecorativeTabItems(it) } }