Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.silvermoon.boxplusplus.common;

import static com.silvermoon.boxplusplus.common.loader.RecipeLoader.loadAddUpgradeModuleRecipe;

import net.minecraftforge.common.MinecraftForge;

import com.silvermoon.boxplusplus.common.config.Config;
Expand Down Expand Up @@ -48,7 +46,5 @@ public void serverStarting(FMLServerStartingEvent event) {
new RecipeLoader().run();
}

public void serverStarted(FMLServerStartedEvent event) {
loadAddUpgradeModuleRecipe();
}
public void serverStarted(FMLServerStartedEvent event) {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public void run() {
addMachineBlockRecipe();
addModuleRecipe();
addRingRecipe();
addUpgradeModuleRecipe();
}

public static boolean hasLoadedAddUpgradeModuleRecipe = false;
Expand All @@ -34,10 +35,14 @@ public static void loadAddUpgradeModuleRecipe() {
return;
}
hasLoadedAddUpgradeModuleRecipe = true;
addBoxRecipe();
addMachineBlockRecipe();
addModuleRecipe();
addRingRecipe();
addUpgradeModuleRecipe();
}

public void addBoxRecipe() {
public static void addBoxRecipe() {
GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 13532))
.metadata(RESEARCH_TIME, 64000)
Expand Down Expand Up @@ -67,7 +72,7 @@ public void addBoxRecipe() {
.addTo(AssemblyLine);
}

public void addMachineBlockRecipe() {
public static void addMachineBlockRecipe() {
GTValues.RA.stdBuilder()
.itemOutputs(new ItemStack(BlockRegister.SpaceExtend, 32, 0))
.itemInputs(
Expand Down Expand Up @@ -136,7 +141,7 @@ public void addMachineBlockRecipe() {
(int) TierEU.RECIPE_UEV);
}

public void addRingRecipe() {
public static void addRingRecipe() {
GTValues.RA.stdBuilder()
.itemOutputs(new ItemStack(BlockRegister.BoxRing, 1, 0))
.itemInputs(
Expand Down Expand Up @@ -200,7 +205,7 @@ public void addRingRecipe() {
}

// Normally - R1-Assembler; R2-AssemblyLine; R3-ResearchAssemblyLine
public void addModuleRecipe() {
public static void addModuleRecipe() {
GTValues.RA.stdBuilder()
.itemOutputs(new ItemStack(BlockRegister.BoxModule, 1, 0))
.itemInputs(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ public void PlayerJoinServerEvent(PlayerEvent.PlayerLoggedInEvent event) {
LOG.info("PlayerJoinServerEvent running");
if (event == null || !(event.player instanceof EntityPlayerMP player) || !SideReference.Side.Server) return;
NetworkLoader.instance.sendTo(new ServerJoinedPacket(), player);
LOG.info("PlayerJoinedPacket run finished");
LOG.info("PlayerJoinServerEvent run finished");
}
}