icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated to 1.14.3 pre 2, still issues with fabric spawn tracking mappings

Browse Source
This commit is contained in:
gnembon committed 2019-06-07 11:51:11 -03:00
1 parent a5d83a0c53
commit f3da8b2576
31 files changed
+180 -173
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/commands/CarpetCommand.java
+4 -4
View File
@@ -10,7 +10,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.command.CommandManager;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.chat.BaseComponent;
import net.minecraft.text.BaseText;
import java.util.ArrayList;
import java.util.Arrays;
@@ -83,7 +83,7 @@ public class CarpetCommand
Arrays.stream(rule.getInfo()).forEach(s -> Messenger.m(player, "g "+s));
List<BaseComponent> tags = new ArrayList<>();
List<BaseText> tags = new ArrayList<>();
tags.add(Messenger.c("w Tags: "));
for (String t: rule.getTags())
{
@@ -94,7 +94,7 @@ public class CarpetCommand
Messenger.m(player, tags.toArray(new Object[0]));
Messenger.m(player, "w Current value: ",String.format("%s %s (%s value)",rule.getBoolValue()?"lb":"nb", rule.getStringValue(),rule.isDefault()?"default":"modified"));
List<BaseComponent> options = new ArrayList<>();
List<BaseText> options = new ArrayList<>();
options.add(Messenger.c("w Options: ", "y [ "));
for (String o: rule.getOptions())
{
@@ -133,7 +133,7 @@ public class CarpetCommand
}
private static BaseComponent displayInteractiveSetting(CarpetSettingEntry e)
private static BaseText displayInteractiveSetting(CarpetSettingEntry e)
{
List<Object> args = new ArrayList<>();
args.add("w - "+e.getName()+" ");
src/main/java/carpet/commands/CounterCommand.java
+3 -3
View File
@@ -9,7 +9,7 @@ import net.minecraft.command.CommandException;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.command.CommandManager;
import net.minecraft.util.DyeColor;
import net.minecraft.network.chat.BaseComponent;
import net.minecraft.text.BaseText;
public class CounterCommand
{
@@ -42,7 +42,7 @@ public class CounterCommand
HopperCounter counter = HopperCounter.getCounter(color);
if (counter == null) throw new CommandException(Messenger.s("Unknown wool color: "+color));
for (BaseComponent message: counter.format(source.getMinecraftServer(), realtime, false))
for (BaseText message: counter.format(source.getMinecraftServer(), realtime, false))
{
source.sendFeedback(message, false);
}
@@ -68,7 +68,7 @@ public class CounterCommand
private static int listAllCounters(ServerCommandSource source, boolean realtime)
{
for (BaseComponent message: HopperCounter.formatAll(source.getMinecraftServer(), realtime))
for (BaseText message: HopperCounter.formatAll(source.getMinecraftServer(), realtime))
{
source.sendFeedback(message, false);
}
src/main/java/carpet/commands/InfoCommand.java
+7 -7
View File
@@ -6,7 +6,7 @@ import carpet.utils.EntityInfo;
import carpet.utils.Messenger;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import net.minecraft.network.chat.BaseComponent;
import net.minecraft.text.BaseText;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.command.arguments.BlockPosArgumentType;
import net.minecraft.command.arguments.EntityArgumentType;
@@ -55,9 +55,9 @@ public class InfoCommand
dispatcher.register(command);
}
public static void printEntity(List<BaseComponent> messages, ServerCommandSource source, String grep)
public static void printEntity(List<BaseText> messages, ServerCommandSource source, String grep)
{
List<BaseComponent> actual = new ArrayList<>();
List<BaseText> actual = new ArrayList<>();
if (grep != null)
{
Pattern p = Pattern.compile(grep);
@@ -65,7 +65,7 @@ public class InfoCommand
boolean empty = true;
for (int i = 1; i<messages.size(); i++)
{
BaseComponent line = messages.get(i);
BaseText line = messages.get(i);
Matcher m = p.matcher(line.getString());
if (m.find())
{
@@ -86,7 +86,7 @@ public class InfoCommand
Messenger.send(source, actual);
}
public static void printBlock(List<BaseComponent> messages, ServerCommandSource source, String grep)
public static void printBlock(List<BaseText> messages, ServerCommandSource source, String grep)
{
Messenger.m(source, "");
if (grep != null)
@@ -95,7 +95,7 @@ public class InfoCommand
Messenger.m(source, messages.get(0));
for (int i = 1; i<messages.size(); i++)
{
BaseComponent line = messages.get(i);
BaseText line = messages.get(i);
Matcher m = p.matcher(line.getString());
if (m.find())
{
@@ -115,7 +115,7 @@ public class InfoCommand
{
for (Entity e: entities)
{
List<BaseComponent> report = EntityInfo.entityInfo(e, source.getWorld());
List<BaseText> report = EntityInfo.entityInfo(e, source.getWorld());
printEntity(report, source, grep);
}
return 1;
src/main/java/carpet/commands/TickCommand.java
+2 -2
View File
@@ -8,7 +8,7 @@ import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.chat.BaseComponent;
import net.minecraft.text.BaseText;
import net.minecraft.server.command.ServerCommandSource;
import static com.mojang.brigadier.arguments.FloatArgumentType.floatArg;
@@ -86,7 +86,7 @@ public class TickCommand
catch (CommandSyntaxException ignored)
{
}
BaseComponent message = TickSpeed.tickrate_advance(player, advance, tail_command, source);
BaseText message = TickSpeed.tickrate_advance(player, advance, tail_command, source);
if (message != null)
{
source.sendFeedback(message, false);