Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-14 05:52:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Late-night adjustments

Browse source 
- Reduced ambient dripping particles of fluid pipes
- Fixed reversed uvs on encased fans
- Fixed tile entities not being added to contraptions client-side
This commit is contained in:
simibubi 2020-08-25 23:33:39 +02:00
parent e52765cce0
commit 0d1085ef09
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
View file

@ -465,7 +465,7 @@ public abstract class Contraption {
renderOrder.add(0, info.pos); renderOrder.add(0, info.pos);
CompoundNBT tag = info.nbt; CompoundNBT tag = info.nbt;
MovementBehaviour movementBehaviour = AllMovementBehaviours.getMovementBehaviour(block); MovementBehaviour movementBehaviour = AllMovementBehaviours.getMovementBehaviour(block);
if (tag == null || movementBehaviour == null || movementBehaviour.hasSpecialMovementRenderer()) if (tag == null || (movementBehaviour != null && movementBehaviour.hasSpecialMovementRenderer()))
return; return;
tag.putInt("x", info.pos.getX()); tag.putInt("x", info.pos.getX());

4
src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeBehaviour.java
View file

@ -237,8 +237,8 @@ public abstract class FluidPipeBehaviour extends TileEntityBehaviour {
} }
public static final int MAX_PARTICLE_RENDER_DISTANCE = 20; public static final int MAX_PARTICLE_RENDER_DISTANCE = 20;
public static final int SPLASH_PARTICLE_AMOUNT = 3; public static final int SPLASH_PARTICLE_AMOUNT = 1;
public static final float IDLE_PARTICLE_SPAWN_CHANCE = 1 / 100f; public static final float IDLE_PARTICLE_SPAWN_CHANCE = 1 / 800f;
public static final Random r = new Random(); public static final Random r = new Random();
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)

6
src/main/resources/assets/create/models/block/encased_fan/block.json
View file

@ -13,7 +13,7 @@
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [16, 16, 2], "to": [16, 16, 2],
"faces": { "faces": {
"north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#fan_side"}, "north": {"uv": [0, 0, 16, 16], "texture": "#fan_side"},
"east": {"uv": [14, 0, 16, 16], "texture": "#fan_side"}, "east": {"uv": [14, 0, 16, 16], "texture": "#fan_side"},
"south": {"uv": [0, 0, 16, 16], "texture": "#fan_side"}, "south": {"uv": [0, 0, 16, 16], "texture": "#fan_side"},
"west": {"uv": [14, 0, 16, 16], "rotation": 180, "texture": "#fan_side"}, "west": {"uv": [14, 0, 16, 16], "rotation": 180, "texture": "#fan_side"},
@ -26,7 +26,7 @@
"from": [0, 0, 14], "from": [0, 0, 14],
"to": [16, 16, 16], "to": [16, 16, 16],
"faces": { "faces": {
"north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#fan_side"}, "north": {"uv": [0, 0, 16, 16], "texture": "#fan_side"},
"east": {"uv": [0, 0, 2, 16], "texture": "#fan_side"}, "east": {"uv": [0, 0, 2, 16], "texture": "#fan_side"},
"south": {"uv": [0, 0, 16, 16], "texture": "#fan_side"}, "south": {"uv": [0, 0, 16, 16], "texture": "#fan_side"},
"west": {"uv": [14, 0, 16, 16], "texture": "#fan_side"}, "west": {"uv": [14, 0, 16, 16], "texture": "#fan_side"},
@ -50,7 +50,7 @@
"from": [14, 0, 2], "from": [14, 0, 2],
"to": [16, 16, 14], "to": [16, 16, 14],
"faces": { "faces": {
"east": {"uv": [2, 0, 14, 16], "rotation": 180, "texture": "#fan_side"}, "east": {"uv": [2, 0, 14, 16], "texture": "#fan_side"},
"west": {"uv": [14, 0, 2, 16], "texture": "#fan_side"}, "west": {"uv": [14, 0, 2, 16], "texture": "#fan_side"},
"up": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#fan_casing"}, "up": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#fan_casing"},
"down": {"uv": [14, 2, 16, 14], "texture": "#fan_casing"} "down": {"uv": [14, 2, 16, 14], "texture": "#fan_casing"}

8
src/main/resources/assets/create/models/block/encased_fan/item.json
View file

@ -4,8 +4,8 @@
"textures": { "textures": {
"2": "create:block/gearbox", "2": "create:block/gearbox",
"fan_casing": "create:block/fan_casing", "fan_casing": "create:block/fan_casing",
"fan_side": "create:block/fan_side",
"particle": "create:block/fan_side", "particle": "create:block/fan_side",
"fan_side": "create:block/fan_side",
"axis_top": "create:block/axis_top", "axis_top": "create:block/axis_top",
"fan_blades": "create:block/fan_blades", "fan_blades": "create:block/fan_blades",
"axis": "create:block/axis" "axis": "create:block/axis"
@ -21,7 +21,7 @@
"south": {"uv": [0, 14, 16, 16], "texture": "#fan_casing"}, "south": {"uv": [0, 14, 16, 16], "texture": "#fan_casing"},
"west": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#fan_side"}, "west": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#fan_side"},
"up": {"uv": [0, 0, 16, 16], "texture": "#fan_side"}, "up": {"uv": [0, 0, 16, 16], "texture": "#fan_side"},
"down": {"uv": [0, 0, 16, 16], "texture": "#fan_side"} "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#fan_side"}
} }
}, },
{ {
@ -34,7 +34,7 @@
"south": {"uv": [0, 0, 16, 2], "texture": "#fan_casing"}, "south": {"uv": [0, 0, 16, 2], "texture": "#fan_casing"},
"west": {"uv": [14, 0, 16, 16], "rotation": 270, "texture": "#fan_side"}, "west": {"uv": [14, 0, 16, 16], "rotation": 270, "texture": "#fan_side"},
"up": {"uv": [0, 0, 16, 16], "texture": "#fan_side"}, "up": {"uv": [0, 0, 16, 16], "texture": "#fan_side"},
"down": {"uv": [0, 0, 16, 16], "texture": "#fan_side"} "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#fan_side"}
} }
}, },
{ {
@ -54,7 +54,7 @@
"to": [16, 14, 16], "to": [16, 14, 16],
"faces": { "faces": {
"north": {"uv": [0, 2, 2, 14], "texture": "#fan_casing"}, "north": {"uv": [0, 2, 2, 14], "texture": "#fan_casing"},
"east": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#fan_side"}, "east": {"uv": [2, 0, 14, 16], "rotation": 90, "texture": "#fan_side"},
"south": {"uv": [14, 2, 16, 14], "texture": "#fan_casing"}, "south": {"uv": [14, 2, 16, 14], "texture": "#fan_casing"},
"west": {"uv": [14, 0, 2, 16], "rotation": 270, "texture": "#fan_side"} "west": {"uv": [14, 0, 2, 16], "rotation": 270, "texture": "#fan_side"}
} }