fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fabric port in progress

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-27 23:25:38 +02:00
parent 80fbb58d4f
commit b79cd732b2
368 changed files with 2498 additions and 2698 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/server/ServerHelper.java
+1 -1
View File
@@ -26,7 +26,7 @@ import net.minecraft.block.entity.BlockEntity;
import net.minecraft.client.util.InputMappings;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.MinecraftServer;
src/main/java/appeng/server/subcommands/ChunkLogger.java
+2 -2
View File
@@ -52,7 +52,7 @@ public class ChunkLogger implements ISubCommand {
@SubscribeEvent
public void onChunkLoadEvent(final ChunkEvent.Load event) {
if (!event.getWorld().isRemote()) {
if (!event.getWorld().isClient()) {
AELog.info("Chunk Loaded: " + event.getChunk().getPos().x + ", " + event.getChunk().getPos().z);
this.displayStack();
}
@@ -60,7 +60,7 @@ public class ChunkLogger implements ISubCommand {
@SubscribeEvent
public void onChunkUnloadEvent(final ChunkEvent.Unload unload) {
if (!unload.getWorld().isRemote()) {
if (!unload.getWorld().isClient()) {
AELog.info("Chunk Unloaded: " + unload.getChunk().getPos().x + ", " + unload.getChunk().getPos().z);
this.displayStack();
}
src/main/java/appeng/server/subcommands/Supporters.java
+2 -2
View File
@@ -23,7 +23,7 @@ import com.mojang.brigadier.context.CommandContext;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.text.LiteralText;
import appeng.server.ISubCommand;
@@ -33,6 +33,6 @@ public class Supporters implements ISubCommand {
public void call(final MinecraftServer srv, final CommandContext<ServerCommandSource> data, final ServerCommandSource sender) {
final String[] who = { "Stig Halvorsen", "Josh Ricker", "Jenny \"Othlon\" Sutherland", "Hristo Bogdanov",
"BevoLJ" };
sender.sendFeedback(new StringTextComponent("Special thanks to " + Joiner.on(", ").join(who)), true);
sender.sendFeedback(new LiteralText("Special thanks to " + Joiner.on(", ").join(who)), true);
}
}
src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java
+10 -10
View File
@@ -31,12 +31,12 @@ import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.text.Text;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.text.LiteralText;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.event.ClickEvent;
import net.minecraft.util.text.event.HoverEvent;
@@ -159,20 +159,20 @@ public class TestMeteoritesCommand implements ISubCommand {
Text restOfLine;
if (settings.getFallout() == null) {
restOfLine = new StringTextComponent(
restOfLine = new LiteralText(
String.format(Locale.ROOT, ", radius=%.2f [%s]", settings.getMeteoriteRadius(), state));
} else {
restOfLine = new StringTextComponent(String.format(Locale.ROOT, ", radius=%.2f, crater=%s, fallout=%s",
restOfLine = new LiteralText(String.format(Locale.ROOT, ", radius=%.2f, crater=%s, fallout=%s",
settings.getMeteoriteRadius(), settings.getCraterType().name().toLowerCase(),
settings.getFallout().name().toLowerCase()));
}
Text msg = new StringTextComponent(" #" + (i + 1) + " ");
msg.appendSibling(getClickablePosition(world, settings, pos)).appendSibling(restOfLine);
Text msg = new LiteralText(" #" + (i + 1) + " ");
msg.append(getClickablePosition(world, settings, pos)).append(restOfLine);
// Add a tooltip
Text tooltip = new StringTextComponent(settings.toString() + "\nBiome: ")
.appendSibling(world.getBiome(pos).getDisplayName());
Text tooltip = new LiteralText(settings.toString() + "\nBiome: ")
.append(world.getBiome(pos).getName());
msg.applyTextStyle(style -> style.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, tooltip)));
sender.sendFeedback(msg, true);
@@ -191,7 +191,7 @@ public class TestMeteoritesCommand implements ISubCommand {
String displayText = String.format(Locale.ROOT, "pos=%d,%d,%d", tpPos.getX(), tpPos.getY(), tpPos.getZ());
String tpCommand = String.format(Locale.ROOT, "/tp @s %d %d %d", tpPos.getX(), tpPos.getY(), tpPos.getZ());
return new StringTextComponent(displayText).applyTextStyle(TextFormatting.UNDERLINE)
return new LiteralText(displayText).applyTextStyle(TextFormatting.UNDERLINE)
.applyTextStyle(style -> style.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, tpCommand)));
}
@@ -206,7 +206,7 @@ public class TestMeteoritesCommand implements ISubCommand {
}
private static void sendLine(ServerCommandSource sender, String text, Object... args) {
sender.sendFeedback(new StringTextComponent(String.format(Locale.ROOT, text, args)), true);
sender.sendFeedback(new LiteralText(String.format(Locale.ROOT, text, args)), true);
}
}
src/main/java/appeng/server/subcommands/TestOreGenCommand.java
+3 -3
View File
@@ -30,11 +30,11 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.block.BlockState;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.MinecraftServer;
import net.minecraft.text.LiteralText;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.world.chunk.ChunkStatus;
import net.minecraft.world.chunk.IChunk;
import net.minecraft.world.dimension.DimensionType;
@@ -130,7 +130,7 @@ public class TestOreGenCommand implements ISubCommand {
}
private static void sendLine(ServerCommandSource sender, String text, Object... args) {
sender.sendFeedback(new StringTextComponent(String.format(Locale.ROOT, text, args)), true);
sender.sendFeedback(new LiteralText(String.format(Locale.ROOT, text, args)), true);
}
private static class Stats {