From 1a4adca4449efa9aa4ed487c6ff7e5bb600dcfde Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 16 May 2019 23:42:41 -0300 Subject: [PATCH] 1.14.2 pre 1 --- gradle.properties | 5 +-- src/main/java/carpet/utils/BlockInfo.java | 36 +++++++++---------- .../java/carpet/utils/CarpetProfiler.java | 2 +- src/main/java/carpet/utils/SpawnReporter.java | 2 +- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/gradle.properties b/gradle.properties index e5fd9308..86ded629 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.14.1 - yarn_mappings=1.14.1+build.2 + # or better: https://modmuss50.me/fabric.html + minecraft_version=1.14.2 Pre-Release 1 + yarn_mappings=1.14.2 Pre-Release 1+build.1 loader_version=0.4.7+build.147 # Mod Properties diff --git a/src/main/java/carpet/utils/BlockInfo.java b/src/main/java/carpet/utils/BlockInfo.java index cfcae6a2..7918b24b 100644 --- a/src/main/java/carpet/utils/BlockInfo.java +++ b/src/main/java/carpet/utils/BlockInfo.java @@ -45,7 +45,7 @@ public class BlockInfo put(BlockSoundGroup.SCAFFOLDING , "scaffolding" ); put(BlockSoundGroup.SWEET_BERRY_BUSH , "berry" ); put(BlockSoundGroup.CROP , "crop" ); - put(BlockSoundGroup.field_18852 , "gourd" ); + put(BlockSoundGroup.STEM , "stem" ); put(BlockSoundGroup.NETHER_WART , "wart" ); put(BlockSoundGroup.LANTERN , "lantern" ); }}; @@ -54,19 +54,19 @@ public class BlockInfo put(MaterialColor.AIR , "air" ); put(MaterialColor.GRASS , "grass" ); put(MaterialColor.SAND , "sand" ); - put(MaterialColor.WEB , "wool" ); - put(MaterialColor.LAVA , "tnt" ); + put(MaterialColor.WEB , "wool" ); + put(MaterialColor.LAVA , "tnt" ); put(MaterialColor.ICE , "ice" ); put(MaterialColor.IRON , "iron" ); put(MaterialColor.FOLIAGE , "foliage" ); - put(MaterialColor.WHITE , "snow" ); + put(MaterialColor.WHITE , "snow" ); put(MaterialColor.CLAY , "clay" ); put(MaterialColor.DIRT , "dirt" ); put(MaterialColor.STONE , "stone" ); put(MaterialColor.WATER , "water" ); put(MaterialColor.WOOD , "wood" ); put(MaterialColor.QUARTZ , "quartz" ); - put(MaterialColor.ORANGE , "adobe" ); + put(MaterialColor.ORANGE , "adobe" ); put(MaterialColor.MAGENTA , "magenta" ); put(MaterialColor.LIGHT_BLUE, "light_blue"); put(MaterialColor.YELLOW , "yellow" ); @@ -110,26 +110,26 @@ public class BlockInfo put(Material.STRUCTURE_VOID , "void" ); put(Material.PORTAL , "portal" ); put(Material.CARPET , "carpet" ); - put(Material.PLANT , "plant" ); + put(Material.PLANT , "plant" ); put(Material.UNDERWATER_PLANT , "water_plant" ); put(Material.REPLACEABLE_PLANT , "vine" ); - put(Material.SEAGRASS , "sea_grass" ); + put(Material.SEAGRASS , "sea_grass" ); put(Material.WATER , "water" ); put(Material.BUBBLE_COLUMN , "bubble_column"); put(Material.LAVA , "lava" ); put(Material.SNOW , "snow_layer" ); put(Material.FIRE , "fire" ); - put(Material.PART , "redstone_bits"); + put(Material.PART , "redstone_bits"); put(Material.COBWEB , "cobweb" ); - put(Material.REDSTONE_LAMP , "redstone_lamp"); + put(Material.REDSTONE_LAMP , "redstone_lamp"); put(Material.CLAY , "clay" ); - put(Material.EARTH , "dirt" ); - put(Material.ORGANIC , "grass" ); + put(Material.EARTH , "dirt" ); + put(Material.ORGANIC , "grass" ); 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.WOOD , "wool" ); // fix these put(Material.BAMBOO_SAPLING , "shoots" ); put(Material.BAMBOO , "bamboo" ); put(Material.TNT , "tnt" ); @@ -137,15 +137,15 @@ public class BlockInfo put(Material.GLASS , "glass" ); put(Material.ICE , "ice" ); put(Material.CACTUS , "cactus" ); - put(Material.STONE , "stone" ); - put(Material.METAL , "iron" ); - put(Material.SNOW_BLOCK , "snow" ); + put(Material.STONE , "stone" ); + put(Material.METAL , "iron" ); + put(Material.SNOW_BLOCK , "snow" ); put(Material.ANVIL , "anvil" ); put(Material.BARRIER , "barrier" ); put(Material.PISTON , "piston" ); - put(Material.UNUSED_PLANT , "coral" ); - put(Material.PUMPKIN , "gourd" ); - put(Material.DRAGON_EGG , "dragon_egg" ); + put(Material.UNUSED_PLANT , "coral" ); + put(Material.PUMPKIN , "gourd" ); + put(Material.EGG , "dragon_egg" ); put(Material.CAKE , "cake" ); }}; diff --git a/src/main/java/carpet/utils/CarpetProfiler.java b/src/main/java/carpet/utils/CarpetProfiler.java index d6c2124c..59f4aa18 100644 --- a/src/main/java/carpet/utils/CarpetProfiler.java +++ b/src/main/java/carpet/utils/CarpetProfiler.java @@ -120,7 +120,7 @@ public class CarpetProfiler return null; } String section = dimension+"."+ Registry.ENTITY_TYPE.getId(e.getType()).toString().replaceFirst("minecraft:",""); - if (e.getWorld().isClient) + if (e.getEntityWorld().isClient) section += "(client)"; long section_start = System.nanoTime(); return new ProfilerToken(section, section_start); diff --git a/src/main/java/carpet/utils/SpawnReporter.java b/src/main/java/carpet/utils/SpawnReporter.java index 8ba60f60..7e456c87 100644 --- a/src/main/java/carpet/utils/SpawnReporter.java +++ b/src/main/java/carpet/utils/SpawnReporter.java @@ -410,7 +410,7 @@ public class SpawnReporter } if (entity instanceof OcelotEntity) { - for (Entity e: entity.getWorld().getEntities(OcelotEntity.class, entity.getBoundingBox())) + for (Entity e: entity.getEntityWorld().getEntities(OcelotEntity.class, entity.getBoundingBox())) { e.remove(); }