-
-
Notifications
You must be signed in to change notification settings - Fork 837
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #429 from sk89q/bugfix/config-no-plat-dependency
Make block states lazy, fix forge for new block API
- Loading branch information
Showing
10 changed files
with
412 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeBlockMaterial.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * WorldEdit, a Minecraft world manipulation toolkit | ||
| * Copyright (C) sk89q <http://www.sk89q.com> | ||
| * Copyright (C) WorldEdit team and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as published by the | ||
| * Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License | ||
| * for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package com.sk89q.worldedit.forge; | ||
|
|
||
| import com.sk89q.worldedit.world.registry.BlockMaterial; | ||
| import com.sk89q.worldedit.world.registry.PassthroughBlockMaterial; | ||
|
|
||
| import net.minecraft.block.material.EnumPushReaction; | ||
| import net.minecraft.block.material.Material; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| /** | ||
| * Forge block material that pulls as much info as possible from the Minecraft | ||
| * Material, and passes the rest to another implementation, typically the | ||
| * bundled block info. | ||
| */ | ||
| public class ForgeBlockMaterial extends PassthroughBlockMaterial { | ||
|
|
||
| private final Material delegate; | ||
|
|
||
| public ForgeBlockMaterial(Material delegate, @Nullable BlockMaterial secondary) { | ||
| super(secondary); | ||
| this.delegate = delegate; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isAir() { | ||
| return delegate == Material.AIR || super.isAir(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isOpaque() { | ||
| return delegate.isOpaque(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isLiquid() { | ||
| return delegate.isLiquid(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isSolid() { | ||
| return delegate.isSolid(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isFragileWhenPushed() { | ||
| return delegate.getMobilityFlag() == EnumPushReaction.DESTROY; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isUnpushable() { | ||
| return delegate.getMobilityFlag() == EnumPushReaction.BLOCK; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isMovementBlocker() { | ||
| return delegate.blocksMovement(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isBurnable() { | ||
| return delegate.getCanBurn(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isToolRequired() { | ||
| return !delegate.isToolNotRequired(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isReplacedDuringPlacement() { | ||
| return delegate.isReplaceable(); | ||
| } | ||
|
|
||
| } |
58 changes: 58 additions & 0 deletions
58
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeBlockRegistry.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * WorldEdit, a Minecraft world manipulation toolkit | ||
| * Copyright (C) sk89q <http://www.sk89q.com> | ||
| * Copyright (C) WorldEdit team and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as published by the | ||
| * Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License | ||
| * for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package com.sk89q.worldedit.forge; | ||
|
|
||
| import com.sk89q.worldedit.registry.state.Property; | ||
| import com.sk89q.worldedit.world.block.BlockType; | ||
| import com.sk89q.worldedit.world.registry.BlockMaterial; | ||
| import com.sk89q.worldedit.world.registry.BundledBlockRegistry; | ||
|
|
||
| import net.minecraft.block.Block; | ||
| import net.minecraft.block.material.Material; | ||
| import net.minecraft.block.properties.IProperty; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.TreeMap; | ||
|
|
||
| public class ForgeBlockRegistry extends BundledBlockRegistry { | ||
|
|
||
| private Map<Material, ForgeBlockMaterial> materialMap = new HashMap<>(); | ||
|
|
||
| @Override | ||
| public BlockMaterial getMaterial(BlockType blockType) { | ||
| return materialMap.computeIfAbsent(Block.getBlockFromName(blockType.getId()).getDefaultState().getMaterial(), | ||
| m -> new ForgeBlockMaterial(m, super.getMaterial(blockType))); | ||
| } | ||
|
|
||
| @Override | ||
| public Map<String, ? extends Property<?>> getProperties(BlockType blockType) { | ||
| Map<String, Property<?>> map = new TreeMap<>(); | ||
| Collection<IProperty<?>> propertyKeys = Block.getBlockFromName(blockType.getId()) | ||
| .getDefaultState() | ||
| .getPropertyKeys(); | ||
| for (IProperty<?> key : propertyKeys) { | ||
| map.put(key.getName(), ForgeAdapter.adaptProperty(key)); | ||
| } | ||
| return map; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.