-
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update to yarn, eclipse + formatting. forge is broken
- Loading branch information
Showing
105 changed files
with
7,058 additions
and
7,249 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,30 @@ | ||
| plugins { | ||
| id "architectury-plugin" version "1.3.41" | ||
| id "forgified-fabric-loom" version "0.5.22" apply false | ||
| } | ||
|
|
||
| architect { | ||
| minecraft = rootProject.minecraft_version | ||
| } | ||
|
|
||
| subprojects { | ||
| apply plugin: "forgified-fabric-loom" | ||
| apply plugin: "architectury-plugin" | ||
|
|
||
| loom { | ||
| silentMojangMappingsLicense() | ||
| } | ||
| } | ||
|
|
||
| allprojects { | ||
| apply plugin: "java" | ||
| apply plugin: "architectury-plugin" | ||
|
|
||
| archivesBaseName = rootProject.archives_base_name | ||
| version = rootProject.mod_version | ||
| group = rootProject.maven_group | ||
|
|
||
| tasks.withType(JavaCompile) { | ||
| options.encoding = "UTF-8" | ||
| } | ||
| } | ||
| plugins { | ||
| id "architectury-plugin" version "1.3.44" | ||
| id "forgified-fabric-loom" version "0.5.25" apply false | ||
| } | ||
|
|
||
| architect { | ||
| minecraft = rootProject.minecraft_version | ||
| } | ||
|
|
||
| subprojects { | ||
| apply plugin: "forgified-fabric-loom" | ||
| apply plugin: "architectury-plugin" | ||
|
|
||
| loom { | ||
| silentMojangMappingsLicense() | ||
| } | ||
| } | ||
|
|
||
| allprojects { | ||
| apply plugin: "java" | ||
| apply plugin: "architectury-plugin" | ||
|
|
||
| archivesBaseName = rootProject.archives_base_name | ||
| version = rootProject.mod_version | ||
| group = rootProject.maven_group | ||
|
|
||
| tasks.withType(JavaCompile) { | ||
| options.encoding = "UTF-8" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,43 @@ | ||
| repositories { | ||
| maven { | ||
| url = "https://jitpack.io" | ||
| } | ||
| } | ||
|
|
||
| minecraft { | ||
| accessWidener = file("src/main/resources/netherite_plus.accesswidener") | ||
| } | ||
|
|
||
| dependencies { | ||
| minecraft "com.mojang:minecraft:${rootProject.architect.minecraft}" | ||
| mappings minecraft.officialMojangMappings() | ||
| // We depend on fabric loader here to use the fabric @Environment annotations | ||
| // Do NOT use other classes from fabric loader | ||
| modCompile "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" | ||
|
|
||
| modCompile("me.shedaniel:architectury:${rootProject.architectury_version}") { | ||
| exclude(module: "fabric-api") | ||
| } | ||
|
|
||
| modCompile('com.github.OroArmor:oro-config:-SNAPSHOT') { | ||
| exclude(module: "fabric-api") | ||
| exclude(module: "fabric-loader") | ||
| } | ||
| include('com.github.OroArmor:oro-config:-SNAPSHOT') { | ||
| exclude(module: "fabric-api") | ||
| exclude(module: "fabric-loader") | ||
| } | ||
|
|
||
| modCompile('com.github.OroArmor:Multi-Item-Lib:-SNAPSHOT') { | ||
| exclude(module: "fabric-api") | ||
| exclude(module: "fabric-loader") | ||
| } | ||
| include('com.github.OroArmor:Multi-Item-Lib:-SNAPSHOT') { | ||
| exclude(module: "fabric-api") | ||
| exclude(module: "fabric-loader") | ||
| } | ||
| } | ||
|
|
||
| architect { | ||
| common() | ||
| repositories { | ||
| maven { | ||
| url = "https://jitpack.io" | ||
| } | ||
| } | ||
|
|
||
| minecraft { | ||
| accessWidener = file("src/main/resources/netherite_plus.accesswidener") | ||
| } | ||
|
|
||
| dependencies { | ||
| minecraft "com.mojang:minecraft:${rootProject.architect.minecraft}" | ||
| mappings("net.fabricmc:yarn:${rootProject.mappings}:v2") | ||
| // We depend on fabric loader here to use the fabric @Environment annotations | ||
| // Do NOT use other classes from fabric loader | ||
| modCompile "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" | ||
|
|
||
| modCompile("me.shedaniel:architectury:${rootProject.architectury_version}") { | ||
| exclude(module: "fabric-api") | ||
| } | ||
|
|
||
| modCompile('com.github.OroArmor:oro-config:-SNAPSHOT') { | ||
| exclude(module: "fabric-api") | ||
| exclude(module: "fabric-loader") | ||
| } | ||
| include('com.github.OroArmor:oro-config:-SNAPSHOT') { | ||
| exclude(module: "fabric-api") | ||
| exclude(module: "fabric-loader") | ||
| } | ||
|
|
||
| modCompile('com.github.OroArmor:Multi-Item-Lib:-SNAPSHOT') { | ||
| exclude(module: "fabric-api") | ||
| exclude(module: "fabric-loader") | ||
| } | ||
| include('com.github.OroArmor:Multi-Item-Lib:-SNAPSHOT') { | ||
| exclude(module: "fabric-api") | ||
| exclude(module: "fabric-loader") | ||
| } | ||
| } | ||
|
|
||
| architect { | ||
| common() | ||
| } |
174 changes: 86 additions & 88 deletions
174
common/src/main/java/com/oroarmor/netherite_plus/NetheritePlusMod.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,88 +1,86 @@ | ||
| package com.oroarmor.netherite_plus; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import com.oroarmor.config.ConfigItemGroup; | ||
| import com.oroarmor.multi_item_lib.UniqueItemRegistry; | ||
| import com.oroarmor.netherite_plus.advancement.criterion.NetheritePlusCriteria; | ||
| import com.oroarmor.netherite_plus.config.NetheritePlusConfig; | ||
| import com.oroarmor.netherite_plus.entity.effect.NetheritePlusStatusEffects; | ||
| import com.oroarmor.netherite_plus.item.NetheritePlusItems; | ||
| import com.oroarmor.netherite_plus.loot.NetheritePlusLootManager; | ||
| import com.oroarmor.netherite_plus.network.UpdateNetheriteBeaconC2SPacket; | ||
| import com.oroarmor.netherite_plus.recipe.NetheritePlusRecipeSerializer; | ||
| import com.oroarmor.netherite_plus.screen.NetheriteBeaconScreenHandler; | ||
| import com.oroarmor.netherite_plus.screen.NetheritePlusScreenHandlers; | ||
| import com.oroarmor.netherite_plus.stat.NetheritePlusStats; | ||
| import me.shedaniel.architectury.networking.NetworkManager; | ||
| import me.shedaniel.architectury.registry.Registries; | ||
| import org.apache.logging.log4j.Level; | ||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
|
|
||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.util.LazyLoadedValue; | ||
| import net.minecraft.world.entity.player.Player; | ||
|
|
||
| import static com.oroarmor.netherite_plus.item.NetheritePlusItems.*; | ||
|
|
||
| public class NetheritePlusMod { | ||
| public static final NetheritePlusConfig CONFIG = new NetheritePlusConfig(); | ||
|
|
||
| public static final Logger LOGGER = LogManager.getLogger("Netherite Plus"); | ||
|
|
||
| public static final String MOD_ID = "netherite_plus"; | ||
|
|
||
| public static final List<Player> CONNECTED_CLIENTS = new ArrayList<>(); | ||
|
|
||
| public static final LazyLoadedValue<Registries> REGISTRIES = new LazyLoadedValue<>(() -> Registries.get(MOD_ID)); | ||
|
|
||
| public static void initialize() { | ||
| processConfig(); | ||
| NetheritePlusItems.init(); | ||
| NetheritePlusScreenHandlers.init(); | ||
| NetheritePlusLootManager.init(); | ||
| NetheritePlusRecipeSerializer.init(); | ||
| NetheritePlusStatusEffects.init(); | ||
| NetheritePlusCriteria.init(); | ||
| NetheritePlusStats.init(); | ||
|
|
||
|
|
||
| NetworkManager.registerReceiver(NetworkManager.Side.C2S, UpdateNetheriteBeaconC2SPacket.ID, (friendlyByteBuf, packetContext) -> { | ||
| UpdateNetheriteBeaconC2SPacket packet = new UpdateNetheriteBeaconC2SPacket(); | ||
| try { | ||
| packet.read(friendlyByteBuf); | ||
| } catch (IOException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| packetContext.queue(() -> { | ||
| if (packetContext.getPlayer().containerMenu instanceof NetheriteBeaconScreenHandler) { | ||
| ((NetheriteBeaconScreenHandler) packetContext.getPlayer().containerMenu).setEffects(packet.getPrimary(), packet.getSecondary(), packet.getTertiaryEffectId()); | ||
| } | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| private static void processConfig() { | ||
| CONFIG.readConfigFromFile(); | ||
|
|
||
| if (NetheritePlusConfig.ENABLED.ENABLED_CONFIG_PRINT.getValue()) { | ||
| CONFIG.getConfigs().stream().map(ConfigItemGroup::getConfigs).forEach(l -> l.forEach(ci -> LOGGER.log(Level.INFO, ci.toString()))); | ||
| } | ||
| } | ||
|
|
||
| public static ResourceLocation id(String id) { | ||
| return new ResourceLocation(MOD_ID, id); | ||
| } | ||
|
|
||
| public static void registerItemsWithMultiItemLib() { | ||
| UniqueItemRegistry.SHIELD.addItemToRegistry(NETHERITE_SHIELD.get()); | ||
| UniqueItemRegistry.FISHING_ROD.addItemToRegistry(NETHERITE_FISHING_ROD.get()); | ||
| UniqueItemRegistry.ELYTRA.addItemToRegistry(NETHERITE_ELYTRA.get()); | ||
| UniqueItemRegistry.BOW.addItemToRegistry(NETHERITE_BOW.get()); | ||
| UniqueItemRegistry.CROSSBOW.addItemToRegistry(NETHERITE_CROSSBOW.get()); | ||
| UniqueItemRegistry.TRIDENT.addItemToRegistry(NETHERITE_TRIDENT.get()); | ||
| } | ||
| } | ||
| package com.oroarmor.netherite_plus; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import com.oroarmor.config.ConfigItemGroup; | ||
| import com.oroarmor.multi_item_lib.UniqueItemRegistry; | ||
| import com.oroarmor.netherite_plus.advancement.criterion.NetheritePlusCriteria; | ||
| import com.oroarmor.netherite_plus.config.NetheritePlusConfig; | ||
| import com.oroarmor.netherite_plus.entity.effect.NetheritePlusStatusEffects; | ||
| import com.oroarmor.netherite_plus.item.NetheritePlusItems; | ||
| import com.oroarmor.netherite_plus.loot.NetheritePlusLootManager; | ||
| import com.oroarmor.netherite_plus.network.UpdateNetheriteBeaconC2SPacket; | ||
| import com.oroarmor.netherite_plus.recipe.NetheritePlusRecipeSerializer; | ||
| import com.oroarmor.netherite_plus.screen.NetheriteBeaconScreenHandler; | ||
| import com.oroarmor.netherite_plus.screen.NetheritePlusScreenHandlers; | ||
| import com.oroarmor.netherite_plus.stat.NetheritePlusStats; | ||
| import me.shedaniel.architectury.networking.NetworkManager; | ||
| import me.shedaniel.architectury.registry.Registries; | ||
| import net.minecraft.entity.player.PlayerEntity; | ||
| import net.minecraft.util.Identifier; | ||
| import net.minecraft.util.Lazy; | ||
| import org.apache.logging.log4j.Level; | ||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
|
|
||
| import static com.oroarmor.netherite_plus.item.NetheritePlusItems.*; | ||
|
|
||
| public class NetheritePlusMod { | ||
| public static final NetheritePlusConfig CONFIG = new NetheritePlusConfig(); | ||
|
|
||
| public static final Logger LOGGER = LogManager.getLogger("Netherite Plus"); | ||
|
|
||
| public static final String MOD_ID = "netherite_plus"; | ||
|
|
||
| public static final List<PlayerEntity> CONNECTED_CLIENTS = new ArrayList<>(); | ||
|
|
||
| public static final Lazy<Registries> REGISTRIES = new Lazy<>(() -> Registries.get(MOD_ID)); | ||
|
|
||
| public static void initialize() { | ||
| processConfig(); | ||
| NetheritePlusItems.init(); | ||
| NetheritePlusScreenHandlers.init(); | ||
| NetheritePlusLootManager.init(); | ||
| NetheritePlusRecipeSerializer.init(); | ||
| NetheritePlusStatusEffects.init(); | ||
| NetheritePlusCriteria.init(); | ||
| NetheritePlusStats.init(); | ||
|
|
||
| NetworkManager.registerReceiver(NetworkManager.Side.C2S, UpdateNetheriteBeaconC2SPacket.ID, (friendlyByteBuf, packetContext) -> { | ||
| UpdateNetheriteBeaconC2SPacket packet = new UpdateNetheriteBeaconC2SPacket(); | ||
| try { | ||
| packet.read(friendlyByteBuf); | ||
| } catch (IOException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| packetContext.queue(() -> { | ||
| if (packetContext.getPlayer().currentScreenHandler instanceof NetheriteBeaconScreenHandler) { | ||
| ((NetheriteBeaconScreenHandler) packetContext.getPlayer().currentScreenHandler).setEffects(packet.getPrimaryEffectId(), packet.getSecondaryEffectId(), packet.getTertiaryEffectId()); | ||
| } | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| private static void processConfig() { | ||
| CONFIG.readConfigFromFile(); | ||
|
|
||
| if (NetheritePlusConfig.ENABLED.ENABLED_CONFIG_PRINT.getValue()) { | ||
| CONFIG.getConfigs().stream().map(ConfigItemGroup::getConfigs).forEach(l -> l.forEach(ci -> LOGGER.log(Level.INFO, ci.toString()))); | ||
| } | ||
| } | ||
|
|
||
| public static Identifier id(String id) { | ||
| return new Identifier(MOD_ID, id); | ||
| } | ||
|
|
||
| public static void registerItemsWithMultiItemLib() { | ||
| UniqueItemRegistry.SHIELD.addItemToRegistry(NETHERITE_SHIELD.get()); | ||
| UniqueItemRegistry.FISHING_ROD.addItemToRegistry(NETHERITE_FISHING_ROD.get()); | ||
| UniqueItemRegistry.ELYTRA.addItemToRegistry(NETHERITE_ELYTRA.get()); | ||
| UniqueItemRegistry.BOW.addItemToRegistry(NETHERITE_BOW.get()); | ||
| UniqueItemRegistry.CROSSBOW.addItemToRegistry(NETHERITE_CROSSBOW.get()); | ||
| UniqueItemRegistry.TRIDENT.addItemToRegistry(NETHERITE_TRIDENT.get()); | ||
| } | ||
| } |
69 changes: 16 additions & 53 deletions
69
common/src/main/java/com/oroarmor/netherite_plus/NetheritePlusModPlatform.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,16 @@ | ||
| package com.oroarmor.netherite_plus; | ||
|
|
||
| import java.io.File; | ||
| import java.util.function.BiFunction; | ||
|
|
||
| import me.shedaniel.architectury.ExpectPlatform; | ||
|
|
||
| import net.minecraft.advancements.CriterionTrigger; | ||
| import net.minecraft.client.gui.screens.Screen; | ||
| import net.minecraft.client.gui.screens.inventory.MenuAccess; | ||
| import net.minecraft.network.chat.Component; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.world.entity.player.Inventory; | ||
| import net.minecraft.world.inventory.AbstractContainerMenu; | ||
| import net.minecraft.world.inventory.MenuType; | ||
| import net.minecraft.world.item.Item; | ||
|
|
||
| public class NetheritePlusModPlatform { | ||
| @ExpectPlatform | ||
| public static <T extends CriterionTrigger<?>> T registerCriteria(T object) { | ||
| throw new AssertionError(); | ||
| } | ||
|
|
||
| @ExpectPlatform | ||
| public static Item getElytraItem(Item.Properties elytraSettings) { | ||
| throw new AssertionError(); | ||
| } | ||
|
|
||
| @ExpectPlatform | ||
| public static File getConfigDir() { | ||
| throw new AssertionError(); | ||
| } | ||
|
|
||
| @ExpectPlatform | ||
| public static Item.Properties setISTER(Item.Properties properties) { | ||
| throw new AssertionError(); | ||
| } | ||
|
|
||
| @ExpectPlatform | ||
| public static <H extends AbstractContainerMenu, S extends Screen & MenuAccess<H>> void registerScreen(MenuType<?> menuType, Factory<H, S> screenSupplier) { | ||
| throw new AssertionError(); | ||
| } | ||
|
|
||
| @ExpectPlatform | ||
| public static <T extends AbstractContainerMenu> MenuType<T> registerScreenHandler(ResourceLocation identifier, BiFunction<Integer, Inventory, T> menuTypeSupplier) { | ||
| throw new AssertionError(); | ||
| } | ||
|
|
||
| @FunctionalInterface | ||
| public interface Factory<H extends AbstractContainerMenu, S extends Screen & MenuAccess<H>> { | ||
| S create(H var1, Inventory var2, Component var3); | ||
| } | ||
| } | ||
| package com.oroarmor.netherite_plus; | ||
|
|
||
| import me.shedaniel.architectury.ExpectPlatform; | ||
| import net.minecraft.item.Item; | ||
|
|
||
| public class NetheritePlusModPlatform { | ||
| @ExpectPlatform | ||
| public static Item getElytraItem(Item.Settings elytraSettings) { | ||
| throw new AssertionError(); | ||
| } | ||
|
|
||
| @ExpectPlatform | ||
| public static Item.Settings setISTER(Item.Settings properties) { | ||
| throw new AssertionError(); | ||
| } | ||
| } |
Oops, something went wrong.