mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 13:09:59 +00:00
Initial port to 1.18
Co-authored-by: David Quintana <[email protected]> Co-authored-by: SizableShrimp <[email protected]>
This commit is contained in:
1 parent
be0a6819ac
commit
40a174310d
538 files changed
+3322
-9030
No files matched your search
@@ -37,7 +37,7 @@ import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.fml.loading.FMLLoader;
|
||||
import net.minecraftforge.fmllegacy.RegistryObject;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.fml.loading.FMLEnvironment;
|
||||
import net.minecraftforge.fmllegacy.RegistryObject;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
|
||||
@@ -110,7 +110,7 @@ public class CustomTooltipTest
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderImage(Font font, int x, int y, PoseStack poseStack, ItemRenderer itemRenderer_, int zIndex, TextureManager textureManager)
|
||||
public void renderImage(Font font, int x, int y, PoseStack poseStack, ItemRenderer itemRenderer_, int zIndex)
|
||||
{
|
||||
GuiComponent.fill(poseStack, x, y, x + 10, y+ 10, tooltip.color);
|
||||
}
|
||||
@@ -174,11 +174,11 @@ public class CustomTooltipTest
|
||||
@SubscribeEvent
|
||||
public static void gatherTooltips(RenderTooltipEvent.GatherComponents event)
|
||||
{
|
||||
if (event.getStack().getItem() == Items.STICK)
|
||||
if (event.getItemStack().getItem() == Items.STICK)
|
||||
{
|
||||
event.getTooltipElements().add(Either.right(new CustomTooltip(0xFF0000FF)));
|
||||
}
|
||||
if (event.getStack().getItem() == Items.CLOCK)
|
||||
if (event.getItemStack().getItem() == Items.CLOCK)
|
||||
{
|
||||
event.setMaxWidth(30);
|
||||
}
|
||||
@@ -187,7 +187,7 @@ public class CustomTooltipTest
|
||||
@SubscribeEvent
|
||||
public static void preTooltip(RenderTooltipEvent.Color event)
|
||||
{
|
||||
if (event.getStack().getItem() == Items.APPLE)
|
||||
if (event.getItemStack().getItem() == Items.APPLE)
|
||||
{
|
||||
event.setBackgroundStart(0xFF0000FF);
|
||||
event.setBackgroundEnd(0xFFFFFF00);
|
||||
@@ -335,13 +335,13 @@ public class CustomTooltipTest
|
||||
@SuppressWarnings("removal")
|
||||
private void test13(Button button, PoseStack poseStack, int mouseX, int mouseY)
|
||||
{
|
||||
renderToolTip(poseStack, List.of(new TextComponent("test").getVisualOrderText()), mouseX, mouseY, this.testFont);
|
||||
renderTooltip(poseStack, List.of(new TextComponent("test").getVisualOrderText()), mouseX, mouseY, this.testFont);
|
||||
}
|
||||
|
||||
@SuppressWarnings("removal")
|
||||
private void test14(Button button, PoseStack poseStack, int mouseX, int mouseY)
|
||||
{
|
||||
renderComponentToolTip(poseStack, List.of(new TextComponent("test")), mouseX, mouseY, this.testFont);
|
||||
renderComponentTooltip(poseStack, List.of(new TextComponent("test")), mouseX, mouseY, this.testFont, ItemStack.EMPTY);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.TextComponent;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.client.event.GuiScreenEvent;
|
||||
import net.minecraftforge.client.event.ScreenEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
|
||||
@@ -43,14 +43,14 @@ public class GuiLayeringTest
|
||||
public static class ClientEvents
|
||||
{
|
||||
@SubscribeEvent
|
||||
public static void guiOpen(GuiScreenEvent.InitGuiEvent event)
|
||||
public static void guiOpen(ScreenEvent.InitScreenEvent event)
|
||||
{
|
||||
if (event.getGui() instanceof AbstractContainerScreen)
|
||||
if (event.getScreen() instanceof AbstractContainerScreen)
|
||||
{
|
||||
event.addWidget(new Button(2, 2, 150, 20, new TextComponent("Test Gui Layering"), btn -> {
|
||||
event.addListener(new Button(2, 2, 150, 20, new TextComponent("Test Gui Layering"), btn -> {
|
||||
Minecraft.getInstance().pushGuiLayer(new TestLayer(new TextComponent("LayerScreen")));
|
||||
}));
|
||||
event.addWidget(new Button(2, 25, 150, 20, new TextComponent("Test Gui Normal"), btn -> {
|
||||
event.addListener(new Button(2, 25, 150, 20, new TextComponent("Test Gui Normal"), btn -> {
|
||||
Minecraft.getInstance().setScreen(new TestLayer(new TextComponent("LayerScreen")));
|
||||
}));
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ import net.minecraft.world.phys.shapes.VoxelShape;
|
||||
import net.minecraft.world.phys.shapes.Shapes;
|
||||
import net.minecraft.world.level.BlockGetter;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.fmllegacy.RegistryObject;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
|
||||
@@ -22,7 +22,7 @@ package net.minecraftforge.debug.client.model;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.CreativeModeTab;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.fmllegacy.RegistryObject;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
|
||||
@@ -57,7 +57,7 @@ import net.minecraftforge.client.model.geometry.ISimpleModelGeometry;
|
||||
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.fmllegacy.RegistryObject;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
|
||||
@@ -50,7 +50,7 @@ import net.minecraftforge.client.model.pipeline.TRSRTransformer;
|
||||
import net.minecraftforge.common.model.TransformationHelper;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.fml.DistExecutor;
|
||||
import net.minecraftforge.fmllegacy.RegistryObject;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
|
||||
+3
-3
@@ -21,7 +21,7 @@ package net.minecraftforge.debug.client.rendering;
|
||||
|
||||
import net.minecraft.client.gui.screens.TitleScreen;
|
||||
import net.minecraftforge.client.ForgeRenderTypes;
|
||||
import net.minecraftforge.client.event.GuiScreenEvent.DrawScreenEvent;
|
||||
import net.minecraftforge.client.event.ScreenEvent.DrawScreenEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
@@ -36,7 +36,7 @@ public class LinearTextTextureFilteringTest
|
||||
@SubscribeEvent
|
||||
public static void onGuiRenderPre(DrawScreenEvent.Pre event)
|
||||
{
|
||||
if (ENABLED && event.getGui() instanceof TitleScreen)
|
||||
if (ENABLED && event.getScreen() instanceof TitleScreen)
|
||||
{
|
||||
ForgeRenderTypes.enableTextTextureLinearFiltering = true;
|
||||
}
|
||||
@@ -45,7 +45,7 @@ public class LinearTextTextureFilteringTest
|
||||
@SubscribeEvent
|
||||
public static void onGuiRenderPost(DrawScreenEvent.Post event)
|
||||
{
|
||||
if (ENABLED && event.getGui() instanceof TitleScreen)
|
||||
if (ENABLED && event.getScreen() instanceof TitleScreen)
|
||||
{
|
||||
ForgeRenderTypes.enableTextTextureLinearFiltering = false;
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ import net.minecraft.client.player.LocalPlayer;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fmlclient.registry.ClientRegistry;
|
||||
import net.minecraftforge.client.ClientRegistry;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
|
||||
|
||||
|
||||
Reference in new issue
Block a user