mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-29 08:27:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Post-PR Datagen

Browse source
This commit is contained in:
simibubi 2021-09-13 18:11:04 +02:00
parent 86b0d80c1b
commit 1ec299deff
4 changed files with 234 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/generated/resources/.cache/cache
View file

@ -437,7 +437,7 @@ dbc823d8cb38598e75871a2187b2a58d7f77f86a assets/create/lang/unfinished/nl_nl.jso
ac609477c295be1705d3efc07848ffe6779fd397 assets/create/lang/unfinished/pl_pl.json ac609477c295be1705d3efc07848ffe6779fd397 assets/create/lang/unfinished/pl_pl.json
95e17b968103e0ef62411489e699d39ac7ff0b64 assets/create/lang/unfinished/pt_br.json 95e17b968103e0ef62411489e699d39ac7ff0b64 assets/create/lang/unfinished/pt_br.json
b37f50f613b0df44032fe5d618a5ce7227be8087 assets/create/lang/unfinished/ru_ru.json b37f50f613b0df44032fe5d618a5ce7227be8087 assets/create/lang/unfinished/ru_ru.json
2254cfb88d58f6932451a1548341f10749deb2df assets/create/lang/unfinished/zh_cn.json fa465cd2c595bcd71449ad432a1908e27897177a assets/create/lang/unfinished/zh_cn.json
6192a7ede669ae6b6f8de6701b8a924d6a756c4a assets/create/lang/unfinished/zh_tw.json 6192a7ede669ae6b6f8de6701b8a924d6a756c4a assets/create/lang/unfinished/zh_tw.json
487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json

446
src/generated/resources/assets/create/lang/unfinished/zh_cn.json
View file

File diff suppressed because it is too large Load diff

14
src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidManipulationBehaviour.java
View file

@ -90,11 +90,11 @@ public abstract class FluidManipulationBehaviour extends TileEntityBehaviour {
protected int maxBlocks() { protected int maxBlocks() {
return AllConfigs.SERVER.fluids.hosePulleyBlockThreshold.get(); return AllConfigs.SERVER.fluids.hosePulleyBlockThreshold.get();
} }
protected boolean fillInfinite() { protected boolean fillInfinite() {
return AllConfigs.SERVER.fluids.fillInfinite.get(); return AllConfigs.SERVER.fluids.fillInfinite.get();
} }
public void reset() { public void reset() {
if (affectedArea != null) if (affectedArea != null)
scheduleUpdatesInAffectedArea(); scheduleUpdatesInAffectedArea();
@ -113,7 +113,9 @@ public abstract class FluidManipulationBehaviour extends TileEntityBehaviour {
protected void scheduleUpdatesInAffectedArea() { protected void scheduleUpdatesInAffectedArea() {
World world = getWorld(); World world = getWorld();
BlockPos.betweenClosedStream(new BlockPos(affectedArea.x0 - 1, affectedArea.y0 - 1, affectedArea.z0 - 1), new BlockPos(affectedArea.x1 + 1, affectedArea.y1 + 1, affectedArea.z1 + 1)) BlockPos
.betweenClosedStream(new BlockPos(affectedArea.x0 - 1, affectedArea.y0 - 1, affectedArea.z0 - 1),
new BlockPos(affectedArea.x1 + 1, affectedArea.y1 + 1, affectedArea.z1 + 1))
.forEach(pos -> { .forEach(pos -> {
FluidState nextFluidState = world.getFluidState(pos); FluidState nextFluidState = world.getFluidState(pos);
if (nextFluidState.isEmpty()) if (nextFluidState.isEmpty())
@ -200,9 +202,9 @@ public abstract class FluidManipulationBehaviour extends TileEntityBehaviour {
: fluid.getAttributes() : fluid.getAttributes()
.getEmptySound(); .getEmptySound();
if (soundevent == null) if (soundevent == null)
soundevent = fluid.is(FluidTags.LAVA) soundevent =
? fillSound ? SoundEvents.BUCKET_FILL_LAVA : SoundEvents.BUCKET_EMPTY_LAVA fluid.is(FluidTags.LAVA) ? fillSound ? SoundEvents.BUCKET_FILL_LAVA : SoundEvents.BUCKET_EMPTY_LAVA
: fillSound ? SoundEvents.BUCKET_FILL : SoundEvents.BUCKET_EMPTY; : fillSound ? SoundEvents.BUCKET_FILL : SoundEvents.BUCKET_EMPTY;
world.playSound(null, splooshPos, soundevent, SoundCategory.BLOCKS, 0.3F, 1.0F); world.playSound(null, splooshPos, soundevent, SoundCategory.BLOCKS, 0.3F, 1.0F);
if (world instanceof ServerWorld) if (world instanceof ServerWorld)

4
src/main/java/com/simibubi/create/foundation/config/CFluids.java
View file

@ -9,7 +9,7 @@ public class CFluids extends ConfigBase {
public ConfigInt hosePulleyBlockThreshold = i(10000, -1, "hosePulleyBlockThreshold", Comments.blocks, public ConfigInt hosePulleyBlockThreshold = i(10000, -1, "hosePulleyBlockThreshold", Comments.blocks,
Comments.toDisable, Comments.hosePulleyBlockThreshold); Comments.toDisable, Comments.hosePulleyBlockThreshold);
public ConfigBool fillInfinite = b(false, "fillInfinite",Comments.fillInfinite); public ConfigBool fillInfinite = b(false, "fillInfinite", Comments.fillInfinite);
public ConfigInt hosePulleyRange = i(128, 1, "hosePulleyRange", Comments.blocks, Comments.hosePulleyRange); public ConfigInt hosePulleyRange = i(128, 1, "hosePulleyRange", Comments.blocks, Comments.hosePulleyRange);
@Override @Override
@ -29,7 +29,7 @@ public class CFluids extends ConfigBase {
static String toDisable = "[-1 to disable this behaviour]"; static String toDisable = "[-1 to disable this behaviour]";
static String hosePulleyBlockThreshold = static String hosePulleyBlockThreshold =
"The minimum amount of fluid blocks the hose pulley needs to find before deeming it an infinite source."; "The minimum amount of fluid blocks the hose pulley needs to find before deeming it an infinite source.";
static String fillInfinite="Does hose pulley poor fluids to the world even if it is an infinite source?"; static String fillInfinite = "Whether hose pulleys should continue filling up above-threshold sources";
} }
} }