Skip to content

Commit 9259389

Browse files
committed
chore: update client extension init to no longer use deprecated methods
1 parent cdcc79c commit 9259389

File tree

4 files changed

+38
-59
lines changed

4 files changed

+38
-59
lines changed

src/main/java/com/klikli_dev/occultism/Occultism.java

+1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ public Occultism(IEventBus modEventBus, ModContainer modContainer) {
125125

126126
if (FMLEnvironment.dist == Dist.CLIENT) {
127127
modEventBus.addListener(ClientSetupEventHandler::onRegisterMenuScreens);
128+
modEventBus.addListener(ClientSetupEventHandler::onRegisterClientExtensions);
128129
ClientSetupEventHandler.registerConfigScreen(modContainer);
129130
}
130131

src/main/java/com/klikli_dev/occultism/common/effect/DoubleJumpEffect.java

-32
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,6 @@ public class DoubleJumpEffect extends MobEffect {
4141
public static final ResourceLocation ICON = ResourceLocation.fromNamespaceAndPath(Occultism.MODID,
4242
"textures/mob_effect/double_jump.png");
4343

44-
public static final IClientMobEffectExtensions EFFECT_RENDERER = new IClientMobEffectExtensions() {
45-
46-
@Override
47-
public boolean renderInventoryIcon(MobEffectInstance instance, EffectRenderingInventoryScreen<?> screen, GuiGraphics guiGraphics, int x, int y, int blitOffset) {
48-
guiGraphics.blit(ICON, x + 6, y + 7, 18, 18, 0, 0, 255, 255, 256, 256);
49-
return false;
50-
}
51-
52-
53-
@Override
54-
public boolean renderGuiIcon(MobEffectInstance instance, Gui gui, GuiGraphics guiGraphics, int x, int y, float z, float alpha) {
55-
guiGraphics.blit(ICON, x + 3, y + 3, 18, 18, 0, 0, 255, 255, 256, 256);
56-
return false;
57-
}
58-
};
59-
6044
public DoubleJumpEffect() {
6145
super(MobEffectCategory.BENEFICIAL, 0xffff00);
6246
}
@@ -76,24 +60,8 @@ public static int getMaxJumps(Player player) {
7660
return 0;
7761
}
7862

79-
@Override
80-
public boolean applyEffectTick(LivingEntity entityLivingBaseIn, int amplifier) {
81-
return true;
82-
}
83-
84-
8563
@Override
8664
public boolean shouldApplyEffectTickThisTick(int duration, int amplifier) {
8765
return true;
8866
}
89-
90-
@Override
91-
public boolean isInstantenous() {
92-
return false;
93-
}
94-
95-
@Override
96-
public void initializeClient(Consumer<IClientMobEffectExtensions> consumer) {
97-
consumer.accept(EFFECT_RENDERER);
98-
}
9967
}

src/main/java/com/klikli_dev/occultism/common/effect/ThirdEyeEffect.java

+2-26
Original file line numberDiff line numberDiff line change
@@ -31,45 +31,21 @@
3131
import net.minecraft.world.effect.MobEffectInstance;
3232
import net.minecraft.world.entity.LivingEntity;
3333
import net.neoforged.neoforge.client.extensions.common.IClientMobEffectExtensions;
34+
import org.jetbrains.annotations.NotNull;
35+
3436
import java.util.function.Consumer;
3537

3638
public class ThirdEyeEffect extends MobEffect {
3739

3840
public static final ResourceLocation ICON = ResourceLocation.fromNamespaceAndPath(Occultism.MODID,
3941
"textures/mob_effect/third_eye.png");
4042

41-
public static final IClientMobEffectExtensions EFFECT_RENDERER = new IClientMobEffectExtensions() {
42-
43-
@Override
44-
public boolean renderGuiIcon(MobEffectInstance instance, Gui gui, GuiGraphics guiGraphics, int x, int y, float z, float alpha) {
45-
guiGraphics.blit(ICON, x + 3, y + 3, 18, 18, 0, 0, 255, 255, 256, 256);
46-
return true;
47-
}
48-
49-
};
50-
5143
public ThirdEyeEffect() {
5244
super(MobEffectCategory.BENEFICIAL, 0xffff00);
5345
}
5446

55-
@Override
56-
public boolean applyEffectTick(LivingEntity entityLivingBaseIn, int amplifier) {
57-
return true;
58-
}
59-
6047
@Override
6148
public boolean shouldApplyEffectTickThisTick(int duration, int amplifier) {
6249
return true;
6350
}
64-
65-
@Override
66-
public boolean isInstantenous() {
67-
return false;
68-
}
69-
70-
71-
@Override
72-
public void initializeClient(Consumer<IClientMobEffectExtensions> consumer) {
73-
consumer.accept(EFFECT_RENDERER);
74-
}
7551
}

src/main/java/com/klikli_dev/occultism/handlers/ClientSetupEventHandler.java

+35-1
Original file line numberDiff line numberDiff line change
@@ -37,31 +37,40 @@
3737
import com.klikli_dev.occultism.client.render.entity.*;
3838
import com.klikli_dev.occultism.common.capability.FamiliarSettingsData;
3939
import com.klikli_dev.occultism.common.container.spirit.SpiritContainer;
40+
import com.klikli_dev.occultism.common.effect.DoubleJumpEffect;
41+
import com.klikli_dev.occultism.common.effect.ThirdEyeEffect;
4042
import com.klikli_dev.occultism.common.entity.spirit.demonicpartner.husband.DemonicHusbandRenderer;
4143
import com.klikli_dev.occultism.common.entity.spirit.demonicpartner.wife.DemonicWifeRenderer;
4244
import com.klikli_dev.occultism.integration.modonomicon.PageRenderers;
4345
import com.klikli_dev.occultism.registry.*;
4446
import com.mojang.blaze3d.platform.InputConstants;
4547
import com.mojang.blaze3d.systems.RenderSystem;
4648
import net.minecraft.client.KeyMapping;
49+
import net.minecraft.client.gui.Gui;
50+
import net.minecraft.client.gui.GuiGraphics;
51+
import net.minecraft.client.gui.screens.inventory.EffectRenderingInventoryScreen;
4752
import net.minecraft.client.renderer.GameRenderer;
4853
import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
4954
import net.minecraft.client.renderer.entity.*;
5055
import net.minecraft.client.renderer.item.ItemProperties;
5156
import net.minecraft.core.registries.BuiltInRegistries;
5257
import net.minecraft.resources.ResourceLocation;
58+
import net.minecraft.world.effect.MobEffectInstance;
5359
import net.minecraft.world.entity.EntityType;
5460
import net.neoforged.api.distmarker.Dist;
5561
import net.neoforged.bus.api.SubscribeEvent;
5662
import net.neoforged.fml.ModContainer;
5763
import net.neoforged.fml.common.EventBusSubscriber;
5864
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
5965
import net.neoforged.neoforge.client.event.*;
66+
import net.neoforged.neoforge.client.extensions.common.IClientMobEffectExtensions;
67+
import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent;
6068
import net.neoforged.neoforge.client.gui.ConfigurationScreen;
6169
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
6270
import net.neoforged.neoforge.client.gui.VanillaGuiLayers;
6371
import net.neoforged.neoforge.client.settings.KeyConflictContext;
6472
import net.neoforged.neoforge.common.NeoForge;
73+
import org.jetbrains.annotations.NotNull;
6574
import org.lwjgl.glfw.GLFW;
6675

6776
import java.util.HashMap;
@@ -80,7 +89,7 @@ public class ClientSetupEventHandler {
8089

8190
public static Map<EntityType<?>, KeyMapping> keysFamiliars;
8291

83-
public static void registerConfigScreen(ModContainer modContainer){
92+
public static void registerConfigScreen(ModContainer modContainer) {
8493
modContainer.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new);
8594
}
8695

@@ -200,6 +209,31 @@ public static void onRegisterMenuScreens(RegisterMenuScreensEvent event) {
200209
event.register(OccultismContainers.SATCHEL.get(), SatchelScreen::new);
201210
}
202211

212+
public static void onRegisterClientExtensions(RegisterClientExtensionsEvent event) {
213+
event.registerMobEffect(new IClientMobEffectExtensions() {
214+
@Override
215+
public boolean renderGuiIcon(@NotNull MobEffectInstance instance, @NotNull Gui gui, @NotNull GuiGraphics guiGraphics, int x, int y, float z, float alpha) {
216+
guiGraphics.blit(ThirdEyeEffect.ICON, x + 3, y + 3, 18, 18, 0, 0, 255, 255, 256, 256);
217+
return true;
218+
}
219+
220+
}, OccultismEffects.THIRD_EYE.get());
221+
222+
event.registerMobEffect( new IClientMobEffectExtensions() {
223+
@Override
224+
public boolean renderInventoryIcon(@NotNull MobEffectInstance instance, @NotNull EffectRenderingInventoryScreen<?> screen, @NotNull GuiGraphics guiGraphics, int x, int y, int blitOffset) {
225+
guiGraphics.blit(DoubleJumpEffect.ICON, x + 6, y + 7, 18, 18, 0, 0, 255, 255, 256, 256);
226+
return false;
227+
}
228+
229+
@Override
230+
public boolean renderGuiIcon(@NotNull MobEffectInstance instance, @NotNull Gui gui, @NotNull GuiGraphics guiGraphics, int x, int y, float z, float alpha) {
231+
guiGraphics.blit(DoubleJumpEffect.ICON, x + 3, y + 3, 18, 18, 0, 0, 255, 255, 256, 256);
232+
return false;
233+
}
234+
}, OccultismEffects.DOUBLE_JUMP.get());
235+
}
236+
203237
public static void registerItemModelProperties(FMLClientSetupEvent event) {
204238

205239
//Not safe to call during parallel load, so register to run threadsafe

0 commit comments

Comments
 (0)