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

Merge branch 'master' into 1.15

Browse Source 
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
This commit is contained in:
gnembon committed 2020-02-03 10:58:17 -04:00
2 parents c5afe202f7 eb7547072c
commit e04a8be9e8
6 files changed
+45 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/utils/BlockInfo.java
+9 -9
View File
@@ -82,8 +82,8 @@ public class BlockInfo
put(MaterialColor.DIAMOND , "diamond" );
put(MaterialColor.LAPIS , "lapis" );
put(MaterialColor.EMERALD , "emerald" );
put(MaterialColor.SPRUCE , "obsidian" );
put(MaterialColor.NETHER, "netherrack"); //TODO fix these
put(MaterialColor.SPRUCE , "obsidian" );
put(MaterialColor.NETHER , "netherrack"); //TODO fix these
put(MaterialColor.WHITE_TERRACOTTA , "white_terracotta" );
put(MaterialColor.ORANGE_TERRACOTTA , "orange_terracotta" );
put(MaterialColor.MAGENTA_TERRACOTTA , "magenta_terracotta" );
@@ -108,8 +108,8 @@ public class BlockInfo
put(Material.PORTAL , "portal" );
put(Material.CARPET , "carpet" );
put(Material.PLANT , "plant" );
put(Material.UNDERWATER_PLANT , "water_plant" );
put(Material.REPLACEABLE_PLANT , "vine" );
put(Material.UNDERWATER_PLANT, "water_plant" );
put(Material.REPLACEABLE_PLANT, "vine" );
put(Material.SEAGRASS , "sea_grass" );
put(Material.WATER , "water" );
put(Material.BUBBLE_COLUMN , "bubble_column");
@@ -117,7 +117,7 @@ public class BlockInfo
put(Material.SNOW , "snow_layer" );
put(Material.FIRE , "fire" );
put(Material.PART , "redstone_bits");
put(Material.COBWEB , "cobweb" );
put(Material.COBWEB , "cobweb" );
put(Material.REDSTONE_LAMP , "redstone_lamp");
put(Material.CLAY , "clay" );
put(Material.EARTH , "dirt" );
@@ -125,9 +125,9 @@ public class BlockInfo
put(Material.PACKED_ICE , "packed_ice" );
put(Material.SAND , "sand" );
put(Material.SPONGE , "sponge" );
put(Material.SHULKER_BOX , "wood" );
put(Material.WOOD , "wool" ); // fix these
put(Material.BAMBOO_SAPLING , "shoots" );
put(Material.SHULKER_BOX , "shulker" );
put(Material.WOOD , "wood" );
put(Material.BAMBOO_SAPLING , "shoots" );
put(Material.BAMBOO , "bamboo" );
put(Material.WOOL , "wool" );
put(Material.TNT , "tnt" );
@@ -136,7 +136,7 @@ public class BlockInfo
put(Material.ICE , "ice" );
put(Material.CACTUS , "cactus" );
put(Material.STONE , "stone" );
put(Material.METAL , "iron" );
put(Material.METAL , "metal" );
put(Material.SNOW_BLOCK , "snow" );
put(Material.ANVIL , "anvil" );
put(Material.BARRIER , "barrier" );
src/main/java/carpet/utils/HUDController.java
+7 -6
View File
@@ -5,19 +5,17 @@ import carpet.helpers.TickSpeed;
import carpet.logging.LoggerRegistry;
import carpet.logging.logHelpers.PacketCounter;
import carpet.mixins.PlayerListHeaderS2CPacketMixin;
import net.minecraft.entity.EntityCategory;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.client.network.packet.PlayerListHeaderS2CPacket;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.Pair;
import net.minecraft.util.math.MathHelper;
import net.minecraft.text.BaseText;
import net.minecraft.text.LiteralText;
import net.minecraft.world.dimension.DimensionType;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -102,9 +100,12 @@ public class HUDController
private static BaseText [] send_counter_info(MinecraftServer server, String color)
{
HopperCounter counter = HopperCounter.getCounter(color);
List <BaseText> res = counter == null ? Collections.emptyList() : counter.format(server, false, true);
return new BaseText[]{ Messenger.c(res.toArray(new Object[0]))};
List <BaseText> res = new ArrayList<>();
Arrays.asList(color.split(",")).forEach(c ->{
HopperCounter counter = HopperCounter.getCounter(c);
if (counter != null) res.addAll(counter.format(server, false, true));
});
return res.toArray(new BaseText[0]);
}
private static BaseText [] packetCounter()
{