Windcorp/JavaProgressia
Windcorp/JavaProgressia
Archived
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed BlockFace contexts into TileStack contexts

Browse Source
This commit is contained in:
OLEGSHA 2021-08-05 19:39:39 +03:00
parent 0f60d45ffa
commit 80541eafc3
Signed by: OLEGSHA
GPG Key ID: E57A4B08D64AFF7A
14 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ru/windcorp/progressia/common/world/context/TileDataContext.java
View File

@ -24,7 +24,7 @@ import ru.windcorp.progressia.common.world.tile.TileData;
public interface TileDataContext
extends TileGenericContextWO<BlockData, TileData, EntityData>,
BlockFaceDataContext,
TileStackDataContext,
TileDataContextRO {
// currently empty

2
src/main/java/ru/windcorp/progressia/common/world/context/TileDataContextRO.java
View File

@ -24,7 +24,7 @@ import ru.windcorp.progressia.common.world.tile.TileData;
public interface TileDataContextRO
extends TileGenericContextRO<BlockData, TileData, EntityData>,
BlockFaceDataContextRO {
TileStackDataContextRO {
// currently empty

8
src/main/java/ru/windcorp/progressia/common/world/context/BlockFaceDataContext.java → src/main/java/ru/windcorp/progressia/common/world/context/TileStackDataContext.java
View File

@ -19,13 +19,13 @@ package ru.windcorp.progressia.common.world.context;
import ru.windcorp.progressia.common.world.block.BlockData;
import ru.windcorp.progressia.common.world.entity.EntityData;
import ru.windcorp.progressia.common.world.generic.context.BlockFaceGenericContextWO;
import ru.windcorp.progressia.common.world.generic.context.TileStackGenericContextWO;
import ru.windcorp.progressia.common.world.tile.TileData;
public interface BlockFaceDataContext
extends BlockFaceGenericContextWO<BlockData, TileData, EntityData>,
public interface TileStackDataContext
extends TileStackGenericContextWO<BlockData, TileData, EntityData>,
BlockDataContext,
BlockFaceDataContextRO {
TileStackDataContextRO {
// currently empty

6
src/main/java/ru/windcorp/progressia/common/world/context/BlockFaceDataContextRO.java → src/main/java/ru/windcorp/progressia/common/world/context/TileStackDataContextRO.java
View File

@ -19,11 +19,11 @@ package ru.windcorp.progressia.common.world.context;
import ru.windcorp.progressia.common.world.block.BlockData;
import ru.windcorp.progressia.common.world.entity.EntityData;
import ru.windcorp.progressia.common.world.generic.context.BlockFaceGenericContextRO;
import ru.windcorp.progressia.common.world.generic.context.TileStackGenericContextRO;
import ru.windcorp.progressia.common.world.tile.TileData;
public interface BlockFaceDataContextRO
extends BlockFaceGenericContextRO<BlockData, TileData, EntityData>,
public interface TileStackDataContextRO
extends TileStackGenericContextRO<BlockData, TileData, EntityData>,
BlockDataContext {
// currently empty

2
src/main/java/ru/windcorp/progressia/common/world/generic/context/TileGenericContextRO.java
View File

@ -30,7 +30,7 @@ public interface TileGenericContextRO<
B extends BlockGeneric,
T extends TileGeneric,
E extends EntityGeneric
> extends WorldContexts.Tile, BlockFaceGenericContextRO<B, T, E> {
> extends WorldContexts.Tile, TileStackGenericContextRO<B, T, E> {
//@formatter:on
/**

2
src/main/java/ru/windcorp/progressia/common/world/generic/context/TileGenericContextWO.java
View File

@ -32,7 +32,7 @@ public interface TileGenericContextWO<
B extends BlockGeneric,
T extends TileGeneric,
E extends EntityGeneric
> extends WorldContexts.Tile, BlockFaceGenericContextWO<B, T, E> {
> extends WorldContexts.Tile, TileStackGenericContextWO<B, T, E> {
//@formatter:on
/**

2
src/main/java/ru/windcorp/progressia/common/world/generic/context/BlockFaceGenericContextRO.java → src/main/java/ru/windcorp/progressia/common/world/generic/context/TileStackGenericContextRO.java
View File

@ -26,7 +26,7 @@ import ru.windcorp.progressia.common.world.generic.*;
* not actually exist.
*/
//@formatter:off
public interface BlockFaceGenericContextRO<
public interface TileStackGenericContextRO<
B extends BlockGeneric,
T extends TileGeneric,
E extends EntityGeneric

2
src/main/java/ru/windcorp/progressia/common/world/generic/context/BlockFaceGenericContextWO.java → src/main/java/ru/windcorp/progressia/common/world/generic/context/TileStackGenericContextWO.java
View File

@ -28,7 +28,7 @@ import ru.windcorp.progressia.common.world.generic.*;
* stack may or may not actually exist.
*/
//@formatter:off
public interface BlockFaceGenericContextWO<
public interface TileStackGenericContextWO<
B extends BlockGeneric,
T extends TileGeneric,
E extends EntityGeneric

2
src/main/java/ru/windcorp/progressia/common/world/generic/context/WorldContexts.java
View File

@ -78,7 +78,7 @@ class WorldContexts {
/**
* A {@link Context} with a world instance, a block location and a block face
* (block side). This interface should not be implemented directly; see
* {@link BlockFaceGenericContextRO} or {@link BlockFaceGenericContextWO}.
* {@link TileStackGenericContextRO} or {@link TileStackGenericContextWO}.
*
* @author javapony
*

4
src/main/java/ru/windcorp/progressia/server/world/context/ServerTileContext.java
View File

@ -19,9 +19,9 @@ package ru.windcorp.progressia.server.world.context;
import ru.windcorp.progressia.common.world.context.TileDataContext;
public interface ServerTileContext extends TileDataContext, ServerBlockFaceContext, ServerTileContextRO {
public interface ServerTileContext extends TileDataContext, ServerTileStackContext, ServerTileContextRO {
public interface Logic extends ServerTileContextRO.Logic, ServerBlockFaceContext.Logic {
public interface Logic extends ServerTileContextRO.Logic, ServerTileStackContext.Logic {
@Override
ServerTileContext data();

4
src/main/java/ru/windcorp/progressia/server/world/context/ServerTileContextRO.java
View File

@ -23,10 +23,10 @@ import ru.windcorp.progressia.common.world.generic.context.TileGenericContextRO;
import ru.windcorp.progressia.server.world.block.BlockLogic;
import ru.windcorp.progressia.server.world.tile.TileLogic;
public interface ServerTileContextRO extends ServerBlockFaceContextRO, TileDataContextRO {
public interface ServerTileContextRO extends ServerTileStackContextRO, TileDataContextRO {
public interface Logic
extends ServerBlockFaceContextRO.Logic, TileGenericContextRO<BlockLogic, TileLogic, EntityData> {
extends ServerTileStackContextRO.Logic, TileGenericContextRO<BlockLogic, TileLogic, EntityData> {
@Override
ServerTileContextRO data();

10
src/main/java/ru/windcorp/progressia/server/world/context/ServerBlockFaceContext.java → src/main/java/ru/windcorp/progressia/server/world/context/ServerTileStackContext.java
View File

@ -17,18 +17,18 @@
*/
package ru.windcorp.progressia.server.world.context;
import ru.windcorp.progressia.common.world.context.BlockFaceDataContext;
import ru.windcorp.progressia.common.world.context.TileStackDataContext;
public interface ServerBlockFaceContext extends BlockFaceDataContext, ServerBlockContext, ServerBlockFaceContextRO {
public interface ServerTileStackContext extends TileStackDataContext, ServerBlockContext, ServerTileStackContextRO {
public interface Logic extends ServerBlockFaceContextRO.Logic, ServerBlockContext.Logic {
public interface Logic extends ServerTileStackContextRO.Logic, ServerBlockContext.Logic {
@Override
ServerBlockFaceContext data();
ServerTileStackContext data();
}
@Override
ServerBlockFaceContext.Logic logic();
ServerTileStackContext.Logic logic();
}

12
src/main/java/ru/windcorp/progressia/server/world/context/ServerBlockFaceContextRO.java → src/main/java/ru/windcorp/progressia/server/world/context/ServerTileStackContextRO.java
View File

@ -17,23 +17,23 @@
*/
package ru.windcorp.progressia.server.world.context;
import ru.windcorp.progressia.common.world.context.BlockFaceDataContextRO;
import ru.windcorp.progressia.common.world.context.TileStackDataContextRO;
import ru.windcorp.progressia.common.world.entity.EntityData;
import ru.windcorp.progressia.common.world.generic.context.BlockFaceGenericContextRO;
import ru.windcorp.progressia.common.world.generic.context.TileStackGenericContextRO;
import ru.windcorp.progressia.server.world.block.BlockLogic;
import ru.windcorp.progressia.server.world.tile.TileLogic;
public interface ServerBlockFaceContextRO extends ServerBlockContextRO, BlockFaceDataContextRO {
public interface ServerTileStackContextRO extends ServerBlockContextRO, TileStackDataContextRO {
public interface Logic
extends ServerBlockContextRO.Logic, BlockFaceGenericContextRO<BlockLogic, TileLogic, EntityData> {
extends ServerBlockContextRO.Logic, TileStackGenericContextRO<BlockLogic, TileLogic, EntityData> {
@Override
ServerBlockFaceContextRO data();
ServerTileStackContextRO data();
}
@Override
ServerBlockFaceContextRO.Logic logic();
ServerTileStackContextRO.Logic logic();
}

14
src/main/java/ru/windcorp/progressia/server/world/context/impl/ReusableServerContext.java
View File

@ -20,15 +20,7 @@ package ru.windcorp.progressia.server.world.context.impl;
import ru.windcorp.progressia.common.world.context.Context;
import ru.windcorp.progressia.server.world.WorldLogic;
import ru.windcorp.progressia.server.world.WorldLogicRO;
import ru.windcorp.progressia.server.world.context.ServerBlockContext;
import ru.windcorp.progressia.server.world.context.ServerBlockContextRO;
import ru.windcorp.progressia.server.world.context.ServerBlockFaceContext;
import ru.windcorp.progressia.server.world.context.ServerBlockFaceContextRO;
import ru.windcorp.progressia.server.world.context.ServerContext;
import ru.windcorp.progressia.server.world.context.ServerTileContext;
import ru.windcorp.progressia.server.world.context.ServerTileContextRO;
import ru.windcorp.progressia.server.world.context.ServerWorldContext;
import ru.windcorp.progressia.server.world.context.ServerWorldContextRO;
import ru.windcorp.progressia.server.world.context.*;
/**
* An implementation of the entire {@link ServerContext} tree. The objects of
@ -75,8 +67,8 @@ public abstract class ReusableServerContext implements ServerTileContext {
*/
LOCATION,
/**
* This object conforms to {@link ServerBlockFaceContext} or
* {@link ServerBlockFaceContextRO}.
* This object conforms to {@link ServerTileStackContext} or
* {@link ServerTileStackContextRO}.
*/
TILE_STACK,
/**