1.14.2 pre 1

This commit is contained in:
gnembon committed 2019-05-16 23:42:41 -03:00
1 parent 48ff85293f
commit 1a4adca444
4 files changed
+7 -6

No files matched your search

+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
+2 -2
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" );
}}; }};
@@ -145,7 +145,7 @@ public class BlockInfo
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" );
}}; }};
@@ -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);
@@ -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();
} }