Update mappings to 09/21 snapshots.

Conflict with getMatrix in ITransformation, so renamed to getMatrixVec.
This commit is contained in:
LexManos committed 2018-09-22 03:40:22 -07:00
1 parent 5ed03945a0
commit 94e1a8e0a4
210 files changed
+1052 -978

No files matched your search

@@ -106,7 +106,7 @@ public class ChunkGenWorker implements IWorker
world = DimensionManager.getWorld(dim);
if (world == null)
{
listener.func_197030_a(new TextComponentTranslation("commands.forge.gen.dim_fail", dim), true);
listener.sendFeedback(new TextComponentTranslation("commands.forge.gen.dim_fail", dim), true);
queue.clear();
return false;
}
@@ -118,7 +118,7 @@ public class ChunkGenWorker implements IWorker
if (lastNotifcationTime < System.currentTimeMillis() - 10*1000)
{
listener.func_197030_a(new TextComponentTranslation("commands.forge.gen.progress", total - queue.size(), total), true);
listener.sendFeedback(new TextComponentTranslation("commands.forge.gen.progress", total - queue.size(), total), true);
lastNotifcationTime = System.currentTimeMillis();
}
return false;
@@ -136,7 +136,7 @@ public class ChunkGenWorker implements IWorker
if (++lastNotification >= notificationFrequency || lastNotifcationTime < System.currentTimeMillis() - 60*1000)
{
listener.func_197030_a(new TextComponentTranslation("commands.forge.gen.progress", total - queue.size(), total), true);
listener.sendFeedback(new TextComponentTranslation("commands.forge.gen.progress", total - queue.size(), total), true);
lastNotification = 0;
lastNotifcationTime = System.currentTimeMillis();
}
@@ -164,7 +164,7 @@ public class ChunkGenWorker implements IWorker
}
catch (IOException | SessionLockException e)
{
listener.func_197030_a(new TextComponentTranslation("commands.forge.gen.saveerror", e.getMessage()), true);
listener.sendFeedback(new TextComponentTranslation("commands.forge.gen.saveerror", e.getMessage()), true);
}
genned++;
}
@@ -179,7 +179,7 @@ public class ChunkGenWorker implements IWorker
if (queue.size() == 0)
{
listener.func_197030_a(new TextComponentTranslation("commands.forge.gen.complete", genned, total, dim), true);
listener.sendFeedback(new TextComponentTranslation("commands.forge.gen.complete", genned, total, dim), true);
if (keepingLoaded != null && keepingLoaded)
{
DimensionManager.keepDimensionLoaded(dim, false);
@@ -35,13 +35,13 @@ public class CommandDimensions
{
static ArgumentBuilder<CommandSource, ?> register()
{
return Commands.func_197057_a("dimensions")
.requires(cs->cs.func_197034_c(0)) //permission
return Commands.literal("dimensions")
.requires(cs->cs.hasPermissionLevel(0)) //permission
.executes(ctx -> {
ctx.getSource().func_197030_a(new TextComponentTranslation("commands.forge.dimensions.list"), true);
ctx.getSource().sendFeedback(new TextComponentTranslation("commands.forge.dimensions.list"), true);
for (Map.Entry<DimensionType, IntSortedSet> entry : DimensionManager.getRegisteredDimensions().entrySet())
{
ctx.getSource().func_197030_a(new TextComponentString(entry.getKey().getName() + ": " + entry.getValue()), true);
ctx.getSource().sendFeedback(new TextComponentString(entry.getKey().getName() + ": " + entry.getValue()), true);
}
return 0;
});
@@ -60,7 +60,7 @@ class CommandEntity
{
static ArgumentBuilder<CommandSource, ?> register()
{
return Commands.func_197057_a("entity")
return Commands.literal("entity")
.then(EntityListCommand.register()); //TODO: //Kill, spawn, etc..
}
@@ -71,17 +71,17 @@ class CommandEntity
private static final SimpleCommandExceptionType NO_ENTITIES = new SimpleCommandExceptionType(new TextComponentTranslation("commands.forge.entity.list.none"));
static ArgumentBuilder<CommandSource, ?> register()
{
return Commands.func_197057_a("list")
.requires(cs->cs.func_197034_c(2)) //permission
.then(Commands.func_197056_a("filter", StringArgumentType.string())
.suggests((ctx, builder) -> ISuggestionProvider.func_197013_a(ForgeRegistries.ENTITIES.getKeys().stream().map(id -> id.toString()), builder))
.then(Commands.func_197056_a("dim", IntegerArgumentType.integer())
.suggests((ctx, builder) -> ISuggestionProvider.func_197013_a(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder))
return Commands.literal("list")
.requires(cs->cs.hasPermissionLevel(2)) //permission
.then(Commands.argument("filter", StringArgumentType.string())
.suggests((ctx, builder) -> ISuggestionProvider.suggest(ForgeRegistries.ENTITIES.getKeys().stream().map(id -> id.toString()), builder))
.then(Commands.argument("dim", IntegerArgumentType.integer())
.suggests((ctx, builder) -> ISuggestionProvider.suggest(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder))
.executes(ctx -> execute(ctx.getSource(), StringArgumentType.getString(ctx, "filter"), IntegerArgumentType.getInteger(ctx, "dim")))
)
.executes(ctx -> execute(ctx.getSource(), StringArgumentType.getString(ctx, "filter"), ctx.getSource().func_197023_e().provider.getId()))
.executes(ctx -> execute(ctx.getSource(), StringArgumentType.getString(ctx, "filter"), ctx.getSource().getWorld().dimension.getId()))
)
.executes(ctx -> execute(ctx.getSource(), "*", ctx.getSource().func_197023_e().provider.getId()));
.executes(ctx -> execute(ctx.getSource(), "*", ctx.getSource().getWorld().dimension.getId()));
}
private static int execute(CommandSource sender, String filter, int dim) throws CommandSyntaxException
@@ -100,7 +100,7 @@ class CommandEntity
Map<ResourceLocation, MutablePair<Integer, Map<ChunkPos, Integer>>> list = Maps.newHashMap();
List<Entity> entities = world.loadedEntityList;
entities.forEach(e -> {
MutablePair<Integer, Map<ChunkPos, Integer>> info = list.computeIfAbsent(e.func_200600_R().getRegistryName(), k -> MutablePair.of(0, Maps.newHashMap()));
MutablePair<Integer, Map<ChunkPos, Integer>> info = list.computeIfAbsent(e.getType().getRegistryName(), k -> MutablePair.of(0, Maps.newHashMap()));
ChunkPos chunk = new ChunkPos(e.getPosition());
info.left++;
info.right.put(chunk, info.right.getOrDefault(chunk, 0) + 1);
@@ -113,7 +113,7 @@ class CommandEntity
if (info == null)
throw NO_ENTITIES.create();
sender.func_197030_a(new TextComponentTranslation("commands.forge.entity.list.single.header", name, info.getLeft()), true);
sender.sendFeedback(new TextComponentTranslation("commands.forge.entity.list.single.header", name, info.getLeft()), true);
List<Map.Entry<ChunkPos, Integer>> toSort = new ArrayList<>();
toSort.addAll(info.getRight().entrySet());
toSort.sort((a, b) -> {
@@ -127,7 +127,7 @@ class CommandEntity
for (Map.Entry<ChunkPos, Integer> e : toSort)
{
if (limit-- == 0) break;
sender.func_197030_a(new TextComponentString(" " + e.getValue() + ": " + e.getKey().x + ", " + e.getKey().z), true);
sender.sendFeedback(new TextComponentString(" " + e.getValue() + ": " + e.getKey().x + ", " + e.getKey().z), true);
}
return toSort.size();
}
@@ -153,8 +153,8 @@ class CommandEntity
throw NO_ENTITIES.create();
int count = info.stream().mapToInt(Pair::getRight).sum();
sender.func_197030_a(new TextComponentTranslation("commands.forge.entity.list.multiple.header", count), true);
info.forEach(e -> sender.func_197030_a(new TextComponentString(" " + e.getValue() + ": " + e.getKey()), true));
sender.sendFeedback(new TextComponentTranslation("commands.forge.entity.list.multiple.header", count), true);
info.forEach(e -> sender.sendFeedback(new TextComponentString(" " + e.getValue() + ": " + e.getKey()), true));
return info.size();
}
}
@@ -48,18 +48,18 @@ class CommandGenerate
{
static ArgumentBuilder<CommandSource, ?> register()
{
return Commands.func_197057_a("generate")
.requires(cs->cs.func_197034_c(4)) //permission
.then(Commands.func_197056_a("pos", BlockPosArgument.func_197276_a())
.then(Commands.func_197056_a("count", IntegerArgumentType.integer(1))
.then(Commands.func_197056_a("dim", IntegerArgumentType.integer())
.suggests((ctx, builder) -> ISuggestionProvider.func_197013_a(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder))
.then(Commands.func_197056_a("interval", IntegerArgumentType.integer())
.executes(ctx -> execute(ctx.getSource(), BlockPosArgument.func_197274_b(ctx, "pos"), getInt(ctx, "count"), getInt(ctx, "dim"), getInt(ctx, "interval")))
return Commands.literal("generate")
.requires(cs->cs.hasPermissionLevel(4)) //permission
.then(Commands.argument("pos", BlockPosArgument.blockPos())
.then(Commands.argument("count", IntegerArgumentType.integer(1))
.then(Commands.argument("dim", IntegerArgumentType.integer())
.suggests((ctx, builder) -> ISuggestionProvider.suggest(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder))
.then(Commands.argument("interval", IntegerArgumentType.integer())
.executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), getInt(ctx, "dim"), getInt(ctx, "interval")))
)
.executes(ctx -> execute(ctx.getSource(), BlockPosArgument.func_197274_b(ctx, "pos"), getInt(ctx, "count"), getInt(ctx, "dim"), -1))
.executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), getInt(ctx, "dim"), -1))
)
.executes(ctx -> execute(ctx.getSource(), BlockPosArgument.func_197274_b(ctx, "pos"), getInt(ctx, "count"), ctx.getSource().func_197023_e().provider.getId(), -1))
.executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), ctx.getSource().getWorld().dimension.getId(), -1))
)
);
}
@@ -74,7 +74,7 @@ class CommandGenerate
BlockPos chunkpos = new BlockPos(pos.getX() >> 4, 0, pos.getZ() >> 4);
ChunkGenWorker worker = new ChunkGenWorker(source, chunkpos, count, dim, interval);
source.func_197030_a(worker.getStartMessage(source), true);
source.sendFeedback(worker.getStartMessage(source), true);
WorldWorkerManager.addWorker(worker);
return 0;
@@ -56,15 +56,15 @@ public class CommandSetDimension
private static final DynamicCommandExceptionType INVALID_DIMENSION = new DynamicCommandExceptionType(dim -> new TextComponentTranslation("commands.forge.setdim.invalid.dim", dim));
static ArgumentBuilder<CommandSource, ?> register()
{
return Commands.func_197057_a("setdimension")
.requires(cs->cs.func_197034_c(2)) //permission
.then(Commands.func_197056_a("targets", EntityArgument.func_197093_b())
.then(Commands.func_197056_a("dim", IntegerArgumentType.integer())
.suggests((ctx, builder) -> ISuggestionProvider.func_197013_a(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder))
.then(Commands.func_197056_a("pos", BlockPosArgument.func_197276_a())
.executes(ctx -> execute(ctx.getSource(), EntityArgument.func_197087_c(ctx, "targets"), IntegerArgumentType.getInteger(ctx, "dim"), BlockPosArgument.func_197274_b(ctx, "pos")))
return Commands.literal("setdimension")
.requires(cs->cs.hasPermissionLevel(2)) //permission
.then(Commands.argument("targets", EntityArgument.multipleEntities())
.then(Commands.argument("dim", IntegerArgumentType.integer())
.suggests((ctx, builder) -> ISuggestionProvider.suggest(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder))
.then(Commands.argument("pos", BlockPosArgument.blockPos())
.executes(ctx -> execute(ctx.getSource(), EntityArgument.getEntitiesAllowingNone(ctx, "targets"), IntegerArgumentType.getInteger(ctx, "dim"), BlockPosArgument.getBlockPos(ctx, "pos")))
)
.executes(ctx -> execute(ctx.getSource(), EntityArgument.func_197087_c(ctx, "targets"), IntegerArgumentType.getInteger(ctx, "dim"), new BlockPos(ctx.getSource().func_197036_d())))
.executes(ctx -> execute(ctx.getSource(), EntityArgument.getEntitiesAllowingNone(ctx, "targets"), IntegerArgumentType.getInteger(ctx, "dim"), new BlockPos(ctx.getSource().getPos())))
)
);
}
@@ -79,7 +79,7 @@ public class CommandSetDimension
throw INVALID_DIMENSION.create(dim);
final ITeleporter teleporter = new CommandTeleporter(pos);
entities.stream().filter(e -> e.dimension == dim).forEach(e -> sender.func_197030_a(new TextComponentTranslation("commands.forge.setdim.invalid.nochange", e.getDisplayName(), dim), true));
entities.stream().filter(e -> e.dimension == dim).forEach(e -> sender.sendFeedback(new TextComponentTranslation("commands.forge.setdim.invalid.nochange", e.getDisplayName(), dim), true));
entities.stream().filter(e -> e.dimension != dim).forEach(e -> e.changeDimension(dim, teleporter));
return 0;
@@ -88,7 +88,7 @@ public class CommandSetDimension
private static boolean checkEntity(Entity entity)
{
// use vanilla portal logic, try to avoid doing anything too silly
return entity.isRiding() || entity.isBeingRidden() || entity.isNonBoss();
return entity.isPassenger() || entity.isBeingRidden() || entity.isNonBoss();
}
private static class CommandTeleporter implements ITeleporter
@@ -40,19 +40,19 @@ class CommandTps
static ArgumentBuilder<CommandSource, ?> register()
{
return Commands.func_197057_a("tps")
.requires(cs->cs.func_197034_c(0)) //permission
.then(Commands.func_197056_a("dim", IntegerArgumentType.integer())
.suggests((ctx, builder) -> ISuggestionProvider.func_197013_a(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder))
return Commands.literal("tps")
.requires(cs->cs.hasPermissionLevel(0)) //permission
.then(Commands.argument("dim", IntegerArgumentType.integer())
.suggests((ctx, builder) -> ISuggestionProvider.suggest(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder))
.executes(ctx -> sendTime(ctx.getSource(), IntegerArgumentType.getInteger(ctx, "dim")))
)
.executes(ctx -> {
for (Integer dim : (Iterable<Integer>)DimensionManager.getIDStream().sorted()::iterator)
sendTime(ctx.getSource(), dim);
double meanTickTime = mean(ctx.getSource().func_197028_i().tickTimeArray) * 1.0E-6D;
double meanTickTime = mean(ctx.getSource().getServer().tickTimeArray) * 1.0E-6D;
double meanTPS = Math.min(1000.0/meanTickTime, 20);
ctx.getSource().func_197030_a(new TextComponentTranslation("commands.forge.tps.summary.all", TIME_FORMATTER.format(meanTickTime), TIME_FORMATTER.format(meanTPS)), true);
ctx.getSource().sendFeedback(new TextComponentTranslation("commands.forge.tps.summary.all", TIME_FORMATTER.format(meanTickTime), TIME_FORMATTER.format(meanTPS)), true);
return 0;
}
@@ -76,9 +76,9 @@ class CommandTps
double worldTPS = Math.min(1000.0 / worldTickTime, 20);
DimensionType type = DimensionManager.getProviderType(dim);
if (type == null)
cs.func_197030_a(new TextComponentTranslation("commands.forge.tps.summary.basic", dim, TIME_FORMATTER.format(worldTickTime), TIME_FORMATTER.format(worldTPS)), true);
cs.sendFeedback(new TextComponentTranslation("commands.forge.tps.summary.basic", dim, TIME_FORMATTER.format(worldTickTime), TIME_FORMATTER.format(worldTPS)), true);
else
cs.func_197030_a(new TextComponentTranslation("commands.forge.tps.summary.named", dim, type.getName(), TIME_FORMATTER.format(worldTickTime), TIME_FORMATTER.format(worldTPS)), true);
cs.sendFeedback(new TextComponentTranslation("commands.forge.tps.summary.named", dim, type.getName(), TIME_FORMATTER.format(worldTickTime), TIME_FORMATTER.format(worldTPS)), true);
return 1;
}
@@ -58,7 +58,7 @@ class CommandTrack
static ArgumentBuilder<CommandSource, ?> register()
{
return Commands.func_197057_a("track")
return Commands.literal("track")
.then(StartTrackingCommand.register())
.then(ResetTrackingCommand.register())
.then(TrackResultsEntity.register())
@@ -70,26 +70,26 @@ class CommandTrack
{
static ArgumentBuilder<CommandSource, ?> register()
{
return Commands.func_197057_a("start")
.requires(cs->cs.func_197034_c(2)) //permission
.then(Commands.func_197057_a("te")
.then(Commands.func_197056_a("duration", IntegerArgumentType.integer(1))
return Commands.literal("start")
.requires(cs->cs.hasPermissionLevel(2)) //permission
.then(Commands.literal("te")
.then(Commands.argument("duration", IntegerArgumentType.integer(1))
.executes(ctx -> {
int duration = IntegerArgumentType.getInteger(ctx, "duration");
TimeTracker.TILE_ENTITY_UPDATE.reset();
TimeTracker.TILE_ENTITY_UPDATE.enable(duration);
ctx.getSource().func_197030_a(new TextComponentTranslation("commands.forge.tracking.te.enabled", duration), true);
ctx.getSource().sendFeedback(new TextComponentTranslation("commands.forge.tracking.te.enabled", duration), true);
return 0;
})
)
)
.then(Commands.func_197057_a("entity")
.then(Commands.func_197056_a("duration", IntegerArgumentType.integer(1))
.then(Commands.literal("entity")
.then(Commands.argument("duration", IntegerArgumentType.integer(1))
.executes(ctx -> {
int duration = IntegerArgumentType.getInteger(ctx, "duration");
TimeTracker.ENTITY_UPDATE.reset();
TimeTracker.ENTITY_UPDATE.enable(duration);
ctx.getSource().func_197030_a(new TextComponentTranslation("commands.forge.tracking.entity.enabled", duration), true);
ctx.getSource().sendFeedback(new TextComponentTranslation("commands.forge.tracking.entity.enabled", duration), true);
return 0;
})
)
@@ -101,19 +101,19 @@ class CommandTrack
{
static ArgumentBuilder<CommandSource, ?> register()
{
return Commands.func_197057_a("reset")
.requires(cs->cs.func_197034_c(2)) //permission
.then(Commands.func_197057_a("te")
return Commands.literal("reset")
.requires(cs->cs.hasPermissionLevel(2)) //permission
.then(Commands.literal("te")
.executes(ctx -> {
TimeTracker.TILE_ENTITY_UPDATE.reset();
ctx.getSource().func_197030_a(new TextComponentTranslation("commands.forge.tracking.te.reset"), true);
ctx.getSource().sendFeedback(new TextComponentTranslation("commands.forge.tracking.te.reset"), true);
return 0;
})
)
.then(Commands.func_197057_a("entity")
.then(Commands.literal("entity")
.executes(ctx -> {
TimeTracker.ENTITY_UPDATE.reset();
ctx.getSource().func_197030_a(new TextComponentTranslation("commands.forge.tracking.entity.reset"), true);
ctx.getSource().sendFeedback(new TextComponentTranslation("commands.forge.tracking.entity.reset"), true);
return 0;
})
);
@@ -143,14 +143,14 @@ class CommandTrack
List<ForgeTimings<T>> timingsList = getSortedTimings(tracker);
if (timingsList.isEmpty())
{
source.func_197030_a(new TextComponentTranslation("commands.forge.tracking.no_data"), true);
source.sendFeedback(new TextComponentTranslation("commands.forge.tracking.no_data"), true);
}
else
{
timingsList.stream()
.filter(timings -> timings.getObject().get() != null)
.limit(10)
.forEach(timings -> source.func_197030_a(toString.apply(timings), true));
.forEach(timings -> source.sendFeedback(toString.apply(timings), true));
}
return 0;
}
@@ -175,7 +175,7 @@ class CommandTrack
{
static ArgumentBuilder<CommandSource, ?> register()
{
return Commands.func_197057_a("entity").executes(ctx -> TrackResults.execute(ctx.getSource(), TimeTracker.ENTITY_UPDATE, data ->
return Commands.literal("entity").executes(ctx -> TrackResults.execute(ctx.getSource(), TimeTracker.ENTITY_UPDATE, data ->
{
Entity entity = data.getObject().get();
if (entity == null)
@@ -183,9 +183,9 @@ class CommandTrack
BlockPos pos = entity.getPosition();
double averageTimings = data.getAverageTimings();
String tickTime = (averageTimings > 1000 ? TIME_FORMAT.format(averageTimings / 1000) : TIME_FORMAT.format(averageTimings)) + (averageTimings < 1000 ? "µs" : "ms");
String tickTime = (averageTimings > 1000 ? TIME_FORMAT.format(averageTimings / 1000) : TIME_FORMAT.format(averageTimings)) + (averageTimings < 1000 ? "�s" : "ms");
return new TextComponentTranslation("commands.forge.tracking.timing_entry", entity.func_200600_R().getRegistryName(), TrackResults.getWorldName(entity.world.provider.getId()), pos.getX(), pos.getY(), pos.getZ(), tickTime);
return new TextComponentTranslation("commands.forge.tracking.timing_entry", entity.getType().getRegistryName(), TrackResults.getWorldName(entity.world.dimension.getId()), pos.getX(), pos.getY(), pos.getZ(), tickTime);
})
);
}
@@ -195,7 +195,7 @@ class CommandTrack
{
static ArgumentBuilder<CommandSource, ?> register()
{
return Commands.func_197057_a("te").executes(ctx -> TrackResults.execute(ctx.getSource(), TimeTracker.TILE_ENTITY_UPDATE, data ->
return Commands.literal("te").executes(ctx -> TrackResults.execute(ctx.getSource(), TimeTracker.TILE_ENTITY_UPDATE, data ->
{
TileEntity te = data.getObject().get();
if (te == null)
@@ -204,8 +204,8 @@ class CommandTrack
BlockPos pos = te.getPos();
double averageTimings = data.getAverageTimings();
String tickTime = (averageTimings > 1000 ? TIME_FORMAT.format(averageTimings / 1000) : TIME_FORMAT.format(averageTimings)) + (averageTimings < 1000 ? "µs" : "ms");
return new TextComponentTranslation("commands.forge.tracking.timing_entry", te.func_200662_C().getRegistryName(), TrackResults.getWorldName(te.getWorld().provider.getId()), pos.getX(), pos.getY(), pos.getZ(), tickTime);
String tickTime = (averageTimings > 1000 ? TIME_FORMAT.format(averageTimings / 1000) : TIME_FORMAT.format(averageTimings)) + (averageTimings < 1000 ? "�s" : "ms");
return new TextComponentTranslation("commands.forge.tracking.timing_entry", te.getType().getRegistryName(), TrackResults.getWorldName(te.getWorld().dimension.getId()), pos.getX(), pos.getY(), pos.getZ(), tickTime);
})
);
}