Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Forge] Update to newer 1.14.2 forge, mappings

Browse Source
This commit is contained in:
Kenzie Togami 2019-06-22 12:42:20 -07:00
parent 8fcc22c21d
commit 7879be157e
No known key found for this signature in database
GPG Key ID: 5D200B325E157A81
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-forge/build.gradle
View File

@ -15,7 +15,7 @@ apply plugin: 'eclipse'
apply plugin: 'net.minecraftforge.gradle' apply plugin: 'net.minecraftforge.gradle'
def minecraftVersion = "1.14.2" def minecraftVersion = "1.14.2"
def forgeVersion = "26.0.25" def forgeVersion = "26.0.48"
configurations.all { Configuration it -> configurations.all { Configuration it ->
it.resolutionStrategy { ResolutionStrategy rs -> it.resolutionStrategy { ResolutionStrategy rs ->
@ -36,7 +36,7 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
minecraft { minecraft {
mappings channel: 'snapshot', version: "20190614-${minecraftVersion}" mappings channel: 'snapshot', version: "20190621-${minecraftVersion}"
runs { runs {
client = { client = {

5
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java
View File

@ -496,8 +496,7 @@ public class ForgeWorld extends AbstractWorld {
@Override @Override
public BaseBlock getFullBlock(BlockVector3 position) { public BaseBlock getFullBlock(BlockVector3 position) {
BlockPos pos = new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ()); BlockPos pos = new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ());
// Avoid creation by using the CHECK mode -- if it's needed, it'll be re-created anyways TileEntity tile = getWorld().getChunk(pos).getTileEntity(pos);
TileEntity tile = getWorld().getChunk(pos).getTileEntity(pos, Chunk.CreateEntityType.CHECK);
if (tile != null) { if (tile != null) {
return getBlock(position).toBaseBlock(NBTConverter.fromNative(TileEntityUtils.copyNbtData(tile))); return getBlock(position).toBaseBlock(NBTConverter.fromNative(TileEntityUtils.copyNbtData(tile)));
@ -550,7 +549,7 @@ public class ForgeWorld extends AbstractWorld {
@Override @Override
public Entity createEntity(Location location, BaseEntity entity) { public Entity createEntity(Location location, BaseEntity entity) {
World world = getWorld(); World world = getWorld();
final Optional<EntityType<?>> entityType = EntityType.getTypeFromString(entity.getType().getId()); final Optional<EntityType<?>> entityType = EntityType.byKey(entity.getType().getId());
if (!entityType.isPresent()) return null; if (!entityType.isPresent()) return null;
net.minecraft.entity.Entity createdEntity = entityType.get().create(world); net.minecraft.entity.Entity createdEntity = entityType.get().create(world);
if (createdEntity != null) { if (createdEntity != null) {