diff --git a/northstar/src/main/java/com/lightning/northstar/contraptions/RocketControlPacket.java b/northstar/src/main/java/com/lightning/northstar/contraptions/RocketControlPacket.java index 051f2f8d8..e1e69f4fe 100644 --- a/northstar/src/main/java/com/lightning/northstar/contraptions/RocketControlPacket.java +++ b/northstar/src/main/java/com/lightning/northstar/contraptions/RocketControlPacket.java @@ -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; diff --git a/northstar/src/main/java/com/lightning/northstar/contraptions/RocketHandler.java b/northstar/src/main/java/com/lightning/northstar/contraptions/RocketHandler.java index cb6f8f49a..1794585b4 100644 --- a/northstar/src/main/java/com/lightning/northstar/contraptions/RocketHandler.java +++ b/northstar/src/main/java/com/lightning/northstar/contraptions/RocketHandler.java @@ -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; @@ -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 { @@ -62,8 +56,8 @@ public static void onWorldTick(TickEvent.LevelTickEvent event){ if(!CONTROL_QUEUE.isEmpty() && eventTickNumber > eventTickNumberCheck) { HashMap, Integer> destroy = new HashMap, Integer>(); for(Entry, 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) { @@ -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()); } } @@ -104,8 +98,8 @@ public static void onWorldTick(TickEvent.LevelTickEvent event){ if(!TICKET_QUEUE.isEmpty()) { List> DELETE_QUEUE = new ArrayList<>(); for(Pair 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); } diff --git a/northstar/src/main/java/com/lightning/northstar/world/WeatherStuff.java b/northstar/src/main/java/com/lightning/northstar/world/WeatherStuff.java index 5a992f05a..8f5b7ff23 100644 --- a/northstar/src/main/java/com/lightning/northstar/world/WeatherStuff.java +++ b/northstar/src/main/java/com/lightning/northstar/world/WeatherStuff.java @@ -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 { @@ -46,7 +45,7 @@ public Pair getWindDirection(ResourceKey lev){ if(managedPlanets.containsValue(lev)) { for(Entry, Pair>, ResourceKey> entries: managedPlanets.entrySet()) { if(entries.getValue() == lev) { - return entries.getKey().first; + return entries.getKey().getFirst(); } } @@ -58,7 +57,7 @@ public WeatherCondition getWeatherConditions(ResourceKey lev) { if(managedPlanets.containsValue(lev)) { for(Entry, Pair>, ResourceKey> entries: managedPlanets.entrySet()) { if(entries.getValue() == lev) { - return entries.getKey().second.first; + return entries.getKey().getSecond().getFirst(); } }