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

1.14.2 pre 1

Browse Source
This commit is contained in:
gnembon committed 2019-05-16 23:42:41 -03:00
1 parent 48ff85293f
commit 1a4adca444
4 files changed
+23 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+3 -2
View File
@@ -3,8 +3,9 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
minecraft_version=1.14.1 # or better: https://modmuss50.me/fabric.html
yarn_mappings=1.14.1+build.2 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 loader_version=0.4.7+build.147
# Mod Properties # Mod Properties
src/main/java/carpet/utils/BlockInfo.java
+18 -18
View File
@@ -45,7 +45,7 @@ public class BlockInfo
put(BlockSoundGroup.SCAFFOLDING , "scaffolding" ); put(BlockSoundGroup.SCAFFOLDING , "scaffolding" );
put(BlockSoundGroup.SWEET_BERRY_BUSH , "berry" ); put(BlockSoundGroup.SWEET_BERRY_BUSH , "berry" );
put(BlockSoundGroup.CROP , "crop" ); put(BlockSoundGroup.CROP , "crop" );
put(BlockSoundGroup.field_18852 , "gourd" ); put(BlockSoundGroup.STEM , "stem" );
put(BlockSoundGroup.NETHER_WART , "wart" ); put(BlockSoundGroup.NETHER_WART , "wart" );
put(BlockSoundGroup.LANTERN , "lantern" ); put(BlockSoundGroup.LANTERN , "lantern" );
}}; }};
@@ -54,19 +54,19 @@ public class BlockInfo
put(MaterialColor.AIR , "air" ); put(MaterialColor.AIR , "air" );
put(MaterialColor.GRASS , "grass" ); put(MaterialColor.GRASS , "grass" );
put(MaterialColor.SAND , "sand" ); put(MaterialColor.SAND , "sand" );
put(MaterialColor.WEB , "wool" ); put(MaterialColor.WEB , "wool" );
put(MaterialColor.LAVA , "tnt" ); put(MaterialColor.LAVA , "tnt" );
put(MaterialColor.ICE , "ice" ); put(MaterialColor.ICE , "ice" );
put(MaterialColor.IRON , "iron" ); put(MaterialColor.IRON , "iron" );
put(MaterialColor.FOLIAGE , "foliage" ); put(MaterialColor.FOLIAGE , "foliage" );
put(MaterialColor.WHITE , "snow" ); put(MaterialColor.WHITE , "snow" );
put(MaterialColor.CLAY , "clay" ); put(MaterialColor.CLAY , "clay" );
put(MaterialColor.DIRT , "dirt" ); put(MaterialColor.DIRT , "dirt" );
put(MaterialColor.STONE , "stone" ); put(MaterialColor.STONE , "stone" );
put(MaterialColor.WATER , "water" ); put(MaterialColor.WATER , "water" );
put(MaterialColor.WOOD , "wood" ); put(MaterialColor.WOOD , "wood" );
put(MaterialColor.QUARTZ , "quartz" ); put(MaterialColor.QUARTZ , "quartz" );
put(MaterialColor.ORANGE , "adobe" ); put(MaterialColor.ORANGE , "adobe" );
put(MaterialColor.MAGENTA , "magenta" ); put(MaterialColor.MAGENTA , "magenta" );
put(MaterialColor.LIGHT_BLUE, "light_blue"); put(MaterialColor.LIGHT_BLUE, "light_blue");
put(MaterialColor.YELLOW , "yellow" ); put(MaterialColor.YELLOW , "yellow" );
@@ -110,26 +110,26 @@ public class BlockInfo
put(Material.STRUCTURE_VOID , "void" ); put(Material.STRUCTURE_VOID , "void" );
put(Material.PORTAL , "portal" ); put(Material.PORTAL , "portal" );
put(Material.CARPET , "carpet" ); put(Material.CARPET , "carpet" );
put(Material.PLANT , "plant" ); put(Material.PLANT , "plant" );
put(Material.UNDERWATER_PLANT , "water_plant" ); put(Material.UNDERWATER_PLANT , "water_plant" );
put(Material.REPLACEABLE_PLANT , "vine" ); put(Material.REPLACEABLE_PLANT , "vine" );
put(Material.SEAGRASS , "sea_grass" ); put(Material.SEAGRASS , "sea_grass" );
put(Material.WATER , "water" ); put(Material.WATER , "water" );
put(Material.BUBBLE_COLUMN , "bubble_column"); put(Material.BUBBLE_COLUMN , "bubble_column");
put(Material.LAVA , "lava" ); put(Material.LAVA , "lava" );
put(Material.SNOW , "snow_layer" ); put(Material.SNOW , "snow_layer" );
put(Material.FIRE , "fire" ); put(Material.FIRE , "fire" );
put(Material.PART , "redstone_bits"); put(Material.PART , "redstone_bits");
put(Material.COBWEB , "cobweb" ); put(Material.COBWEB , "cobweb" );
put(Material.REDSTONE_LAMP , "redstone_lamp"); put(Material.REDSTONE_LAMP , "redstone_lamp");
put(Material.CLAY , "clay" ); put(Material.CLAY , "clay" );
put(Material.EARTH , "dirt" ); put(Material.EARTH , "dirt" );
put(Material.ORGANIC , "grass" ); put(Material.ORGANIC , "grass" );
put(Material.PACKED_ICE , "packed_ice" ); put(Material.PACKED_ICE , "packed_ice" );
put(Material.SAND , "sand" ); put(Material.SAND , "sand" );
put(Material.SPONGE , "sponge" ); put(Material.SPONGE , "sponge" );
put(Material.SHULKER_BOX , "wood" ); 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_SAPLING , "shoots" );
put(Material.BAMBOO , "bamboo" ); put(Material.BAMBOO , "bamboo" );
put(Material.TNT , "tnt" ); put(Material.TNT , "tnt" );
@@ -137,15 +137,15 @@ public class BlockInfo
put(Material.GLASS , "glass" ); put(Material.GLASS , "glass" );
put(Material.ICE , "ice" ); put(Material.ICE , "ice" );
put(Material.CACTUS , "cactus" ); put(Material.CACTUS , "cactus" );
put(Material.STONE , "stone" ); put(Material.STONE , "stone" );
put(Material.METAL , "iron" ); put(Material.METAL , "iron" );
put(Material.SNOW_BLOCK , "snow" ); put(Material.SNOW_BLOCK , "snow" );
put(Material.ANVIL , "anvil" ); put(Material.ANVIL , "anvil" );
put(Material.BARRIER , "barrier" ); put(Material.BARRIER , "barrier" );
put(Material.PISTON , "piston" ); put(Material.PISTON , "piston" );
put(Material.UNUSED_PLANT , "coral" ); put(Material.UNUSED_PLANT , "coral" );
put(Material.PUMPKIN , "gourd" ); put(Material.PUMPKIN , "gourd" );
put(Material.DRAGON_EGG , "dragon_egg" ); put(Material.EGG , "dragon_egg" );
put(Material.CAKE , "cake" ); put(Material.CAKE , "cake" );
}}; }};
src/main/java/carpet/utils/CarpetProfiler.java
+1 -1
View File
@@ -120,7 +120,7 @@ public class CarpetProfiler
return null; return null;
} }
String section = dimension+"."+ Registry.ENTITY_TYPE.getId(e.getType()).toString().replaceFirst("minecraft:",""); String section = dimension+"."+ Registry.ENTITY_TYPE.getId(e.getType()).toString().replaceFirst("minecraft:","");
if (e.getWorld().isClient) if (e.getEntityWorld().isClient)
section += "(client)"; section += "(client)";
long section_start = System.nanoTime(); long section_start = System.nanoTime();
return new ProfilerToken(section, section_start); return new ProfilerToken(section, section_start);
src/main/java/carpet/utils/SpawnReporter.java
+1 -1
View File
@@ -410,7 +410,7 @@ public class SpawnReporter
} }
if (entity instanceof OcelotEntity) 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(); e.remove();
} }