Skip to content

Fixed an issue preventing the Mod from starting on a Dedicated Server #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OutCraft-Mods wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed an issue preventing the Mod from starting on a Dedicated Server #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions northstar/src/main/java/com/lightning/northstar/contraptions/RocketControlPacket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package com.lightning.northstar.contraptions;

import java.util.UUID;

import com.ibm.icu.impl.Pair;
import com.simibubi.create.foundation.networking.SimplePacketBase;

import com.simibubi.create.foundation.utility.Pair;
import net.minecraft.core.BlockPos;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraftforge.network.NetworkEvent.Context;

import java.util.UUID;

public class RocketControlPacket extends SimplePacketBase {
int rce;
UUID playerID;
Expand Down
26 changes: 10 additions & 16 deletions northstar/src/main/java/com/lightning/northstar/contraptions/RocketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
package com.lightning.northstar.contraptions;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;

import org.apache.commons.lang3.mutable.MutableInt;

import com.ibm.icu.impl.Pair;
import com.lightning.northstar.Northstar;
import com.lightning.northstar.NorthstarPackets;
import com.lightning.northstar.block.tech.rocket_station.RocketStationBlockEntity;
import com.lightning.northstar.world.dimension.NorthstarDimensions;

import com.simibubi.create.foundation.utility.Pair;
import net.minecraft.advancements.CriteriaTriggers;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
Expand Down Expand Up @@ -42,6 +32,10 @@
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
import net.minecraftforge.network.PacketDistributor;
import org.apache.commons.lang3.mutable.MutableInt;

import java.util.*;
import java.util.Map.Entry;

@EventBusSubscriber(modid = Northstar.MOD_ID, bus = Bus.FORGE)
public class RocketHandler {
Expand All @@ -62,8 +56,8 @@ public static void onWorldTick(TickEvent.LevelTickEvent event){
if(!CONTROL_QUEUE.isEmpty() && eventTickNumber > eventTickNumberCheck) {
HashMap<Pair<UUID, BlockPos>, Integer> destroy = new HashMap<Pair<UUID,BlockPos>, Integer>();
for(Entry<Pair<UUID, BlockPos>, Integer> entries : CONTROL_QUEUE.entrySet()) {
if(entries.getKey().first != null)
{Player player = event.level.getPlayerByUUID(entries.getKey().first);
if(entries.getKey().getFirst() != null)
{Player player = event.level.getPlayerByUUID(entries.getKey().getFirst());
if(player != null) {
RocketContraptionEntity rocket = ((RocketContraptionEntity)event.level.getEntity(entries.getValue()));
if(rocket != null) {
Expand All @@ -74,7 +68,7 @@ public static void onWorldTick(TickEvent.LevelTickEvent event){
}
}

rocket.handlePlayerInteraction(player, entries.getKey().second, Direction.NORTH, InteractionHand.MAIN_HAND);
rocket.handlePlayerInteraction(player, entries.getKey().getSecond(), Direction.NORTH, InteractionHand.MAIN_HAND);
destroy.put(entries.getKey(), entries.getValue());
}
}
Expand Down Expand Up @@ -104,8 +98,8 @@ public static void onWorldTick(TickEvent.LevelTickEvent event){
if(!TICKET_QUEUE.isEmpty()) {
List<Pair<Level, BlockPos>> DELETE_QUEUE = new ArrayList<>();
for(Pair<Level,BlockPos> entries : TICKET_QUEUE) {
if(event.level.dimension() == entries.first.dimension()) {
if(entries.first.getBlockEntity(entries.second) instanceof RocketStationBlockEntity rsbe) {
if(event.level.dimension() == entries.getFirst().dimension()) {
if(entries.getFirst().getBlockEntity(entries.getSecond()) instanceof RocketStationBlockEntity rsbe) {
rsbe.container.setItem(0, new ItemStack(Blocks.AIR.asItem()));
DELETE_QUEUE.add(entries);
}
Expand Down
13 changes: 6 additions & 7 deletions northstar/src/main/java/com/lightning/northstar/world/WeatherStuff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
package com.lightning.northstar.world;

import java.util.HashMap;
import java.util.Map.Entry;

import com.ibm.icu.impl.Pair;
import com.lightning.northstar.Northstar;
import com.lightning.northstar.world.dimension.NorthstarDimensions;

import com.simibubi.create.foundation.utility.Pair;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.level.Level;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;

import java.util.HashMap;
import java.util.Map.Entry;


@EventBusSubscriber(modid = Northstar.MOD_ID, bus = Bus.FORGE)
public class WeatherStuff {
Expand Down Expand Up @@ -46,7 +45,7 @@ public Pair<Direction,Direction> getWindDirection(ResourceKey<Level> lev){
if(managedPlanets.containsValue(lev)) {
for(Entry<Pair<Pair<Direction, Direction>, Pair<WeatherCondition, Integer>>, ResourceKey<Level>> entries: managedPlanets.entrySet()) {
if(entries.getValue() == lev) {
return entries.getKey().first;
return entries.getKey().getFirst();
}

}
Expand All @@ -58,7 +57,7 @@ public WeatherCondition getWeatherConditions(ResourceKey<Level> lev) {
if(managedPlanets.containsValue(lev)) {
for(Entry<Pair<Pair<Direction, Direction>, Pair<WeatherCondition, Integer>>, ResourceKey<Level>> entries: managedPlanets.entrySet()) {
if(entries.getValue() == lev) {
return entries.getKey().second.first;
return entries.getKey().getSecond().getFirst();
}

}
Expand Down