Skip to content

Commit 77e1e6b

Browse files
committed
解决了梦之能量核心注册的时候会顺手注册整个通量的问题(
1 parent faeaacf commit 77e1e6b

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ dependencies {
307307
implementation(rfg.deobf("curse.maven:legendary-tooltips-532127:5734973"))
308308
implementation(rfg.deobf("curse.maven:betterer-p2p-943734:4928154"))
309309
implementation(rfg.deobf("curse.maven:nuclearcraft-overhauled-336895:6605808"))
310-
implementation(rfg.deobf("curse.maven:Loot-Overhaul-299389:2711740"))
311-
implementation(rfg.deobf("curse.maven:Flux-Networks-248020:3178199"))
310+
implementation(rfg.deobf("curse.maven:flux-networks-248020:3178199"))
311+
implementation(rfg.deobf("curse.maven:loot-overhaul-299389:2711740"))
312312
implementation(rfg.deobf("curse.maven:BloodMagic-224791:2822288"))
313313
implementation(rfg.deobf("curse.maven:dme-737252:5985530"))
314314
compileOnly(rfg.deobf("curse.maven:libvulpes-236541:3801015"))

src/main/java/github/kasuminova/novaeng/NovaEngineeringCore.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import github.kasuminova.novaeng.common.command.CommandBuilder;
66
import github.kasuminova.novaeng.common.command.CommandSPacketProfiler;
77
import github.kasuminova.novaeng.common.handler.WorldLoadedHandler;
8-
import github.kasuminova.novaeng.common.network.PktItemDisplay;
98
import github.kasuminova.novaeng.common.network.ParallelNetworkManager;
109
import github.kasuminova.novaeng.common.network.PktAutoCraftConfirm;
1110
import github.kasuminova.novaeng.common.network.PktCellDriveStatusUpdate;
@@ -18,6 +17,7 @@
1817
import github.kasuminova.novaeng.common.network.PktEStorageGUIData;
1918
import github.kasuminova.novaeng.common.network.PktGeocentricDrillControl;
2019
import github.kasuminova.novaeng.common.network.PktHyperNetStatus;
20+
import github.kasuminova.novaeng.common.network.PktItemDisplay;
2121
import github.kasuminova.novaeng.common.network.PktMouseItemUpdate;
2222
import github.kasuminova.novaeng.common.network.PktPatternTermUploadPattern;
2323
import github.kasuminova.novaeng.common.network.PktResearchTaskComplete;
@@ -51,12 +51,13 @@
5151
@Mod(modid = NovaEngineeringCore.MOD_ID, name = NovaEngineeringCore.MOD_NAME, version = NovaEngineeringCore.VERSION,
5252
dependencies = "required-after:forge@[14.23.5.2847,);" +
5353
"required-after:modularmachinery@[2.1.0,);" +
54-
"required:theoneprobe@[1.12-1.4.28,);" +
55-
"required:appliedenergistics2@[v0.56.4,);" +
56-
"required:ae2fc@[2.6.3-r,);" +
57-
"required:configanytime@[2.0,);" +
58-
"required:mixinbooter@[8.0,);" +
59-
"required:lumenized@[1.0.2,);",
54+
"required-after:theoneprobe@[1.12-1.4.28,);" +
55+
"required-after:appliedenergistics2@[v0.56.4,);" +
56+
"required-after:ae2fc@[2.6.3-r,);" +
57+
"required-after:configanytime@[2.0,);" +
58+
"required-after:mixinbooter@[8.0,);" +
59+
"required-after:lumenized@[1.0.2,);" +
60+
"after:fluxnetworks@[4.1.0,);",
6061
acceptedMinecraftVersions = "[1.12, 1.13)",
6162
acceptableRemoteVersions = "[1.21.7, 1.23.0)"
6263
)

src/main/java/github/kasuminova/novaeng/common/block/BlockDreamEnergyPort.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import net.minecraft.world.World;
1414
import net.minecraftforge.fml.relauncher.Side;
1515
import net.minecraftforge.fml.relauncher.SideOnly;
16+
import org.jetbrains.annotations.NotNull;
1617
import sonar.fluxnetworks.common.block.BlockFluxStorage;
1718
import sonar.fluxnetworks.common.registry.RegistryBlocks;
1819
import sonar.fluxnetworks.common.registry.RegistryItems;
@@ -45,7 +46,7 @@ public int getMaxStorage() {
4546

4647
@Override
4748
@SideOnly(Side.CLIENT)
48-
public void addInformation(ItemStack stack, @Nullable World player, List<String> tooltip, ITooltipFlag advanced) {
49+
public void addInformation(@NotNull ItemStack stack, @Nullable World player, @NotNull List<String> tooltip, @NotNull ITooltipFlag advanced) {
4950
super.addInformation(stack, player, tooltip, advanced);
5051
tooltip.add(I18n.format("text.dream_energy_port.0"));
5152
tooltip.add(I18n.format("text.dream_energy_port.1"));

src/main/java/github/kasuminova/novaeng/common/registry/RegistryBlocks.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
import net.minecraft.util.ResourceLocation;
8484
import net.minecraftforge.client.model.ModelLoader;
8585
import net.minecraftforge.event.RegistryEvent;
86+
import net.minecraftforge.fml.common.eventhandler.EventPriority;
8687
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
8788
import net.minecraftforge.fml.common.registry.GameRegistry;
8889

@@ -243,7 +244,7 @@ public static void registerBlockModel(final Block block) {
243244
ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(registryName, "inventory"));
244245
}
245246

246-
@SubscribeEvent
247+
@SubscribeEvent(priority = EventPriority.LOW)
247248
public void registerBlocks(RegistryEvent.Register<Block> event) {
248249
GenericRegistryPrimer.INSTANCE.wipe(event.getGenericType());
249250

0 commit comments

Comments
 (0)