From cbbe2dd12615119ca33c1dab236710e4cb2b3d6f Mon Sep 17 00:00:00 2001 From: PanSzelescik Date: Fri, 8 Dec 2023 12:53:39 +0100 Subject: [PATCH] Change NeoForge names --- .../colorize/{forge => neoforge}/ColorizeForge.java | 2 +- .../{forge => neoforge}/ColorizeForgeConfig.java | 2 +- .../colorize/neoforge}/ColorizeForgeHandler.java | 2 +- .../ColorizeNeoForge.java} | 12 ++++++------ .../ColorizeNeoForgeConfig.java} | 10 +++++----- .../colorize/neoforge/ColorizeNeoForgeHandler.java | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) rename forge/src/main/java/pl/panszelescik/colorize/{forge => neoforge}/ColorizeForge.java (95%) rename forge/src/main/java/pl/panszelescik/colorize/{forge => neoforge}/ColorizeForgeConfig.java (98%) rename {neoforged/src/main/java/pl/panszelescik/colorize/forge => forge/src/main/java/pl/panszelescik/colorize/neoforge}/ColorizeForgeHandler.java (95%) rename neoforged/src/main/java/pl/panszelescik/colorize/{forge/ColorizeForge.java => neoforge/ColorizeNeoForge.java} (69%) rename neoforged/src/main/java/pl/panszelescik/colorize/{forge/ColorizeForgeConfig.java => neoforge/ColorizeNeoForgeConfig.java} (89%) rename forge/src/main/java/pl/panszelescik/colorize/forge/ColorizeForgeHandler.java => neoforged/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeNeoForgeHandler.java (82%) diff --git a/forge/src/main/java/pl/panszelescik/colorize/forge/ColorizeForge.java b/forge/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeForge.java similarity index 95% rename from forge/src/main/java/pl/panszelescik/colorize/forge/ColorizeForge.java rename to forge/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeForge.java index 697ba55..8726436 100644 --- a/forge/src/main/java/pl/panszelescik/colorize/forge/ColorizeForge.java +++ b/forge/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeForge.java @@ -1,4 +1,4 @@ -package pl.panszelescik.colorize.forge; +package pl.panszelescik.colorize.neoforge; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; diff --git a/forge/src/main/java/pl/panszelescik/colorize/forge/ColorizeForgeConfig.java b/forge/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeForgeConfig.java similarity index 98% rename from forge/src/main/java/pl/panszelescik/colorize/forge/ColorizeForgeConfig.java rename to forge/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeForgeConfig.java index 2278ab1..7495ced 100644 --- a/forge/src/main/java/pl/panszelescik/colorize/forge/ColorizeForgeConfig.java +++ b/forge/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeForgeConfig.java @@ -1,4 +1,4 @@ -package pl.panszelescik.colorize.forge; +package pl.panszelescik.colorize.neoforge; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2ObjectMaps; diff --git a/neoforged/src/main/java/pl/panszelescik/colorize/forge/ColorizeForgeHandler.java b/forge/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeForgeHandler.java similarity index 95% rename from neoforged/src/main/java/pl/panszelescik/colorize/forge/ColorizeForgeHandler.java rename to forge/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeForgeHandler.java index 8dfa219..deca35c 100644 --- a/neoforged/src/main/java/pl/panszelescik/colorize/forge/ColorizeForgeHandler.java +++ b/forge/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeForgeHandler.java @@ -1,4 +1,4 @@ -package pl.panszelescik.colorize.forge; +package pl.panszelescik.colorize.neoforge; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemStack; diff --git a/neoforged/src/main/java/pl/panszelescik/colorize/forge/ColorizeForge.java b/neoforged/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeNeoForge.java similarity index 69% rename from neoforged/src/main/java/pl/panszelescik/colorize/forge/ColorizeForge.java rename to neoforged/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeNeoForge.java index bb5802f..0a04451 100644 --- a/neoforged/src/main/java/pl/panszelescik/colorize/forge/ColorizeForge.java +++ b/neoforged/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeNeoForge.java @@ -1,4 +1,4 @@ -package pl.panszelescik.colorize.forge; +package pl.panszelescik.colorize.neoforge; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.ModLoadingContext; @@ -7,16 +7,16 @@ import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import org.jetbrains.annotations.NotNull; -@Mod(ColorizeForge.MODID) -public class ColorizeForge { +@Mod(ColorizeNeoForge.MODID) +public class ColorizeNeoForge { public static final String MODID = "colorize"; - private final ColorizeForgeHandler handler = new ColorizeForgeHandler(ColorizeForgeConfig.CONFIG); + private final ColorizeNeoForgeHandler handler = new ColorizeNeoForgeHandler(ColorizeNeoForgeConfig.CONFIG); - public ColorizeForge(IEventBus modEventBus) { + public ColorizeNeoForge(IEventBus modEventBus) { modEventBus.addListener(this::onRightClickBlock); - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ColorizeForgeConfig.SPEC); + ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ColorizeNeoForgeConfig.SPEC); } private void onRightClickBlock(@NotNull PlayerInteractEvent.RightClickBlock event) { diff --git a/neoforged/src/main/java/pl/panszelescik/colorize/forge/ColorizeForgeConfig.java b/neoforged/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeNeoForgeConfig.java similarity index 89% rename from neoforged/src/main/java/pl/panszelescik/colorize/forge/ColorizeForgeConfig.java rename to neoforged/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeNeoForgeConfig.java index 2611b5a..f1b9d6a 100644 --- a/neoforged/src/main/java/pl/panszelescik/colorize/forge/ColorizeForgeConfig.java +++ b/neoforged/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeNeoForgeConfig.java @@ -1,4 +1,4 @@ -package pl.panszelescik.colorize.forge; +package pl.panszelescik.colorize.neoforge; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2ObjectMaps; @@ -8,11 +8,11 @@ import org.jetbrains.annotations.NotNull; import pl.panszelescik.colorize.common.api.ColorizeConfig; -public class ColorizeForgeConfig implements ColorizeConfig { +public class ColorizeNeoForgeConfig implements ColorizeConfig { private final Object2ObjectMap booleans; - public ColorizeForgeConfig(@NotNull ModConfigSpec.Builder builder) { + public ColorizeNeoForgeConfig(@NotNull ModConfigSpec.Builder builder) { var map = new Object2ObjectOpenHashMap(); builder.comment("Handlers settings"); @@ -74,11 +74,11 @@ public ColorizeForgeConfig(@NotNull ModConfigSpec.Builder builder) { .define(key, true); } - public static final ColorizeForgeConfig CONFIG; + public static final ColorizeNeoForgeConfig CONFIG; public static final ModConfigSpec SPEC; static { - final Pair specPair = new ModConfigSpec.Builder().configure(ColorizeForgeConfig::new); + final Pair specPair = new ModConfigSpec.Builder().configure(ColorizeNeoForgeConfig::new); SPEC = specPair.getRight(); CONFIG = specPair.getLeft(); } diff --git a/forge/src/main/java/pl/panszelescik/colorize/forge/ColorizeForgeHandler.java b/neoforged/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeNeoForgeHandler.java similarity index 82% rename from forge/src/main/java/pl/panszelescik/colorize/forge/ColorizeForgeHandler.java rename to neoforged/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeNeoForgeHandler.java index 8dfa219..58adaaa 100644 --- a/forge/src/main/java/pl/panszelescik/colorize/forge/ColorizeForgeHandler.java +++ b/neoforged/src/main/java/pl/panszelescik/colorize/neoforge/ColorizeNeoForgeHandler.java @@ -1,4 +1,4 @@ -package pl.panszelescik.colorize.forge; +package pl.panszelescik.colorize.neoforge; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemStack; @@ -10,9 +10,9 @@ import java.util.Optional; -public class ColorizeForgeHandler extends ColorizeEventHandler { +public class ColorizeNeoForgeHandler extends ColorizeEventHandler { - public ColorizeForgeHandler(@NotNull ColorizeConfig config) { + public ColorizeNeoForgeHandler(@NotNull ColorizeConfig config) { super(config); }