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

1.16 port

Browse Source
This commit is contained in:
yueh
2020-07-22 16:44:42 +02:00
parent 662dbca3e1
commit 56ecda5173
225 changed files with 1214 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java
+8 -7
View File
@@ -40,9 +40,10 @@ import net.minecraft.util.text.StringTextComponent;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.event.ClickEvent;
import net.minecraft.util.text.event.HoverEvent;
import net.minecraft.world.DimensionType;
import net.minecraft.world.World;
import net.minecraft.world.chunk.ChunkStatus;
import net.minecraft.world.chunk.IChunk;
import net.minecraft.world.dimension.DimensionType;
import net.minecraft.world.gen.ChunkGenerator;
import net.minecraft.world.gen.Heightmap;
import net.minecraft.world.gen.feature.structure.StructureStart;
@@ -86,13 +87,13 @@ public class TestMeteoritesCommand implements ISubCommand {
world = player.getServerWorld();
centerBlock = new BlockPos(player.getPosX(), 0, player.getPosZ());
} else {
world = srv.getWorld(DimensionType.OVERWORLD);
centerBlock = world.getSpawnPoint();
world = srv.getWorld(World.field_234918_g_);
centerBlock = world.func_241135_u_();
}
ChunkPos center = new ChunkPos(centerBlock);
ChunkGenerator<?> generator = world.getChunkProvider().getChunkGenerator();
ChunkGenerator generator = world.getChunkProvider().getChunkGenerator();
// Find all meteorites in the given rectangle
List<PlacedMeteoriteSettings> found = new ArrayList<>();
@@ -168,11 +169,11 @@ public class TestMeteoritesCommand implements ISubCommand {
}
ITextComponent msg = new StringTextComponent(" #" + (i + 1) + " ");
msg.appendSibling(getClickablePosition(world, settings, pos)).appendSibling(restOfLine);
msg.deepCopy().func_230529_a_(getClickablePosition(world, settings, pos)).appendSibling(restOfLine);
// Add a tooltip
ITextComponent tooltip = new StringTextComponent(settings.toString() + "\nBiome: ")
.appendSibling(world.getBiome(pos).getDisplayName());
ITextComponent tooltip = new StringTextComponent(settings.toString() + "\nBiome: ").deepCopy()
.func_230529_a_(world.getBiome(pos).getDisplayName());
msg.applyTextStyle(style -> style.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, tooltip)));
sender.sendFeedback(msg, true);
src/main/java/appeng/server/subcommands/TestOreGenCommand.java
+5 -4
View File
@@ -35,9 +35,10 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.world.DimensionType;
import net.minecraft.world.World;
import net.minecraft.world.chunk.ChunkStatus;
import net.minecraft.world.chunk.IChunk;
import net.minecraft.world.dimension.DimensionType;
import net.minecraft.world.server.ServerWorld;
import appeng.core.Api;
@@ -68,8 +69,8 @@ public class TestOreGenCommand implements ISubCommand {
world = player.getServerWorld();
center = new BlockPos(player.getPosX(), 0, player.getPosZ());
} catch (CommandSyntaxException e) {
world = srv.getWorld(DimensionType.OVERWORLD);
center = world.getSpawnPoint();
world = srv.getWorld(World.field_234918_g_);
center = world.func_241135_u_();
}
ChunkPos tl = new ChunkPos(center.add(-radius, 0, -radius));
@@ -112,7 +113,7 @@ public class TestOreGenCommand implements ISubCommand {
blockPos.setX(x);
for (int z = cp.getZStart(); z <= cp.getZEnd(); z++) {
blockPos.setZ(z);
for (int y = 0; y < world.getMaxHeight(); y++) {
for (int y = 0; y < world.func_234938_ad_(); y++) {
blockPos.setY(y);
BlockState state = chunk.getBlockState(blockPos);
if (state == quartzOre || state == chargedQuartzOre) {