Skip to content

Commit

Permalink
Re-enable Patchouli support
Browse files Browse the repository at this point in the history
  • Loading branch information
Mrbysco committed Dec 29, 2024
1 parent 75ddc09 commit 5f2f97b
Show file tree
Hide file tree
Showing 39 changed files with 15 additions and 814 deletions.
2 changes: 1 addition & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {
// Remove the next line if you don't want to depend on the API
modApi "dev.architectury:architectury:${rootProject.architectury_version}"

// modImplementation("vazkii.patchouli:Patchouli-xplat:${patchouli_version}")
modImplementation("vazkii.patchouli:Patchouli-xplat:${patchouli_version}")
}

publishing {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package net.chococraft.common.items;

import net.chococraft.Chococraft;
import net.chococraft.ChococraftExpectPlatform;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.InteractionResultHolder;
Expand All @@ -17,11 +20,11 @@ public ChocopediaItem(Properties properties) {
@Override
public InteractionResultHolder<ItemStack> use(Level level, Player playerIn, InteractionHand handIn) {
if (level.isClientSide) {
// if (ChococraftExpectPlatform.isModLoaded("patchouli")) {
// vazkii.patchouli.api.PatchouliAPI.get().openBookGUI(ResourceLocation.fromNamespaceAndPath(Chococraft.MOD_ID, "chocopedia"));
// } else {
if (ChococraftExpectPlatform.isModLoaded("patchouli")) {
vazkii.patchouli.api.PatchouliAPI.get().openBookGUI(ResourceLocation.fromNamespaceAndPath(Chococraft.MOD_ID, "chocopedia"));
} else {
net.chococraft.client.gui.ChocoboBookScreen.openScreen();
// }
}
}
return new InteractionResultHolder<>(InteractionResult.SUCCESS, playerIn.getItemInHand(handIn));
}
Expand Down
19 changes: 0 additions & 19 deletions common/src/main/resources/chococraft/blockstates/gysahl_green.json

This file was deleted.

7 changes: 0 additions & 7 deletions common/src/main/resources/chococraft/blockstates/straw.json

This file was deleted.

179 changes: 0 additions & 179 deletions common/src/main/resources/chococraft/lang/en_us.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions common/src/main/resources/chococraft/models/block/straw.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 5f2f97b

Please sign in to comment.