Post-PR Datagen
This commit is contained in:
parent
86b0d80c1b
commit
1ec299deff
4 changed files with 234 additions and 232 deletions
|
@ -437,7 +437,7 @@ dbc823d8cb38598e75871a2187b2a58d7f77f86a assets/create/lang/unfinished/nl_nl.jso
|
|||
ac609477c295be1705d3efc07848ffe6779fd397 assets/create/lang/unfinished/pl_pl.json
|
||||
95e17b968103e0ef62411489e699d39ac7ff0b64 assets/create/lang/unfinished/pt_br.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
|
||||
487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
|
||||
b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -90,11 +90,11 @@ public abstract class FluidManipulationBehaviour extends TileEntityBehaviour {
|
|||
protected int maxBlocks() {
|
||||
return AllConfigs.SERVER.fluids.hosePulleyBlockThreshold.get();
|
||||
}
|
||||
|
||||
|
||||
protected boolean fillInfinite() {
|
||||
return AllConfigs.SERVER.fluids.fillInfinite.get();
|
||||
}
|
||||
|
||||
|
||||
public void reset() {
|
||||
if (affectedArea != null)
|
||||
scheduleUpdatesInAffectedArea();
|
||||
|
@ -113,7 +113,9 @@ public abstract class FluidManipulationBehaviour extends TileEntityBehaviour {
|
|||
|
||||
protected void scheduleUpdatesInAffectedArea() {
|
||||
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 -> {
|
||||
FluidState nextFluidState = world.getFluidState(pos);
|
||||
if (nextFluidState.isEmpty())
|
||||
|
@ -200,9 +202,9 @@ public abstract class FluidManipulationBehaviour extends TileEntityBehaviour {
|
|||
: fluid.getAttributes()
|
||||
.getEmptySound();
|
||||
if (soundevent == null)
|
||||
soundevent = fluid.is(FluidTags.LAVA)
|
||||
? fillSound ? SoundEvents.BUCKET_FILL_LAVA : SoundEvents.BUCKET_EMPTY_LAVA
|
||||
: fillSound ? SoundEvents.BUCKET_FILL : SoundEvents.BUCKET_EMPTY;
|
||||
soundevent =
|
||||
fluid.is(FluidTags.LAVA) ? fillSound ? SoundEvents.BUCKET_FILL_LAVA : SoundEvents.BUCKET_EMPTY_LAVA
|
||||
: fillSound ? SoundEvents.BUCKET_FILL : SoundEvents.BUCKET_EMPTY;
|
||||
|
||||
world.playSound(null, splooshPos, soundevent, SoundCategory.BLOCKS, 0.3F, 1.0F);
|
||||
if (world instanceof ServerWorld)
|
||||
|
|
|
@ -9,7 +9,7 @@ public class CFluids extends ConfigBase {
|
|||
|
||||
public ConfigInt hosePulleyBlockThreshold = i(10000, -1, "hosePulleyBlockThreshold", Comments.blocks,
|
||||
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);
|
||||
|
||||
@Override
|
||||
|
@ -29,7 +29,7 @@ public class CFluids extends ConfigBase {
|
|||
static String toDisable = "[-1 to disable this behaviour]";
|
||||
static String hosePulleyBlockThreshold =
|
||||
"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";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue