Finished Config and most of the features

This commit is contained in:
Verox001 2025-05-14 17:36:23 +02:00
parent f96c8d33b9
commit f9e78d96e9
3 changed files with 146 additions and 92 deletions

View File

@ -1,51 +1,24 @@
package com.cimeyclust.ezcheat; package com.cimeyclust.ezcheat;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.ForgeConfigSpec;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.config.ModConfigEvent; import net.minecraftforge.fml.event.config.ModConfigEvent;
import net.minecraftforge.registries.ForgeRegistries;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
// An example config class. This is not required, but it's a good idea to have one to keep your config organized.
// Demonstrates how to use Forge's config APIs
@Mod.EventBusSubscriber(modid = Ezcheat.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) @Mod.EventBusSubscriber(modid = Ezcheat.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
public class Config { public class Config {
private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder(); private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
private static final ForgeConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER.comment("Whether to log the dirt block on common setup").define("logDirtBlock", true); public static final ForgeConfigSpec.ConfigValue<String> MOD_ENDPOINT_URL = BUILDER
.comment("Endpoint URL used by the Ezcheat mod")
.define("modEndpointUrl", "https://ezcheat.cimeyclust.com/api/mods");
private static final ForgeConfigSpec.IntValue MAGIC_NUMBER = BUILDER.comment("A magic number").defineInRange("magicNumber", 42, 0, Integer.MAX_VALUE); public static final ForgeConfigSpec SPEC = BUILDER.build();
public static final ForgeConfigSpec.ConfigValue<String> MAGIC_NUMBER_INTRODUCTION = BUILDER.comment("What you want the introduction message to be for the magic number").define("magicNumberIntroduction", "The magic number is... "); public static String modEndpointUrl;
// a list of strings that are treated as resource locations for items
private static final ForgeConfigSpec.ConfigValue<List<? extends String>> ITEM_STRINGS = BUILDER.comment("A list of items to log on common setup.").defineListAllowEmpty("items", List.of("minecraft:iron_ingot"), Config::validateItemName);
static final ForgeConfigSpec SPEC = BUILDER.build();
public static boolean logDirtBlock;
public static int magicNumber;
public static String magicNumberIntroduction;
public static Set<Item> items;
private static boolean validateItemName(final Object obj) {
return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(new ResourceLocation(itemName));
}
@SubscribeEvent @SubscribeEvent
static void onLoad(final ModConfigEvent event) { static void onLoad(final ModConfigEvent event) {
logDirtBlock = LOG_DIRT_BLOCK.get(); modEndpointUrl = MOD_ENDPOINT_URL.get();
magicNumber = MAGIC_NUMBER.get();
magicNumberIntroduction = MAGIC_NUMBER_INTRODUCTION.get();
// convert the list of strings into a set of items
items = ITEM_STRINGS.get().stream().map(itemName -> ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemName))).collect(Collectors.toSet());
} }
} }

View File

@ -1,8 +1,14 @@
package com.cimeyclust.ezcheat; package com.cimeyclust.ezcheat;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.core.registries.Registries; import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.food.FoodProperties; import net.minecraft.world.food.FoodProperties;
import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTab;
@ -18,90 +24,118 @@ import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.event.server.ServerStartingEvent;
import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
import net.minecraftforge.forgespi.language.IModInfo;
import net.minecraftforge.network.NetworkRegistry;
import net.minecraftforge.network.simple.SimpleChannel;
import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject; import net.minecraftforge.registries.RegistryObject;
import org.apache.commons.codec.digest.DigestUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
// The value here should match an entry in the META-INF/mods.toml file import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Type;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
@Mod(Ezcheat.MODID) @Mod(Ezcheat.MODID)
public class Ezcheat { public class Ezcheat {
// Define mod id in a common place for everything to reference
public static final String MODID = "ezcheat"; public static final String MODID = "ezcheat";
// Directly reference a slf4j logger // Directly reference a slf4j logger
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
// Create a Deferred Register to hold Blocks which will all be registered under the "ezcheat" namespace
public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
// Create a Deferred Register to hold Items which will all be registered under the "ezcheat" namespace
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
// Create a Deferred Register to hold CreativeModeTabs which will all be registered under the "ezcheat" namespace
public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID);
// Creates a new Block with the id "ezcheat:example_block", combining the namespace and path public static final String PROTOCOL_VERSION = "1";
public static final RegistryObject<Block> EXAMPLE_BLOCK = BLOCKS.register("example_block", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE))); public static final SimpleChannel NETWORK = NetworkRegistry.newSimpleChannel(
// Creates a new BlockItem with the id "ezcheat:example_block", combining the namespace and path new ResourceLocation(MODID, "main"),
public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties())); () -> PROTOCOL_VERSION, PROTOCOL_VERSION::equals, PROTOCOL_VERSION::equals
);
// Creates a new food item with the id "ezcheat:example_id", nutrition 1 and saturation 2 public static Map<String, String> getInstalledModHashes() {
public static final RegistryObject<Item> EXAMPLE_ITEM = ITEMS.register("example_item", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(1).saturationMod(2f).build()))); Map<String, String> modHashes = new HashMap<>();
// Creates a creative tab with the id "ezcheat:example_tab" for the example item, that is placed after the combat tab for (IModInfo mod : ModList.get().getMods()) {
public static final RegistryObject<CreativeModeTab> EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder().withTabsBefore(CreativeModeTabs.COMBAT).icon(() -> EXAMPLE_ITEM.get().getDefaultInstance()).displayItems((parameters, output) -> { Optional<Path> modFile = Optional.ofNullable(mod.getOwningFile().getFile().getFilePath());
output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event modFile.ifPresent(path -> {
}).build()); try (InputStream in = Files.newInputStream(path)) {
String hash = DigestUtils.sha256Hex(in); // Apache Commons Codec
modHashes.put(mod.getModId(), hash);
} catch (IOException e) {
LOGGER.error("Failed to read mod file for {}: {}", mod.getModId(), e.getMessage());
}
});
}
return modHashes;
}
public static void handlePlayerModHashes(ServerPlayer player, Map<String, String> modHashes) {
// Request an external whitelist
MinecraftServer server = player.getServer();
if (server == null) return;
server.execute(() -> {
try {
URL url = new URL(Config.modEndpointUrl);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
InputStream in = conn.getInputStream();
String response = new String(in.readAllBytes());
in.close();
Gson gson = new Gson();
Type type = new TypeToken<Map<String, String>>() {}.getType();
Map<String, String> allowedMods = gson.fromJson(response, type);
StringBuilder unallowedMods = new StringBuilder("Unallowed mods: ");
for (Map.Entry<String, String> entry : modHashes.entrySet()) {
String modid = entry.getKey();
String hash = entry.getValue();
if (!allowedMods.containsKey(modid) || !allowedMods.get(modid).equalsIgnoreCase(hash)) {
unallowedMods.append(modid).append(", ");
}
}
if (!unallowedMods.isEmpty()) {
unallowedMods.setLength(unallowedMods.length() - 2); // Remove last comma and space
player.connection.disconnect(Component.literal(unallowedMods.toString()));
}
} catch (IOException e) {
Ezcheat.LOGGER.error("Modprüfung fehlgeschlagen", e);
}
});
}
public Ezcheat() { public Ezcheat() {
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
// Register the commonSetup method for modloading
modEventBus.addListener(this::commonSetup);
// Register the Deferred Register to the mod event bus so blocks get registered
BLOCKS.register(modEventBus);
// Register the Deferred Register to the mod event bus so items get registered
ITEMS.register(modEventBus);
// Register the Deferred Register to the mod event bus so tabs get registered
CREATIVE_MODE_TABS.register(modEventBus);
// Register ourselves for server and other game events we are interested in
MinecraftForge.EVENT_BUS.register(this);
// Register the item to a creative tab
modEventBus.addListener(this::addCreative);
// Register our mod's ForgeConfigSpec so that Forge can create and load the config file for us
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.SPEC); ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.SPEC);
}
private void commonSetup(final FMLCommonSetupEvent event) { NETWORK.registerMessage(0, ModHashesPacket.class,
// Some common setup code ModHashesPacket::encode,
LOGGER.info("HELLO FROM COMMON SETUP"); ModHashesPacket::decode,
LOGGER.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT)); ModHashesPacket::handle
);
if (Config.logDirtBlock) LOGGER.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT));
LOGGER.info(Config.magicNumberIntroduction + Config.magicNumber);
Config.items.forEach((item) -> LOGGER.info("ITEM >> {}", item.toString()));
}
// Add the example block item to the building blocks tab
private void addCreative(BuildCreativeModeTabContentsEvent event) {
if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS) event.accept(EXAMPLE_BLOCK_ITEM);
} }
// You can use SubscribeEvent and let the Event Bus discover methods to call // You can use SubscribeEvent and let the Event Bus discover methods to call
@SubscribeEvent @SubscribeEvent
public void onServerStarting(ServerStartingEvent event) { public void onServerStarting(ServerStartingEvent event) {
// Do something when the server starts
LOGGER.info("HELLO from server starting");
} }
// You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent
@ -110,9 +144,12 @@ public class Ezcheat {
@SubscribeEvent @SubscribeEvent
public static void onClientSetup(FMLClientSetupEvent event) { public static void onClientSetup(FMLClientSetupEvent event) {
// Some client setup code event.enqueueWork(() -> {
LOGGER.info("HELLO FROM CLIENT SETUP"); if (Minecraft.getInstance().getConnection() != null) {
LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName()); Map<String, String> modHashes = Ezcheat.getInstalledModHashes();
Ezcheat.NETWORK.sendToServer(new ModHashesPacket(modHashes));
}
});
} }
} }
} }

View File

@ -0,0 +1,44 @@
package com.cimeyclust.ezcheat;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.network.NetworkEvent;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;
public class ModHashesPacket {
private final Map<String, String> hashes;
public ModHashesPacket(Map<String, String> hashes) {
this.hashes = hashes;
}
public static void encode(ModHashesPacket msg, FriendlyByteBuf buf) {
buf.writeInt(msg.hashes.size());
msg.hashes.forEach((modid, hash) -> {
buf.writeUtf(modid);
buf.writeUtf(hash);
});
}
public static ModHashesPacket decode(FriendlyByteBuf buf) {
int size = buf.readInt();
Map<String, String> hashes = new HashMap<>();
for (int i = 0; i < size; i++) {
hashes.put(buf.readUtf(), buf.readUtf());
}
return new ModHashesPacket(hashes);
}
public static void handle(ModHashesPacket msg, Supplier<NetworkEvent.Context> ctx) {
ctx.get().enqueueWork(() -> {
ServerPlayer player = ctx.get().getSender();
if (player != null) {
Ezcheat.handlePlayerModHashes(player, msg.hashes);
}
});
ctx.get().setPacketHandled(true);
}
}