Bump Forge, fix commands on newer Forge

This commit is contained in:
Hubry committed 2020-07-22 00:47:46 +02:00
1 parent 2d4805930e
commit 4e35b04c6b
3 files changed
+9 -9

No files matched your search

+3 -3
View File
@@ -108,7 +108,7 @@ test {
}
dependencies {
minecraft "net.minecraftforge:forge:${mc_version}-32.0.66"
minecraft "net.minecraftforge:forge:${mc_version}-32.0.71"
compile 'org.spongepowered:mixin:0.8'
compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-39:api")
runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-39")
@@ -116,8 +116,8 @@ dependencies {
compileOnly fg.deobf("mezz.jei:jei-1.16.1:7.0.0.2:api")
runtimeOnly fg.deobf("mezz.jei:jei-1.16.1:7.0.0.2")
compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.16.1-3.0-beta2:api")
runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.16.1-3.0-beta2")
compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.16.1-3.0:api")
runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.16.1-3.0")
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.1'
@@ -31,6 +31,7 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.CapabilityManager;
import net.minecraftforge.common.loot.GlobalLootModifierSerializer;
import net.minecraftforge.event.RegisterCommandsEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.DeferredWorkQueue;
@@ -42,7 +43,6 @@ import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -158,7 +158,7 @@ public class Botania {
IEventBus forgeBus = MinecraftForge.EVENT_BUS;
forgeBus.addListener(this::serverAboutToStart);
forgeBus.addListener(this::serverStarting);
forgeBus.addListener(this::registerCommands);
forgeBus.addListener(this::serverStopping);
forgeBus.addListener(ItemLokiRing::onPlayerInteract);
forgeBus.addListener(ItemOdinRing::onPlayerAttacked);
@@ -290,9 +290,9 @@ public class Botania {
}
}
private void serverStarting(FMLServerStartingEvent event) {
private void registerCommands(RegisterCommandsEvent event) {
if (Botania.gardenOfGlassLoaded) {
SkyblockCommand.register(event.getCommandDispatcher());
SkyblockCommand.register(event.getDispatcher());
}
}
+2 -2
View File
@@ -16,7 +16,7 @@ Botania is a mod that adds nature magic to Minecraft'''
[[dependencies.botania]]
modId="forge"
mandatory=true
versionRange="[32.0.24,)"
versionRange="[32.0.68,)"
ordering="NONE"
side="BOTH"
@@ -29,6 +29,6 @@ Botania is a mod that adds nature magic to Minecraft'''
[[dependencies.botania]]
modId="curios"
mandatory=false
versionRange="[FORGE-1.15.2-2.0,)"
versionRange="[FORGE-1.16.1-3.0,)"
ordering="AFTER"
side="BOTH"