Skip to content

Commit 1ba697e

Browse files
author
Beecube31
committed
fix serverside crashes
1 parent f32a6df commit 1ba697e

File tree

10 files changed

+62
-32
lines changed

10 files changed

+62
-32
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ modGroup=dev.beecube31.crazyae2
66
# This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
77
modVersion=
88
# The name of your jar when you produce builds, not including any versioning info
9-
modArchivesBaseName=CrazyAE-v0.4
9+
modArchivesBaseName=CrazyAE-v0.4.0.1
1010
# Will update your build.gradle automatically whenever an update is available
1111
autoUpdateBuildScript=false
1212
minecraftVersion=1.12.2

src/main/java/dev/beecube31/crazyae2/common/registration/definitions/Items.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import dev.beecube31.crazyae2.integrations.jei.JEIPlugin;
2222
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
2323
import net.minecraft.item.ItemStack;
24+
import net.minecraftforge.fml.common.Loader;
2425

2526
import java.util.Arrays;
2627
import java.util.Map;
@@ -273,12 +274,15 @@ public Items(Registry registry) {
273274
.features(Features.STUB)
274275
.build());
275276

276-
JEIPlugin.hideItemFromJEI(this.manaAsAEStack = this.registerById(registry.item("mana_as_aestack", ManaAsAEStack::new)
277-
.ifModPresent("botania")
278-
.features(Features.MANA_BUSES, Features.MANA_TERM, Features.MANA_CELLS, Features.MANA_DENSE_CELLS, Features.MEGA_MANA_DENSE_CELLS)
279-
.hide()
280-
.build())
281-
);
277+
this.manaAsAEStack = this.registerById(registry.item("mana_as_aestack", ManaAsAEStack::new)
278+
.ifModPresent("botania")
279+
.features(Features.MANA_BUSES, Features.MANA_TERM, Features.MANA_CELLS, Features.MANA_DENSE_CELLS, Features.MEGA_MANA_DENSE_CELLS)
280+
.hide()
281+
.build());
282+
283+
if (Loader.isModLoaded("jei")) {
284+
JEIPlugin.hideItemFromJEI(this.manaAsAEStack);
285+
}
282286

283287
registry.addBootstrapComponent((IPostInitComponent) r -> {
284288
IItems enabledItems = AEApi.instance().definitions().items();

src/main/java/dev/beecube31/crazyae2/core/CrazyAE.java

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@
44
import appeng.api.networking.IGridCacheRegistry;
55
import appeng.container.implementations.ContainerMEPortableCell;
66
import appeng.core.Api;
7+
import appeng.util.Platform;
78
import dev.beecube31.crazyae2.Tags;
89
import dev.beecube31.crazyae2.common.features.Features;
910
import dev.beecube31.crazyae2.common.items.cells.ImprovedPortableCell;
1011
import dev.beecube31.crazyae2.common.networking.CrazyAENetworkHandler;
1112
import dev.beecube31.crazyae2.common.networking.network.NetworkHandler;
1213
import dev.beecube31.crazyae2.common.registration.Registration;
1314
import dev.beecube31.crazyae2.common.sync.CrazyAEGuiHandler;
14-
import dev.beecube31.crazyae2.core.cache.impl.GridChannelBoostersCache;
1515
import dev.beecube31.crazyae2.core.cache.IGridChannelBoostersCache;
16+
import dev.beecube31.crazyae2.core.cache.impl.GridChannelBoostersCache;
1617
import dev.beecube31.crazyae2.core.client.CrazyAEClientConfig;
17-
import dev.beecube31.crazyae2.core.helpers.ClientHelper;
18+
import dev.beecube31.crazyae2.core.helpers.Helper;
1819
import net.minecraft.entity.player.EntityPlayer;
1920
import net.minecraft.entity.player.InventoryPlayer;
2021
import net.minecraft.item.ItemStack;
@@ -24,6 +25,7 @@
2425
import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
2526
import net.minecraftforge.fml.common.Mod;
2627
import net.minecraftforge.fml.common.Mod.EventHandler;
28+
import net.minecraftforge.fml.common.SidedProxy;
2729
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
2830
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
2931
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -47,8 +49,8 @@
4749
public class CrazyAE {
4850
public static CrazyAE instance;
4951

50-
@SideOnly(Side.CLIENT)
51-
private static final ClientHelper clientHelper = new ClientHelper();
52+
@SidedProxy(clientSide = "dev.beecube31.crazyae2.core.helpers.ClientHelper", serverSide = "dev.beecube31.crazyae2.core.helpers.ServerHelper", modId = Tags.MODID)
53+
public static Helper proxy;
5254

5355
private static FeatureManager featureManager;
5456
private final Logger logger = LogManager.getLogger(Tags.MODID.toUpperCase());
@@ -90,18 +92,21 @@ public void preInit(FMLPreInitializationEvent event) {
9092
this.registration = new Registration();
9193

9294
CrazyAE.instance = this;
93-
CrazyAEClientConfig.init(
94-
new Configuration(
95-
new File(
96-
event.getModConfigurationDirectory().getPath(),
97-
"crazyae-client.cfg"
98-
)
99-
)
100-
);
10195

10296
NetworkRegistry.INSTANCE.registerGuiHandler(this, this.crazyAEGuiHandler = new CrazyAEGuiHandler());
10397

104-
clientHelper.preinit();
98+
if (Platform.isClient()) {
99+
CrazyAE.proxy.preinit();
100+
CrazyAEClientConfig.init(
101+
new Configuration(
102+
new File(
103+
event.getModConfigurationDirectory().getPath(),
104+
"crazyae-client.cfg"
105+
)
106+
)
107+
);
108+
}
109+
105110

106111
MinecraftForge.EVENT_BUS.register(instance);
107112

@@ -112,7 +117,7 @@ public void preInit(FMLPreInitializationEvent event) {
112117
public void init(FMLInitializationEvent event) {
113118
this.registration.init(event);
114119

115-
clientHelper.init();
120+
CrazyAE.proxy.init();
116121

117122
if (!CrazyAEConfig.disableUpdatesCheck) {
118123
MinecraftForge.EVENT_BUS.register(new UpdateChecker());
@@ -132,7 +137,7 @@ public void postInit(FMLPostInitializationEvent event) {
132137
this.icon = CrazyAE.definitions().items().storageCell1MB().maybeStack(1).orElse(ItemStack.EMPTY);
133138
}
134139

135-
clientHelper.postinit();
140+
CrazyAE.proxy.postinit();
136141

137142
NetworkHandler.init("CrazyAE");
138143
this.registration.postInit(event);

src/main/java/dev/beecube31/crazyae2/core/ModVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
public class ModVersion {
44

55
public static String get() {
6-
return "v0.4";
6+
return "v0.4.0.1";
77
}
88
}

src/main/java/dev/beecube31/crazyae2/core/client/CrazyAEClientConfig.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@
77
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
88
import net.minecraftforge.fml.common.Mod;
99
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
10-
import net.minecraftforge.fml.relauncher.Side;
11-
import net.minecraftforge.fml.relauncher.SideOnly;
1210

1311
@SuppressWarnings("unused")
1412
@Mod.EventBusSubscriber(modid = Tags.MODID)
1513
@Config(modid = Tags.MODID, name = "crazyae-client", category = "client")
16-
@SideOnly(Side.CLIENT)
1714
public final class CrazyAEClientConfig extends Configuration {
1815

1916
private static Configuration config;

src/main/java/dev/beecube31/crazyae2/core/helpers/ClientHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import net.minecraft.client.Minecraft;
66
import net.minecraftforge.common.MinecraftForge;
77

8-
public class ClientHelper {
8+
public class ClientHelper implements Helper {
99

1010
public void preinit() {
1111
MinecraftForge.EVENT_BUS.register(this);
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package dev.beecube31.crazyae2.core.helpers;
2+
3+
public interface Helper {
4+
void preinit();
5+
6+
void init();
7+
8+
void postinit();
9+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package dev.beecube31.crazyae2.core.helpers;
2+
3+
import net.minecraftforge.common.MinecraftForge;
4+
5+
public class ServerHelper implements Helper {
6+
7+
public void preinit() {
8+
MinecraftForge.EVENT_BUS.register(this);
9+
}
10+
11+
public void init() {
12+
13+
}
14+
15+
public void postinit() {
16+
17+
}
18+
}

src/main/java/dev/beecube31/crazyae2/integrations/jei/JEIPlugin.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77
import mezz.jei.api.IModRegistry;
88
import mezz.jei.api.ISubtypeRegistry;
99
import mezz.jei.api.recipe.IRecipeCategoryRegistration;
10-
import net.minecraftforge.fml.relauncher.Side;
11-
import net.minecraftforge.fml.relauncher.SideOnly;
1210
import org.jetbrains.annotations.NotNull;
1311

1412
import java.util.ArrayList;
1513
import java.util.List;
1614

1715
@mezz.jei.api.JEIPlugin
18-
@SideOnly(Side.CLIENT)
1916
public class JEIPlugin implements IModPlugin {
2017
public static IJeiRuntime runtime;
2118
public static CrazyAEGuiHandler aeGuiHandler;

version.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version:v0.4
1+
version:v0.4.0.1
22
link:https://www.curseforge.com/minecraft/mc-mods/crazyae/files/all?showAlphaFiles=show
3-
desc: - Botania automatization, Autocrafting optimizations, Custom GUI's and many QoL fixes!
3+
desc: - fix serverside crashes

0 commit comments

Comments
 (0)