Split GuiType into ClientGuiType to remove some horrid code.

This commit is contained in:
modmuss50 2022-03-02 01:06:05 +00:00
parent c72f519248
commit 7065f5efae
117 changed files with 411 additions and 253 deletions

View file

@ -140,10 +140,4 @@ public class RebornCore implements ModInitializer {
public static EnvType getSide() {
return FabricLoader.getInstance().getEnvironmentType();
}
public static void clientOnly(Supplier<Runnable> runnable){
if(FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT){
runnable.get().run();
}
}
}

View file

@ -54,7 +54,7 @@ import reborncore.client.gui.builder.slot.GuiTab;
import reborncore.client.gui.builder.slot.SlotConfigGui;
import reborncore.client.gui.builder.widget.GuiButtonHologram;
import reborncore.client.gui.guibuilder.GuiBuilder;
import reborncore.client.screen.builder.BuiltScreenHandler;
import reborncore.common.screen.BuiltScreenHandler;
import reborncore.client.screen.builder.slot.PlayerInventorySlot;
import reborncore.common.blockentity.MachineBaseBlockEntity;
import reborncore.mixin.client.AccessorScreen;

View file

@ -37,7 +37,7 @@ import reborncore.client.gui.builder.GuiBase;
import reborncore.client.gui.builder.slot.elements.ConfigSlotElement;
import reborncore.client.gui.builder.slot.elements.ElementBase;
import reborncore.client.gui.builder.slot.elements.SlotType;
import reborncore.client.screen.builder.BuiltScreenHandler;
import reborncore.common.screen.BuiltScreenHandler;
import reborncore.common.blockentity.MachineBaseBlockEntity;
import reborncore.common.network.NetworkManager;
import reborncore.common.network.ServerBoundPackets;

View file

@ -33,6 +33,7 @@ import net.minecraft.util.math.Vec3d;
import org.apache.commons.lang3.Range;
import org.apache.commons.lang3.tuple.Pair;
import reborncore.common.blockentity.MachineBaseBlockEntity;
import reborncore.common.screen.BuiltScreenHandler;
import java.util.ArrayList;
import java.util.List;

View file

@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import reborncore.RebornCore;
import reborncore.client.ClientChunkManager;
import reborncore.client.screen.builder.BuiltScreenHandler;
import reborncore.common.screen.BuiltScreenHandler;
import reborncore.common.blockentity.FluidConfiguration;
import reborncore.common.blockentity.MachineBaseBlockEntity;
import reborncore.common.blockentity.SlotConfiguration;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package reborncore.client.screen.builder;
package reborncore.common.screen;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;

View file

@ -22,10 +22,10 @@
* SOFTWARE.
*/
package reborncore.client.screen;
package reborncore.common.screen;
import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.screen.builder.BuiltScreenHandler;
import reborncore.common.screen.BuiltScreenHandler;
public interface BuiltScreenHandlerProvider {
BuiltScreenHandler createScreenHandler(int syncID, PlayerEntity player);