diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index b93c3c6..d044b39 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -18,8 +18,8 @@ jobs: java-version: '21' distribution: 'temurin' - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + # - name: Setup Gradle + # uses: gradle/actions/setup-gradle@v4 # This is needed to be able to run ./gradlew below # You can run `git update-index --chmod +x gradlew` then remove this step. @@ -27,4 +27,4 @@ jobs: run: chmod +x ./gradlew - name: Build with Gradle - run: ./gradlew build \ No newline at end of file + run: ./gradlew build diff --git a/src/main/java/nl/kallestruik/riseofblocks/BlastResistanceOverrideConfig.java b/src/main/java/nl/kallestruik/riseofblocks/BlastResistanceOverrideConfig.java new file mode 100644 index 0000000..eb9a570 --- /dev/null +++ b/src/main/java/nl/kallestruik/riseofblocks/BlastResistanceOverrideConfig.java @@ -0,0 +1,60 @@ +package nl.kallestruik.riseofblocks; + + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; +import net.minecraft.resources.ResourceLocation; + +import java.io.File; +import java.io.FileReader; +import java.lang.reflect.Type; +import java.nio.file.Files; +import java.util.HashMap; +import java.util.Map; + +import static nl.kallestruik.riseofblocks.RiseOfBlocks.LOGGER; + +public class BlastResistanceOverrideConfig { + private static final File CONFIG_FILE = new File("config/riseofblocks-blastresistance.json"); + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + private static final Map BLAST_RESISTANCES = new HashMap<>(); + + public static void load() { + if (!CONFIG_FILE.exists()) { + writeDefaultConfig(); + } + + BLAST_RESISTANCES.clear(); + + try (FileReader reader = new FileReader(CONFIG_FILE)) { + Type type = new TypeToken>() { + }.getType(); + Map rawMap = GSON.fromJson(reader, type); + rawMap.forEach((id, value) -> BLAST_RESISTANCES.put(ResourceLocation.parse(id), value)); + LOGGER.info("Loaded blast resistance override config for {} blocks", BLAST_RESISTANCES.size()); + } catch (Exception e) { + LOGGER.error("Failed to load blast resistance override config", e); + } + } + + private static void writeDefaultConfig() { + var defaultValues = new HashMap(); + + try { + CONFIG_FILE.getParentFile().mkdirs(); + String json = GSON.toJson(defaultValues); + Files.write(CONFIG_FILE.toPath(), json.getBytes()); + } catch (Exception e) { + LOGGER.error("Failed to write default blast resistance override config", e); + } + } + + public static Float getResistance(ResourceLocation id) { + return BLAST_RESISTANCES.get(id); + } + + public static boolean hasCustomResistance(ResourceLocation id) { + return BLAST_RESISTANCES.containsKey(id); + } +} diff --git a/src/main/java/nl/kallestruik/riseofblocks/Config.java b/src/main/java/nl/kallestruik/riseofblocks/Config.java deleted file mode 100644 index b10ca67..0000000 --- a/src/main/java/nl/kallestruik/riseofblocks/Config.java +++ /dev/null @@ -1,42 +0,0 @@ -package nl.kallestruik.riseofblocks; - -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.fml.event.config.ModConfigEvent; -import net.neoforged.neoforge.common.ModConfigSpec; - -// 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 Neo's config APIs -public class Config { - private static final ModConfigSpec.Builder BUILDER = new ModConfigSpec.Builder(); - - public static final ModConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER - .comment("Whether to log the dirt block on common setup") - .define("logDirtBlock", true); - - public static final ModConfigSpec.IntValue MAGIC_NUMBER = BUILDER - .comment("A magic number") - .defineInRange("magicNumber", 42, 0, Integer.MAX_VALUE); - - public static final ModConfigSpec.ConfigValue MAGIC_NUMBER_INTRODUCTION = BUILDER - .comment("What you want the introduction message to be for the magic number") - .define("magicNumberIntroduction", "The magic number is... "); - - // a list of strings that are treated as resource locations for items - public static final ModConfigSpec.ConfigValue> ITEM_STRINGS = BUILDER - .comment("A list of items to log on common setup.") - .defineListAllowEmpty("items", List.of("minecraft:iron_ingot"), () -> "", Config::validateItemName); - - static final ModConfigSpec SPEC = BUILDER.build(); - - private static boolean validateItemName(final Object obj) { - return obj instanceof String itemName && BuiltInRegistries.ITEM.containsKey(ResourceLocation.parse(itemName)); - } -} diff --git a/src/main/java/nl/kallestruik/riseofblocks/RiseOfBlocks.java b/src/main/java/nl/kallestruik/riseofblocks/RiseOfBlocks.java new file mode 100644 index 0000000..f94da88 --- /dev/null +++ b/src/main/java/nl/kallestruik/riseofblocks/RiseOfBlocks.java @@ -0,0 +1,21 @@ +package nl.kallestruik.riseofblocks; + +import com.mojang.logging.LogUtils; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModContainer; +import net.neoforged.fml.common.Mod; +import org.slf4j.Logger; + +// The value here should match an entry in the META-INF/neoforge.mods.toml file +@Mod(RiseOfBlocks.MODID) +public class RiseOfBlocks { + // Define mod id in a common place for everything to reference + public static final String MODID = "riseofblocks"; + // Directly reference a slf4j logger + public static final Logger LOGGER = LogUtils.getLogger(); + + public RiseOfBlocks(IEventBus modEventBus, ModContainer modContainer) { + // Load blast resistance override config + BlastResistanceOverrideConfig.load(); + } +} diff --git a/src/main/java/nl/kallestruik/riseofblocks/RiseofBlocks.java b/src/main/java/nl/kallestruik/riseofblocks/RiseofBlocks.java deleted file mode 100644 index 7dd8489..0000000 --- a/src/main/java/nl/kallestruik/riseofblocks/RiseofBlocks.java +++ /dev/null @@ -1,131 +0,0 @@ -package nl.kallestruik.riseofblocks; - -import org.slf4j.Logger; - -import com.mojang.logging.LogUtils; - -import net.minecraft.client.Minecraft; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; -import net.minecraft.network.chat.Component; -import net.minecraft.world.food.FoodProperties; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.CreativeModeTabs; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.MapColor; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.ModContainer; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.fml.common.Mod; -import net.neoforged.fml.config.ModConfig; -import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; -import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; -import net.neoforged.neoforge.common.NeoForge; -import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent; -import net.neoforged.neoforge.event.server.ServerStartingEvent; -import net.neoforged.neoforge.registries.DeferredBlock; -import net.neoforged.neoforge.registries.DeferredHolder; -import net.neoforged.neoforge.registries.DeferredItem; -import net.neoforged.neoforge.registries.DeferredRegister; - -// The value here should match an entry in the META-INF/neoforge.mods.toml file -@Mod(RiseofBlocks.MODID) -public class RiseofBlocks { - // Define mod id in a common place for everything to reference - public static final String MODID = "riseofblocks"; - // Directly reference a slf4j logger - private static final Logger LOGGER = LogUtils.getLogger(); - // Create a Deferred Register to hold Blocks which will all be registered under the "riseofblocks" namespace - public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(MODID); - // Create a Deferred Register to hold Items which will all be registered under the "riseofblocks" namespace - public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(MODID); - // Create a Deferred Register to hold CreativeModeTabs which will all be registered under the "riseofblocks" namespace - public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID); - - // Creates a new Block with the id "riseofblocks:example_block", combining the namespace and path - public static final DeferredBlock EXAMPLE_BLOCK = BLOCKS.registerSimpleBlock("example_block", BlockBehaviour.Properties.of().mapColor(MapColor.STONE)); - // Creates a new BlockItem with the id "riseofblocks:example_block", combining the namespace and path - public static final DeferredItem EXAMPLE_BLOCK_ITEM = ITEMS.registerSimpleBlockItem("example_block", EXAMPLE_BLOCK); - - // Creates a new food item with the id "riseofblocks:example_id", nutrition 1 and saturation 2 - public static final DeferredItem EXAMPLE_ITEM = ITEMS.registerSimpleItem("example_item", new Item.Properties().food(new FoodProperties.Builder() - .alwaysEdible().nutrition(1).saturationModifier(2f).build())); - - // Creates a creative tab with the id "riseofblocks:example_tab" for the example item, that is placed after the combat tab - public static final DeferredHolder EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder() - .title(Component.translatable("itemGroup.riseofblocks")) //The language key for the title of your CreativeModeTab - .withTabsBefore(CreativeModeTabs.COMBAT) - .icon(() -> EXAMPLE_ITEM.get().getDefaultInstance()) - .displayItems((parameters, output) -> { - output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event - }).build()); - - // The constructor for the mod class is the first code that is run when your mod is loaded. - // FML will recognize some parameter types like IEventBus or ModContainer and pass them in automatically. - public RiseofBlocks(IEventBus modEventBus, ModContainer modContainer) { - // 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. - // Note that this is necessary if and only if we want *this* class (RiseofBlocks) to respond directly to events. - // Do not add this line if there are no @SubscribeEvent-annotated functions in this class, like onServerStarting() below. - NeoForge.EVENT_BUS.register(this); - - // Register the item to a creative tab - modEventBus.addListener(this::addCreative); - - // Register our mod's ModConfigSpec so that FML can create and load the config file for us - modContainer.registerConfig(ModConfig.Type.COMMON, Config.SPEC); - } - - private void commonSetup(FMLCommonSetupEvent event) { - // Some common setup code - LOGGER.info("HELLO FROM COMMON SETUP"); - - if (Config.LOG_DIRT_BLOCK.getAsBoolean()) { - LOGGER.info("DIRT BLOCK >> {}", BuiltInRegistries.BLOCK.getKey(Blocks.DIRT)); - } - - LOGGER.info("{}{}", Config.MAGIC_NUMBER_INTRODUCTION.get(), Config.MAGIC_NUMBER.getAsInt()); - - Config.ITEM_STRINGS.get().forEach((item) -> LOGGER.info("ITEM >> {}", item)); - } - - // 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 - @SubscribeEvent - 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 - @EventBusSubscriber(modid = MODID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) - public static class ClientModEvents { - @SubscribeEvent - public static void onClientSetup(FMLClientSetupEvent event) { - // Some client setup code - LOGGER.info("HELLO FROM CLIENT SETUP"); - LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName()); - } - } -} diff --git a/src/main/java/nl/kallestruik/riseofblocks/RiseofBlocksClient.java b/src/main/java/nl/kallestruik/riseofblocks/RiseofBlocksClient.java deleted file mode 100644 index 458c154..0000000 --- a/src/main/java/nl/kallestruik/riseofblocks/RiseofBlocksClient.java +++ /dev/null @@ -1,18 +0,0 @@ -package nl.kallestruik.riseofblocks; - -import net.neoforged.api.distmarker.Dist; -import net.neoforged.fml.ModContainer; -import net.neoforged.fml.common.Mod; -import net.neoforged.neoforge.client.gui.ConfigurationScreen; -import net.neoforged.neoforge.client.gui.IConfigScreenFactory; - -// This class will not load on dedicated servers. Accessing client side code from here is safe. -@Mod(value = RiseofBlocks.MODID, dist = Dist.CLIENT) -public class RiseofBlocksClient { - public RiseofBlocksClient(ModContainer container) { - // Allows NeoForge to create a config screen for this mod's configs. - // The config screen is accessed by going to the Mods screen > clicking on your mod > clicking on config. - // Do not forget to add translations for your config options to the en_us.json file. - container.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new); - } -} \ No newline at end of file diff --git a/src/main/java/nl/kallestruik/riseofblocks/mixin/BlockMixin.java b/src/main/java/nl/kallestruik/riseofblocks/mixin/BlockMixin.java new file mode 100644 index 0000000..4bc20f8 --- /dev/null +++ b/src/main/java/nl/kallestruik/riseofblocks/mixin/BlockMixin.java @@ -0,0 +1,24 @@ +package nl.kallestruik.riseofblocks.mixin; + +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import nl.kallestruik.riseofblocks.BlastResistanceOverrideConfig; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(Block.class) +public class BlockMixin { + @Inject(method = "getExplosionResistance", at = @At("HEAD"), cancellable = true) + private void overrideExplosionResistance(CallbackInfoReturnable cir) { + Block self = (Block) (Object) this; + ResourceLocation id = BuiltInRegistries.BLOCK.getKey(self); + + if (BlastResistanceOverrideConfig.hasCustomResistance(id)) { + Float newResistance = BlastResistanceOverrideConfig.getResistance(id); + cir.setReturnValue(newResistance); + } + } +} \ No newline at end of file diff --git a/src/main/resources/riseofblocks.mixins.json b/src/main/resources/riseofblocks.mixins.json new file mode 100644 index 0000000..1179460 --- /dev/null +++ b/src/main/resources/riseofblocks.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "package": "nl.kallestruik.riseofblocks.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "BlockMixin" + ], + "client": [], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/src/main/templates/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml index bb66c4c..2f59530 100644 --- a/src/main/templates/META-INF/neoforge.mods.toml +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -48,8 +48,8 @@ authors="${mod_authors}" #optional description='''${mod_description}''' # The [[mixins]] block allows you to declare your mixin config to FML so that it gets loaded. -#[[mixins]] -#config="${mod_id}.mixins.json" +[[mixins]] +config="${mod_id}.mixins.json" # The [[accessTransformers]] block allows you to declare where your AT file is. # If this block is omitted, a fallback attempt will be made to load an AT from META-INF/accesstransformer.cfg @@ -83,7 +83,7 @@ description='''${mod_description}''' type="required" # This version range declares a minimum of the current minecraft version up to but not including the next major version versionRange="${minecraft_version_range}" - ordering="NONE" + ordering="NONE", side="BOTH" # Features are specific properties of the game environment, that you may want to declare you require. This example declares