Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New block families - rebased #3343

Merged
merged 25 commits into from May 26, 2018
Merged

New block families - rebased #3343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a3abdb4
Implemented Tweaks to block families
pollend Aug 29, 2017
fee617d
removed iml
pollend Aug 29, 2017
48b8ec1
tweaked freeform supported annotation
pollend Aug 29, 2017
97b4f0e
added multi-connect family
pollend Sep 1, 2017
f98fe9f
added annotation inheirt and block update when block is placed
pollend Sep 1, 2017
0806f75
Fixed imports and cleaned up code
pollend Sep 19, 2017
093e75a
fixed block family registry
pollend Sep 19, 2017
4f5cb6e
fixed Headless enviroment
pollend Sep 19, 2017
7182006
cleaned up block family and more imports
pollend Sep 20, 2017
d8f5ac6
fixed imports
pollend Sep 21, 2017
c51d457
added java docs
pollend Oct 19, 2017
29761a4
fixed checkstyle errors
pollend Oct 31, 2017
978bba5
fixed checkstyle warning
pollend Nov 1, 2017
7277698
generalized event handler for OnBlockItemPlaced
pollend Nov 30, 2017
de59834
re-generalized multiconnect family.
pollend Dec 4, 2017
752e533
updated java docs
pollend Dec 7, 2017
4fa94c9
removed horizantalOnly
pollend Dec 8, 2017
70fc4d6
added javadoc to MultiConnectFamily
Steampunkery Dec 11, 2017
409f2bf
Minor fixes to new block families' docs
anuar2k Jan 13, 2018
cf0654f
Added an example to one annotation and fixed another one
anuar2k Jan 13, 2018
5090fcb
changed Direction to rotation
pollend Jan 13, 2018
48ccc9e
tweaks
pollend Jan 14, 2018
289597c
Move block and block family initialization outside of block family im…
PS-Soundwave Dec 13, 2017
82feaa7
Resolve additional conflict from #3180 vs #3221
Cervator Apr 27, 2018
449b69f
Minor code quality tweaks
Cervator Apr 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions engine-tests/src/main/java/org/terasology/HeadlessEnvironment.java
View file
Open in desktop
Expand Up @@ -94,10 +94,10 @@
import org.terasology.world.biomes.BiomeManager;
import org.terasology.world.block.Block;
import org.terasology.world.block.BlockManager;
import org.terasology.world.block.family.AttachedToSurfaceFamilyFactory;
import org.terasology.world.block.family.AttachedToSurfaceFamily;
import org.terasology.world.block.family.BlockFamily;
import org.terasology.world.block.family.DefaultBlockFamilyFactoryRegistry;
import org.terasology.world.block.family.HorizontalBlockFamilyFactory;
import org.terasology.world.block.family.BlockFamilyRegistry;
import org.terasology.world.block.family.HorizontalFamily;
import org.terasology.world.block.internal.BlockManagerImpl;
import org.terasology.world.block.loader.BlockFamilyDefinition;
import org.terasology.world.block.loader.BlockFamilyDefinitionData;
Expand Down Expand Up @@ -216,9 +216,9 @@ protected AssetManager setupAssetManager() {
assetTypeManager.registerCoreAssetType(StaticSound.class, NullSound::new, "sounds");
assetTypeManager.registerCoreAssetType(StreamingSound.class, NullStreamingSound::new, "music");

DefaultBlockFamilyFactoryRegistry blockFamilyFactoryRegistry = new DefaultBlockFamilyFactoryRegistry();
blockFamilyFactoryRegistry.setBlockFamilyFactory("horizontal", new HorizontalBlockFamilyFactory());
blockFamilyFactoryRegistry.setBlockFamilyFactory("alignToSurface", new AttachedToSurfaceFamilyFactory());
BlockFamilyRegistry blockFamilyFactoryRegistry = new BlockFamilyRegistry();
blockFamilyFactoryRegistry.setBlockFamily("horizontal", HorizontalFamily.class);
blockFamilyFactoryRegistry.setBlockFamily("alignToSurface", AttachedToSurfaceFamily.class);
assetTypeManager.registerCoreFormat(BlockFamilyDefinition.class,
new BlockFamilyDefinitionFormat(assetTypeManager.getAssetManager(), blockFamilyFactoryRegistry));

Expand Down
4 changes: 2 additions & 2 deletions engine-tests/src/test/java/org/terasology/persistence/internal/StorageManagerTest.java
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@
import org.terasology.world.biomes.BiomeManager;
import org.terasology.world.block.Block;
import org.terasology.world.block.BlockManager;
import org.terasology.world.block.family.SymmetricBlockFamilyFactory;
import org.terasology.world.block.family.SymmetricFamily;
import org.terasology.world.block.loader.BlockFamilyDefinition;
import org.terasology.world.block.loader.BlockFamilyDefinitionData;
import org.terasology.world.chunks.Chunk;
Expand Down Expand Up @@ -120,7 +120,7 @@ public void setup() throws Exception {

AssetManager assetManager = context.get(AssetManager.class);
BlockFamilyDefinitionData data = new BlockFamilyDefinitionData();
data.setFamilyFactory(new SymmetricBlockFamilyFactory());
data.setBlockFamily(SymmetricFamily.class);
assetManager.loadAsset(new ResourceUrn("test:testblock"), data, BlockFamilyDefinition.class);
assetManager.loadAsset(new ResourceUrn("test:testblock2"), data, BlockFamilyDefinition.class);
testBlock = context.get(BlockManager.class).getBlock("test:testblock");
Expand Down
5 changes: 3 additions & 2 deletions engine-tests/src/test/java/org/terasology/world/ChunkTest.java
View file
Open in desktop
Expand Up @@ -28,7 +28,8 @@
import org.terasology.world.block.Block;
import org.terasology.world.block.BlockManager;
import org.terasology.world.block.BlockUri;
import org.terasology.world.block.family.SymmetricBlockFamilyFactory;
import org.terasology.world.block.family.BlockFamilyRegistry;
import org.terasology.world.block.family.SymmetricFamily;
import org.terasology.world.block.internal.BlockManagerImpl;
import org.terasology.world.block.loader.BlockFamilyDefinition;
import org.terasology.world.block.loader.BlockFamilyDefinitionData;
Expand Down Expand Up @@ -62,7 +63,7 @@ public void setup() throws Exception {
solidData.getBaseSection().setDisplayName("Stone");
solidData.getBaseSection().setShape(assetManager.getAsset("engine:cube", BlockShape.class).get());
solidData.getBaseSection().setTranslucent(false);
solidData.setFamilyFactory(new SymmetricBlockFamilyFactory());
solidData.setBlockFamily(SymmetricFamily.class);
assetManager.loadAsset(new ResourceUrn("engine:stone"), solidData, BlockFamilyDefinition.class);
solid = blockManager.getBlock(new BlockUri(new ResourceUrn("engine:stone")));
}
Expand Down
5 changes: 3 additions & 2 deletions engine-tests/src/test/java/org/terasology/world/ChunkViewTest.java
View file
Open in desktop
Expand Up @@ -29,7 +29,8 @@
import org.terasology.world.block.Block;
import org.terasology.world.block.BlockManager;
import org.terasology.world.block.BlockUri;
import org.terasology.world.block.family.SymmetricBlockFamilyFactory;
import org.terasology.world.block.family.BlockFamilyRegistry;
import org.terasology.world.block.family.SymmetricFamily;
import org.terasology.world.block.internal.BlockManagerImpl;
import org.terasology.world.block.loader.BlockFamilyDefinition;
import org.terasology.world.block.loader.BlockFamilyDefinitionData;
Expand Down Expand Up @@ -67,7 +68,7 @@ public void setup() throws IOException {
solidData.getBaseSection().setDisplayName("Stone");
solidData.getBaseSection().setShape(assetManager.getAsset("engine:cube", BlockShape.class).get());
solidData.getBaseSection().setTranslucent(false);
solidData.setFamilyFactory(new SymmetricBlockFamilyFactory());
solidData.setBlockFamily(SymmetricFamily.class);
assetManager.loadAsset(new ResourceUrn("engine:stone"), solidData, BlockFamilyDefinition.class);
solidBlock = blockManager.getBlock(new BlockUri(new ResourceUrn("engine:stone")));
}
Expand Down
10 changes: 5 additions & 5 deletions engine-tests/src/test/java/org/terasology/world/EntityAwareWorldProviderTest.java
View file
Open in desktop
Expand Up @@ -51,8 +51,8 @@
import org.terasology.world.block.BlockComponent;
import org.terasology.world.block.BlockManager;
import org.terasology.world.block.family.BlockFamily;
import org.terasology.world.block.family.HorizontalBlockFamilyFactory;
import org.terasology.world.block.family.SymmetricBlockFamilyFactory;
import org.terasology.world.block.family.HorizontalFamily;
import org.terasology.world.block.family.SymmetricFamily;
import org.terasology.world.block.loader.BlockFamilyDefinition;
import org.terasology.world.block.loader.BlockFamilyDefinitionData;
import org.terasology.world.internal.EntityAwareWorldProvider;
Expand Down Expand Up @@ -121,7 +121,7 @@ public void setup() throws Exception {

private Block createBlockWithPrefab(String urn, Prefab prefab, boolean keepActive, AssetManager assetManager, BlockManager blockManager) {
BlockFamilyDefinitionData data = new BlockFamilyDefinitionData();
data.setFamilyFactory(new SymmetricBlockFamilyFactory());
data.setBlockFamily(SymmetricFamily.class);
data.getBaseSection().getEntity().setPrefab(prefab);
data.getBaseSection().getEntity().setKeepActive(keepActive);
assetManager.loadAsset(new ResourceUrn(urn), data, BlockFamilyDefinition.class);
Expand All @@ -136,14 +136,14 @@ private Prefab createPrefabWithString(String urn, String text, AssetManager asse

private Block createBlock(String urn, AssetManager assetManager, BlockManager blockManager) {
BlockFamilyDefinitionData data = new BlockFamilyDefinitionData();
data.setFamilyFactory(new SymmetricBlockFamilyFactory());
data.setBlockFamily(SymmetricFamily.class);
assetManager.loadAsset(new ResourceUrn(urn), data, BlockFamilyDefinition.class);
return blockManager.getBlock(urn);
}

private BlockFamily createBlockFamily(String urn, Prefab prefab, AssetManager assetManager, BlockManager blockManager) {
BlockFamilyDefinitionData data = new BlockFamilyDefinitionData();
data.setFamilyFactory(new HorizontalBlockFamilyFactory());
data.setBlockFamily(HorizontalFamily.class);
data.getBaseSection().getEntity().setKeepActive(true);
data.getBaseSection().getEntity().setPrefab(prefab);
assetManager.loadAsset(new ResourceUrn(urn), data, BlockFamilyDefinition.class);
Expand Down
7 changes: 4 additions & 3 deletions engine-tests/src/test/java/org/terasology/world/generator/InternalLightGeneratorTest.java
View file
Open in desktop
Expand Up @@ -30,7 +30,8 @@
import org.terasology.world.block.Block;
import org.terasology.world.block.BlockManager;
import org.terasology.world.block.BlockUri;
import org.terasology.world.block.family.SymmetricBlockFamilyFactory;
import org.terasology.world.block.family.BlockFamilyRegistry;
import org.terasology.world.block.family.SymmetricFamily;
import org.terasology.world.block.internal.BlockManagerImpl;
import org.terasology.world.block.loader.BlockFamilyDefinition;
import org.terasology.world.block.loader.BlockFamilyDefinitionData;
Expand Down Expand Up @@ -69,15 +70,15 @@ public void setup() throws Exception {
solidData.getBaseSection().setDisplayName("Stone");
solidData.getBaseSection().setShape(assetManager.getAsset("engine:cube", BlockShape.class).get());
solidData.getBaseSection().setTranslucent(false);
solidData.setFamilyFactory(new SymmetricBlockFamilyFactory());
solidData.setBlockFamily(SymmetricFamily.class);
assetManager.loadAsset(new ResourceUrn("engine:stone"), solidData, BlockFamilyDefinition.class);
solidBlock = blockManager.getBlock(new BlockUri(new ResourceUrn("engine:stone")));

BlockFamilyDefinitionData fullLightData = new BlockFamilyDefinitionData();
fullLightData.getBaseSection().setDisplayName("Torch");
fullLightData.getBaseSection().setShape(assetManager.getAsset("engine:cube", BlockShape.class).get());
fullLightData.getBaseSection().setLuminance(ChunkConstants.MAX_LIGHT);
fullLightData.setFamilyFactory(new SymmetricBlockFamilyFactory());
fullLightData.setBlockFamily(SymmetricFamily.class);
assetManager.loadAsset(new ResourceUrn("engine:torch"), fullLightData, BlockFamilyDefinition.class);
fullLight = blockManager.getBlock(new BlockUri(new ResourceUrn("engine:torch")));
}
Expand Down
6 changes: 4 additions & 2 deletions engine-tests/src/test/java/org/terasology/world/propagation/BetweenChunkPropagationTest.java
View file
Open in desktop
Expand Up @@ -31,7 +31,9 @@
import org.terasology.world.block.Block;
import org.terasology.world.block.BlockManager;
import org.terasology.world.block.BlockUri;
import org.terasology.world.block.family.SymmetricBlockFamilyFactory;
import org.terasology.world.block.family.BlockFamily;
import org.terasology.world.block.family.BlockFamilyRegistry;
import org.terasology.world.block.family.SymmetricFamily;
import org.terasology.world.block.internal.BlockManagerImpl;
import org.terasology.world.block.loader.BlockFamilyDefinition;
import org.terasology.world.block.loader.BlockFamilyDefinitionData;
Expand Down Expand Up @@ -88,7 +90,7 @@ public void setup() throws Exception {
solidData.getBaseSection().setDisplayName("Stone");
solidData.getBaseSection().setShape(assetManager.getAsset("engine:cube", BlockShape.class).get());
solidData.getBaseSection().setTranslucent(false);
solidData.setFamilyFactory(new SymmetricBlockFamilyFactory());
solidData.setBlockFamily( SymmetricFamily.class);
assetManager.loadAsset(new ResourceUrn("engine:stone"), solidData, BlockFamilyDefinition.class);
solid = blockManager.getBlock(new BlockUri(new ResourceUrn("engine:stone")));

Expand Down
13 changes: 7 additions & 6 deletions engine-tests/src/test/java/org/terasology/world/propagation/BulkLightPropagationTest.java
View file
Open in desktop
Expand Up @@ -27,7 +27,8 @@
import org.terasology.world.block.Block;
import org.terasology.world.block.BlockManager;
import org.terasology.world.block.BlockUri;
import org.terasology.world.block.family.SymmetricBlockFamilyFactory;
import org.terasology.world.block.family.BlockFamilyRegistry;
import org.terasology.world.block.family.SymmetricFamily;
import org.terasology.world.block.internal.BlockManagerImpl;
import org.terasology.world.block.loader.BlockFamilyDefinition;
import org.terasology.world.block.loader.BlockFamilyDefinitionData;
Expand Down Expand Up @@ -66,7 +67,7 @@ public void setup() throws Exception {
fullLightData.getBaseSection().setShape(assetManager.getAsset("engine:cube", BlockShape.class).get());
fullLightData.getBaseSection().setLuminance(ChunkConstants.MAX_LIGHT);
fullLightData.getBaseSection().setTranslucent(true);
fullLightData.setFamilyFactory(new SymmetricBlockFamilyFactory());
fullLightData.setBlockFamily(SymmetricFamily.class);
assetManager.loadAsset(new ResourceUrn("engine:torch"), fullLightData, BlockFamilyDefinition.class);
fullLight = blockManager.getBlock(new BlockUri(new ResourceUrn("engine:torch")));

Expand All @@ -75,7 +76,7 @@ public void setup() throws Exception {
weakLightData.getBaseSection().setShape(assetManager.getAsset("engine:cube", BlockShape.class).get());
weakLightData.getBaseSection().setLuminance((byte) 2);
weakLightData.getBaseSection().setTranslucent(true);
weakLightData.setFamilyFactory(new SymmetricBlockFamilyFactory());
weakLightData.setBlockFamily(SymmetricFamily.class);
assetManager.loadAsset(new ResourceUrn("engine:weakLight"), weakLightData, BlockFamilyDefinition.class);
weakLight = blockManager.getBlock(new BlockUri(new ResourceUrn("engine:weakLight")));

Expand All @@ -84,15 +85,15 @@ public void setup() throws Exception {
mediumLightData.getBaseSection().setShape(assetManager.getAsset("engine:cube", BlockShape.class).get());
mediumLightData.getBaseSection().setLuminance((byte) 5);
mediumLightData.getBaseSection().setTranslucent(true);
mediumLightData.setFamilyFactory(new SymmetricBlockFamilyFactory());
mediumLightData.setBlockFamily(SymmetricFamily.class);
assetManager.loadAsset(new ResourceUrn("engine:mediumLight"), mediumLightData, BlockFamilyDefinition.class);
mediumLight = blockManager.getBlock(new BlockUri(new ResourceUrn("engine:mediumLight")));

BlockFamilyDefinitionData solidData = new BlockFamilyDefinitionData();
solidData.getBaseSection().setDisplayName("Stone");
solidData.getBaseSection().setShape(assetManager.getAsset("engine:cube", BlockShape.class).get());
solidData.getBaseSection().setTranslucent(false);
solidData.setFamilyFactory(new SymmetricBlockFamilyFactory());
solidData.setBlockFamily(SymmetricFamily.class);
assetManager.loadAsset(new ResourceUrn("engine:stone"), solidData, BlockFamilyDefinition.class);
solid = blockManager.getBlock(new BlockUri(new ResourceUrn("engine:stone")));

Expand All @@ -101,7 +102,7 @@ public void setup() throws Exception {
solidMediumLightData.getBaseSection().setShape(assetManager.getAsset("engine:cube", BlockShape.class).get());
solidMediumLightData.getBaseSection().setTranslucent(false);
solidMediumLightData.getBaseSection().setLuminance((byte) 5);
solidMediumLightData.setFamilyFactory(new SymmetricBlockFamilyFactory());
solidMediumLightData.setBlockFamily(SymmetricFamily.class);
assetManager.loadAsset(new ResourceUrn("engine:solidMediumLight"), solidMediumLightData, BlockFamilyDefinition.class);
solidMediumLight = blockManager.getBlock(new BlockUri(new ResourceUrn("engine:solidMediumLight")));

Expand Down
5 changes: 3 additions & 2 deletions engine-tests/src/test/java/org/terasology/world/propagation/BulkSunlightPropagationTest.java
View file
Open in desktop
Expand Up @@ -27,7 +27,8 @@
import org.terasology.world.block.Block;
import org.terasology.world.block.BlockManager;
import org.terasology.world.block.BlockUri;
import org.terasology.world.block.family.SymmetricBlockFamilyFactory;
import org.terasology.world.block.family.BlockFamilyRegistry;
import org.terasology.world.block.family.SymmetricFamily;
import org.terasology.world.block.internal.BlockManagerImpl;
import org.terasology.world.block.loader.BlockFamilyDefinition;
import org.terasology.world.block.loader.BlockFamilyDefinitionData;
Expand Down Expand Up @@ -71,7 +72,7 @@ public void setup() throws Exception {
solidData.getBaseSection().setDisplayName("Stone");
solidData.getBaseSection().setShape(assetManager.getAsset("engine:cube", BlockShape.class).get());
solidData.getBaseSection().setTranslucent(false);
solidData.setFamilyFactory(new SymmetricBlockFamilyFactory());
solidData.setBlockFamily(SymmetricFamily.class);
assetManager.loadAsset(new ResourceUrn("engine:stone"), solidData, BlockFamilyDefinition.class);
solid = blockManager.getBlock(new BlockUri(new ResourceUrn("engine:stone")));

Expand Down
7 changes: 3 additions & 4 deletions engine/src/main/java/org/terasology/engine/TerasologyEngine.java
View file
Open in desktop
Expand Up @@ -66,8 +66,7 @@
import org.terasology.rendering.nui.skin.UISkin;
import org.terasology.rendering.nui.skin.UISkinData;
import org.terasology.version.TerasologyVersion;
import org.terasology.world.block.family.BlockFamilyFactoryRegistry;
import org.terasology.world.block.family.DefaultBlockFamilyFactoryRegistry;
import org.terasology.world.block.family.BlockFamilyRegistry;
import org.terasology.world.block.loader.BlockFamilyDefinition;
import org.terasology.world.block.loader.BlockFamilyDefinitionData;
import org.terasology.world.block.loader.BlockFamilyDefinitionFormat;
Expand Down Expand Up @@ -303,8 +302,8 @@ private void initManagers() {
}

private void initAssets() {
DefaultBlockFamilyFactoryRegistry familyFactoryRegistry = new DefaultBlockFamilyFactoryRegistry();
rootContext.put(BlockFamilyFactoryRegistry.class, familyFactoryRegistry);
BlockFamilyRegistry familyFactoryRegistry = new BlockFamilyRegistry();
rootContext.put(BlockFamilyRegistry.class, familyFactoryRegistry);

// cast lambdas explicitly to avoid inconsistent compiler behavior wrt. type inference
assetTypeManager.registerCoreAssetType(Prefab.class,
Expand Down