Skip to content

Commit 47d68cc

Browse files
committed
* Added a workaround for SamsTheNerd/inline#34
* Fixed Media Cube implementation killing server * Adjusted neoforge.mods.toml
1 parent 871d6ff commit 47d68cc

File tree

5 files changed

+19
-5
lines changed

5 files changed

+19
-5
lines changed

Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemCreativeUnlocker.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import at.petrak.hexcasting.common.lib.HexDataComponents;
99
import at.petrak.hexcasting.common.lib.HexItems;
1010
import at.petrak.hexcasting.common.lib.HexSounds;
11-
import com.mojang.authlib.minecraft.client.MinecraftClient;
1211
import net.minecraft.ChatFormatting;
12+
import net.minecraft.Util;
1313
import net.minecraft.advancements.AdvancementNode;
1414
import net.minecraft.client.Minecraft;
1515
import net.minecraft.core.component.DataComponentType;
@@ -84,6 +84,7 @@ public static boolean isDebug(ItemStack stack, String flag) {
8484
}
8585

8686
public static Component infiniteMedia(Level level) {
87+
8788
String prefix = "item.hexcasting.creative_unlocker.";
8889

8990
String emphasis = Language.getInstance().getOrDefault(prefix + "for_emphasis");
@@ -235,7 +236,8 @@ public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity cons
235236

236237
private static MutableComponent rainbow(MutableComponent component, int shift, Level level) {
237238
if (level == null) {
238-
return component.withStyle(ChatFormatting.WHITE);
239+
return component.withStyle((s) -> s.withColor(
240+
TextColor.fromRgb(Mth.hsvToRgb((((float) Util.getMillis() / 50) + shift) * 2 % 360 / 360F, 1F, 1F))));
239241
}
240242

241243
return component.withStyle((s) -> s.withColor(
@@ -245,7 +247,7 @@ private static MutableComponent rainbow(MutableComponent component, int shift, L
245247
@Override
246248
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents,
247249
TooltipFlag isAdvanced) {
248-
Component emphasized = infiniteMedia(Minecraft.getInstance().level);
250+
Component emphasized = infiniteMedia(null);
249251

250252
MutableComponent modName = Component.translatable("item.hexcasting.creative_unlocker.mod_name").withStyle(
251253
(s) -> s.withColor(ItemMediaHolder.HEX_COLOR));

Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ import at.petrak.hexcasting.fabric.storage.FabricImpetusStorage
4949
import at.petrak.hexcasting.fabric.xplat.FabricXplatImpl
5050
import at.petrak.hexcasting.interop.HexInterop
5151
import at.petrak.hexcasting.xplat.IXplatAbstractions
52+
import com.samsthenerd.inline.utils.EntityCradle
53+
import com.samsthenerd.inline.utils.cradles.EntTypeCradle
5254
import net.fabricmc.api.ModInitializer
5355
import net.fabricmc.fabric.api.command.v2.ArgumentTypeRegistry
5456
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback
@@ -86,6 +88,8 @@ object FabricHexInitializer : ModInitializer {
8688

8789
override fun onInitialize() {
8890
this.CONFIG = FabricHexConfig.setup()
91+
// workaround for Inline EntTypeCradles not being available on server, related to https://github.com/SamsTheNerd/inline/issues/34
92+
EntTypeCradle.fromTypeId(ResourceLocation.fromNamespaceAndPath("minecraft", "pig")).get().getType();
8993
FabricPacketHandler.initPackets()
9094
FabricPacketHandler.init()
9195

Neoforge/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ dependencies {
9090
modImplementation "at.petra-k:paucal:$paucalVersion+$minecraftVersion-neoforge"
9191
modImplementation "vazkii.patchouli:Patchouli:1.21-$patchouliVersion-NEOFORGE-SNAPSHOT"
9292
modImplementation "com.illusivesoulworks.caelus:caelus-neoforge:$caelusVersion"
93-
modImplementation "com.samsthenerd.inline:inline-common:1.21.1-1.2.2-74"
93+
modImplementation "com.samsthenerd.inline:inline-neoforge:1.21.1-1.2.2-74"
9494
// needed for inline to run
9595
modRuntimeOnly("me.shedaniel.cloth:cloth-config-forge:$clothConfigVersion")
9696
modRuntimeOnly "com.samsthenerd.inline:inline-neoforge:$minecraftVersion-$inlineVersion"

Neoforge/src/main/java/at/petrak/hexcasting/forge/ForgeHexInitializer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import at.petrak.hexcasting.forge.network.MsgBrainsweepAck;
3131
import at.petrak.hexcasting.interop.HexInterop;
3232
import at.petrak.hexcasting.xplat.IXplatAbstractions;
33+
import com.samsthenerd.inline.utils.cradles.EntTypeCradle;
3334
import net.minecraft.core.Registry;
3435
import net.minecraft.core.registries.BuiltInRegistries;
3536
import net.minecraft.core.registries.Registries;
@@ -76,6 +77,8 @@
7677
public class ForgeHexInitializer {
7778
public ForgeHexInitializer(ModContainer modContainer) {
7879
initConfig(modContainer);
80+
// workaround for Inline EntTypeCradles not being available on server, related to https://github.com/SamsTheNerd/inline/issues/34
81+
EntTypeCradle.fromTypeId(ResourceLocation.fromNamespaceAndPath("minecraft", "pig")).get().getType();
7982
initRegistries();
8083
initRegistry();
8184
initListeners();

Neoforge/src/main/resources/META-INF/neoforge.mods.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,9 @@ modId = "inline"
5959
mandatory = true
6060
versionRange = "[1.21.1-1.2.2,)"
6161
ordering = "NONE"
62-
side = "BOTH"
62+
side = "BOTH"
63+
64+
[[dependencies.hexcasting]]
65+
modId = "accessories"
66+
mandatory = false
67+
versionRange = "[1.1.0-beta.16+1.21.1,)"

0 commit comments

Comments
 (0)