Gas concrete added (1.12), RF-required config options added (issue #63). Clinker recipe yield increased. Item-on-ground item display fixed (issue #61). Sign bounding box orientations fixed (issue #62).
This commit is contained in:
stfwi
parent
8cfa64170f
commit
1938f34faf
32 changed files with 1525 additions and 99 deletions
|
|
@ -5,4 +5,4 @@ version_minecraft=1.14.4
|
|||
version_forge_minecraft=1.14.4-28.1.79
|
||||
version_fml_mappings=20190719-1.14.3
|
||||
version_jei=1.14.4:6.0.0.10
|
||||
version_engineersdecor=1.0.16-b2
|
||||
version_engineersdecor=1.0.16-b3
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
|
||||
"1.14.4": {
|
||||
"1.0.16-b3": "[A] Config options (opt-outs and tweaks) added.\n[M] Increased clinker brick recipe yield to 8 for the builders needs.",
|
||||
"1.0.16-b2": "[A] Added Gas Concrete (including wall, stairs, slab, and slab slice).\n[F] Fixed Small Block Breaker active model.\n[F] Fixed item-on-ground display glitch (issue #61, thx Federsavo for the hint).\n[F] Added two missing recipes.",
|
||||
"1.0.16-b1": "[U] Updated to Forge 1.14.4-28.1.79/20190719-1.14.3.\n[A] Added Fluid Collection Funnel.",
|
||||
"1.0.15-b3": "[A] Added Small Block Breaker.\n[M] Mineral Smelter fluid handler/transfer added.",
|
||||
|
|
@ -32,6 +33,6 @@
|
|||
},
|
||||
"promos": {
|
||||
"1.14.4-recommended": "",
|
||||
"1.14.4-latest": "1.0.16-b2"
|
||||
"1.14.4-latest": "1.0.16-b3"
|
||||
}
|
||||
}
|
||||
|
|
@ -11,6 +11,9 @@ Mod sources for Minecraft version 1.14.4.
|
|||
|
||||
## Version history
|
||||
|
||||
- v1.0.16-b3 [A] Config options (opt-outs and tweaks) added.
|
||||
[M] Increased clinker brick recipe yield to 8 for the builders needs.
|
||||
|
||||
- v1.0.16-b2 [A] Added Gas Concrete (including wall, stairs, slab, and slab slice).
|
||||
[F] Fixed Small Block Breaker active model.
|
||||
[F] Fixed item-on-ground display glitch (issue #61, thx Federsavo for the hint).
|
||||
|
|
|
|||
|
|
@ -392,19 +392,19 @@ public class ModContent
|
|||
|
||||
public static final BlockDecorDropper FACTORY_DROPPER = (BlockDecorDropper)(new BlockDecorDropper(
|
||||
BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_REDSTONE_CONTROLLED,
|
||||
Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(2f, 15f).sound(SoundType.METAL),
|
||||
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL),
|
||||
ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,15)
|
||||
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "factory_dropper"));
|
||||
|
||||
public static final BlockDecorPlacer FACTORY_PLACER = (BlockDecorPlacer)(new BlockDecorPlacer(
|
||||
BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK|BlockDecor.CFG_REDSTONE_CONTROLLED,
|
||||
Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(2f, 15f).sound(SoundType.METAL),
|
||||
BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_REDSTONE_CONTROLLED,
|
||||
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL),
|
||||
ModAuxiliaries.getPixeledAABB(2,2,2, 14,14,14)
|
||||
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "factory_placer"));
|
||||
|
||||
public static final BlockDecorBreaker SMALL_BLOCK_BREAKER = (BlockDecorBreaker)(new BlockDecorBreaker(
|
||||
BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK,
|
||||
Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(2f, 15f).sound(SoundType.METAL),
|
||||
BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK,
|
||||
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL),
|
||||
ModAuxiliaries.getPixeledAABB(0,0,0, 16,12,16)
|
||||
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "small_block_breaker"));
|
||||
|
||||
|
|
|
|||
|
|
@ -122,16 +122,19 @@ public class BlockDecorBreaker extends BlockDecorDirectedHorizontal
|
|||
private static int boost_energy_consumption = DEFAULT_BOOST_ENERGY;
|
||||
private static int breaking_reluctance = DEFAULT_BREAKING_RELUCTANCE;
|
||||
private static int min_breaking_time = DEFAULT_MIN_BREAKING_TIME;
|
||||
private static boolean requires_power = false;
|
||||
private int tick_timer_;
|
||||
private int active_timer_;
|
||||
private int proc_time_elapsed_;
|
||||
private int boost_energy_;
|
||||
|
||||
public static void on_config(int boost_energy_per_tick, int breaking_time_per_hardness, int min_breaking_time_ticks)
|
||||
public static void on_config(int boost_energy_per_tick, int breaking_time_per_hardness, int min_breaking_time_ticks, boolean power_required)
|
||||
{
|
||||
boost_energy_consumption = TICK_INTERVAL * MathHelper.clamp(boost_energy_per_tick, 16, 512);
|
||||
breaking_reluctance = MathHelper.clamp(breaking_time_per_hardness, 5, 50);
|
||||
min_breaking_time = MathHelper.clamp(min_breaking_time_ticks, 10, 100);
|
||||
ModEngineersDecor.logger().info("Config block breaker: Boost energy consumption:" + boost_energy_consumption + "rf/t, reluctance=" + breaking_reluctance + "/hrdn, break time offset=" + min_breaking_time );
|
||||
requires_power = power_required;
|
||||
ModEngineersDecor.logger().info("Config block breaker: Boost energy consumption:" + (boost_energy_consumption/TICK_INTERVAL) + "rf/t, reluctance=" + breaking_reluctance + "t/hrdn, break time offset=" + min_breaking_time + "t");
|
||||
}
|
||||
|
||||
public BTileEntity()
|
||||
|
|
@ -259,9 +262,19 @@ public class BlockDecorBreaker extends BlockDecorDirectedHorizontal
|
|||
tick_timer_ = IDLE_TICK_INTERVAL;
|
||||
return;
|
||||
}
|
||||
proc_time_elapsed_ += TICK_INTERVAL;
|
||||
boolean active = true;
|
||||
int time_needed = (int)(target_state.getBlockHardness(world, pos) * breaking_reluctance) + min_breaking_time;
|
||||
if(boost_energy_ >= boost_energy_consumption) {
|
||||
boost_energy_ = 0;
|
||||
proc_time_elapsed_ += TICK_INTERVAL * (1+BOOST_FACTOR);
|
||||
time_needed += min_breaking_time * (3*BOOST_FACTOR/5);
|
||||
active_timer_ = 2;
|
||||
} else if(!requires_power) {
|
||||
proc_time_elapsed_ += TICK_INTERVAL;
|
||||
active_timer_ = 1024;
|
||||
} else if(active_timer_ > 0) {
|
||||
--active_timer_;
|
||||
}
|
||||
boolean active = (active_timer_ > 0);
|
||||
if(boost_energy_ >= boost_energy_consumption) {
|
||||
boost_energy_ = 0;
|
||||
proc_time_elapsed_ += TICK_INTERVAL * BOOST_FACTOR;
|
||||
|
|
|
|||
|
|
@ -87,18 +87,22 @@ public class BlockDecorTreeCutter extends BlockDecorDirectedHorizontal
|
|||
public static final int TICK_INTERVAL = 5;
|
||||
public static final int BOOST_FACTOR = 6;
|
||||
public static final int DEFAULT_BOOST_ENERGY = 64;
|
||||
public static final int DEFAULT_CUTTING_TIME_NEEDED = 20 * 60; // 60 secs, so that people don't come to the bright idea to carry one with them.
|
||||
public static final int DEFAULT_CUTTING_TIME_NEEDED = 60; // 60 secs, so that people don't come to the bright idea to carry one with them.
|
||||
private static int boost_energy_consumption = DEFAULT_BOOST_ENERGY;
|
||||
private static int cutting_time_needed = DEFAULT_CUTTING_TIME_NEEDED;
|
||||
private static int cutting_time_needed = 20 * DEFAULT_CUTTING_TIME_NEEDED;
|
||||
private static boolean requires_power = false;
|
||||
|
||||
private int tick_timer_;
|
||||
private int proc_time_elapsed_; // small, not saved in nbt.
|
||||
private int boost_energy_; // small, not saved in nbt.
|
||||
private int active_timer_;
|
||||
private int proc_time_elapsed_;
|
||||
private int boost_energy_;
|
||||
|
||||
public static void on_config(int boost_energy_per_tick)
|
||||
public static void on_config(int boost_energy_per_tick, int cutting_time_seconds, boolean power_required)
|
||||
{
|
||||
boost_energy_consumption = TICK_INTERVAL * MathHelper.clamp(boost_energy_per_tick, 16, 512);
|
||||
ModEngineersDecor.logger().info("Config tree cutter: Boost energy consumption:" + boost_energy_consumption + "rf/t");
|
||||
cutting_time_needed = 20 * MathHelper.clamp(cutting_time_seconds, 10, 240);
|
||||
requires_power = power_required;
|
||||
ModEngineersDecor.logger().info("Config tree cutter: Boost energy consumption:" + boost_energy_consumption + "rf/t" + (requires_power?" (power required for operation) ":"") + ", cutting time " + cutting_time_needed + "t." );
|
||||
}
|
||||
|
||||
public BTileEntity()
|
||||
|
|
@ -173,12 +177,21 @@ public class BlockDecorTreeCutter extends BlockDecorDirectedHorizontal
|
|||
if(!TreeCutting.canChop(tree_state) || (world.isBlockPowered(pos))) {
|
||||
if(device_state.get(ACTIVE)) world.setBlockState(pos, device_state.with(ACTIVE, false), 1|2);
|
||||
proc_time_elapsed_ = 0;
|
||||
active_timer_ = 0;
|
||||
tick_timer_ = IDLE_TICK_INTERVAL;
|
||||
return;
|
||||
}
|
||||
proc_time_elapsed_ += TICK_INTERVAL;
|
||||
if(boost_energy_ >= boost_energy_consumption) { boost_energy_ = 0; proc_time_elapsed_ += TICK_INTERVAL*BOOST_FACTOR; }
|
||||
boolean active = true;
|
||||
if(boost_energy_ >= boost_energy_consumption) {
|
||||
boost_energy_ = 0;
|
||||
proc_time_elapsed_ += TICK_INTERVAL*BOOST_FACTOR;
|
||||
active_timer_ = 2;
|
||||
} else if(!requires_power) {
|
||||
active_timer_ = 1024;
|
||||
} else if(active_timer_ > 0) {
|
||||
--active_timer_;
|
||||
}
|
||||
boolean active = (active_timer_ > 0);
|
||||
if(proc_time_elapsed_ >= cutting_time_needed) {
|
||||
proc_time_elapsed_ = 0;
|
||||
TreeCutting.chopTree(world, tree_state, tree_pos, 512, false);
|
||||
|
|
|
|||
|
|
@ -61,10 +61,27 @@ public class ModAuxiliaries
|
|||
final String ft = tr.getFormattedText();
|
||||
if(ft.contains("${")) {
|
||||
// Non-recursive, non-argument lang file entry cross referencing.
|
||||
Pattern pt = Pattern.compile("\\$\\{([\\w\\.]+)\\}");
|
||||
Pattern pt = Pattern.compile("\\$\\{([^}]+)\\}");
|
||||
Matcher mt = pt.matcher(ft);
|
||||
StringBuffer sb = new StringBuffer();
|
||||
while(mt.find()) mt.appendReplacement(sb, (new TranslationTextComponent(mt.group(1))).getFormattedText().trim());
|
||||
while(mt.find()) {
|
||||
String m = mt.group(1);
|
||||
if(m.contains("?")) {
|
||||
String[] kv = m.split("\\?", 2);
|
||||
String key = kv[0].trim();
|
||||
boolean not = key.startsWith("!");
|
||||
if(not) key = key.replaceFirst("!", "");
|
||||
m = kv[1].trim();
|
||||
if(!ModConfig.getServerConfig().contains(key)) {
|
||||
m = "";
|
||||
} else {
|
||||
boolean r = ModConfig.getServerConfig().getBoolean(key);
|
||||
if(not) r = !r;
|
||||
if(!r) m = "";
|
||||
}
|
||||
}
|
||||
mt.appendReplacement(sb, (new TranslationTextComponent(m)).getFormattedText().trim());
|
||||
}
|
||||
mt.appendTail(sb);
|
||||
return sb.toString();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ package wile.engineersdecor.detail;
|
|||
import wile.engineersdecor.ModContent;
|
||||
import wile.engineersdecor.ModEngineersDecor;
|
||||
import wile.engineersdecor.blocks.*;
|
||||
import wile.engineersdecor.blocks.BlockDecorSolarPanel.BTileEntity;
|
||||
import net.minecraft.nbt.CompoundNBT;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.common.ForgeConfigSpec;
|
||||
|
|
@ -49,6 +49,7 @@ public class ModConfig
|
|||
public static class ClientConfig
|
||||
{
|
||||
public final ForgeConfigSpec.BooleanValue without_tooltips;
|
||||
public final ForgeConfigSpec.BooleanValue without_ters;
|
||||
|
||||
ClientConfig(ForgeConfigSpec.Builder builder)
|
||||
{
|
||||
|
|
@ -62,6 +63,10 @@ public class ModConfig
|
|||
.translation(ModEngineersDecor.MODID + ".config.without_tooltips")
|
||||
.comment("Disable CTRL-SHIFT item tooltip display.")
|
||||
.define("without_tooltips", false);
|
||||
without_ters = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.without_ters")
|
||||
.comment("Disable all TERs (tile entity renderers).")
|
||||
.define("without_ters", false);
|
||||
}
|
||||
builder.pop();
|
||||
}
|
||||
|
|
@ -93,29 +98,35 @@ public class ModConfig
|
|||
public final ForgeConfigSpec.BooleanValue without_stairs;
|
||||
public final ForgeConfigSpec.BooleanValue without_ie_concrete_wall;
|
||||
public final ForgeConfigSpec.BooleanValue without_panzer_glass;
|
||||
public final ForgeConfigSpec.BooleanValue without_crafting_table;
|
||||
public final ForgeConfigSpec.BooleanValue without_lab_furnace;
|
||||
public final ForgeConfigSpec.BooleanValue without_electrical_furnace;
|
||||
public final ForgeConfigSpec.BooleanValue without_ladders;
|
||||
public final ForgeConfigSpec.BooleanValue without_treated_wood_furniture;
|
||||
public final ForgeConfigSpec.BooleanValue without_windows;
|
||||
public final ForgeConfigSpec.BooleanValue without_light_sources;
|
||||
public final ForgeConfigSpec.BooleanValue without_ladders;
|
||||
public final ForgeConfigSpec.BooleanValue without_slabs;
|
||||
public final ForgeConfigSpec.BooleanValue without_halfslabs;
|
||||
public final ForgeConfigSpec.BooleanValue without_poles;
|
||||
public final ForgeConfigSpec.BooleanValue without_hsupports;
|
||||
public final ForgeConfigSpec.BooleanValue without_sign_plates;
|
||||
public final ForgeConfigSpec.BooleanValue without_floor_grating;
|
||||
public final ForgeConfigSpec.BooleanValue without_crafting_table;
|
||||
public final ForgeConfigSpec.BooleanValue without_lab_furnace;
|
||||
public final ForgeConfigSpec.BooleanValue without_electrical_furnace;
|
||||
public final ForgeConfigSpec.BooleanValue without_valves;
|
||||
public final ForgeConfigSpec.BooleanValue without_passive_fluid_accumulator;
|
||||
public final ForgeConfigSpec.BooleanValue without_waste_incinerator;
|
||||
public final ForgeConfigSpec.BooleanValue without_factory_dropper;
|
||||
public final ForgeConfigSpec.BooleanValue without_factory_hopper;
|
||||
public final ForgeConfigSpec.BooleanValue without_factory_placer;
|
||||
public final ForgeConfigSpec.BooleanValue without_block_breaker;
|
||||
public final ForgeConfigSpec.BooleanValue without_solar_panel;
|
||||
public final ForgeConfigSpec.BooleanValue without_fluid_funnel;
|
||||
public final ForgeConfigSpec.BooleanValue without_mineral_smelter;
|
||||
public final ForgeConfigSpec.BooleanValue without_chair_sitting;
|
||||
public final ForgeConfigSpec.BooleanValue without_mob_chair_sitting;
|
||||
public final ForgeConfigSpec.BooleanValue without_ladder_speed_boost;
|
||||
public final ForgeConfigSpec.BooleanValue without_crafting_table_history;
|
||||
public final ForgeConfigSpec.BooleanValue without_valves;
|
||||
public final ForgeConfigSpec.BooleanValue without_passive_fluid_accumulator;
|
||||
public final ForgeConfigSpec.BooleanValue without_waste_incinerator;
|
||||
public final ForgeConfigSpec.BooleanValue without_sign_plates;
|
||||
public final ForgeConfigSpec.BooleanValue without_factory_dropper;
|
||||
public final ForgeConfigSpec.BooleanValue without_factory_placer;
|
||||
public final ForgeConfigSpec.BooleanValue without_factory_breaker;
|
||||
public final ForgeConfigSpec.BooleanValue without_slabs;
|
||||
public final ForgeConfigSpec.BooleanValue without_halfslabs;
|
||||
public final ForgeConfigSpec.BooleanValue without_direct_slab_pickup;
|
||||
public final ForgeConfigSpec.BooleanValue without_poles;
|
||||
public final ForgeConfigSpec.BooleanValue without_hsupports;
|
||||
|
||||
// Misc
|
||||
public final ForgeConfigSpec.BooleanValue with_experimental;
|
||||
public final ForgeConfigSpec.BooleanValue without_recipes;
|
||||
|
|
@ -132,6 +143,13 @@ public class ModConfig
|
|||
public final ForgeConfigSpec.BooleanValue with_crafting_quickmove_buttons;
|
||||
public final ForgeConfigSpec.IntValue pipevalve_max_flowrate;
|
||||
public final ForgeConfigSpec.IntValue pipevalve_redstone_gain;
|
||||
public final ForgeConfigSpec.IntValue block_breaker_power_consumption;
|
||||
public final ForgeConfigSpec.IntValue block_breaker_reluctance;
|
||||
public final ForgeConfigSpec.IntValue block_breaker_min_breaking_time;
|
||||
public final ForgeConfigSpec.BooleanValue block_breaker_requires_power;
|
||||
public final ForgeConfigSpec.IntValue tree_cuttter_energy_consumption;
|
||||
public final ForgeConfigSpec.IntValue tree_cuttter_cutting_time_needed;
|
||||
public final ForgeConfigSpec.BooleanValue tree_cuttter_requires_power;
|
||||
|
||||
CommonConfig(ForgeConfigSpec.Builder builder)
|
||||
{
|
||||
|
|
@ -245,18 +263,38 @@ public class ModConfig
|
|||
.translation(ModEngineersDecor.MODID + ".config.without_sign_plates")
|
||||
.comment("Disable decorative sign plates (caution, hazards, etc).")
|
||||
.define("without_sign_plates", false);
|
||||
without_floor_grating = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.without_floor_grating")
|
||||
.comment("Disable floor gratings.")
|
||||
.define("without_floor_grating", false);
|
||||
without_factory_dropper = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.without_factory_dropper")
|
||||
.comment("Disable the factory dropper.")
|
||||
.define("without_factory_dropper", false);
|
||||
without_factory_hopper = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.without_factory_hopper")
|
||||
.comment("Disable the factory hopper.")
|
||||
.define("without_factory_hopper", false);
|
||||
without_factory_placer = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.without_factory_placer")
|
||||
.comment("Disable the factory placer.")
|
||||
.define("without_factory_placer", false);
|
||||
without_factory_breaker = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.without_factory_breaker")
|
||||
without_block_breaker = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.without_block_breaker")
|
||||
.comment("Disable the small block breaker.")
|
||||
.define("without_factory_breaker", false);
|
||||
.define("without_block_breaker", false);
|
||||
without_solar_panel = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.without_solar_panel")
|
||||
.comment("Disable the small solar panel.")
|
||||
.define("without_solar_panel", false);
|
||||
without_fluid_funnel = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.without_fluid_funnel")
|
||||
.comment("Disable the small fluid collection funnel.")
|
||||
.define("without_fluid_funnel", false);
|
||||
without_mineral_smelter = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.without_mineral_smelter")
|
||||
.comment("Disable the small mineral smelter.")
|
||||
.define("without_mineral_smelter", false);
|
||||
without_slabs = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.without_slabs")
|
||||
.comment("Disable horizontal half-block slab.")
|
||||
|
|
@ -373,8 +411,43 @@ public class ModConfig
|
|||
"Note that the agerage power is much less, as no power is produced at all during the night, " +
|
||||
"and the power curve is nonlinear rising/falling during the day. Bad weather conditions also " +
|
||||
"decrease the production. The config value can be changed on-the-fly for tuning.")
|
||||
.defineInRange("small_solar_panel_peak_production", BTileEntity.DEFAULT_PEAK_POWER, 10, 256);
|
||||
|
||||
.defineInRange("small_solar_panel_peak_production", BlockDecorSolarPanel.BTileEntity.DEFAULT_PEAK_POWER, 10, 256);
|
||||
block_breaker_power_consumption = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.block_breaker_power_consumption")
|
||||
.comment("Defines how much RF power the Small Block Breaker requires to magnificently increase the processing speed. " +
|
||||
"The config value can be changed on-the-fly for tuning.")
|
||||
.defineInRange("block_breaker_power_consumption", BlockDecorBreaker.BTileEntity.DEFAULT_BOOST_ENERGY, 16, 512);
|
||||
block_breaker_reluctance = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.block_breaker_reluctance")
|
||||
.comment("Defines how much time the Small Block Breaker needs per block hardness, " +
|
||||
"means: 'reluctance' * hardness + min_time, you change the 'reluctance' here." +
|
||||
"The unit is ticks/hardness. " + "The config value can be changed on-the-fly for tuning.")
|
||||
.defineInRange("block_breaker_reluctance", BlockDecorBreaker.BTileEntity.DEFAULT_BREAKING_RELUCTANCE, 5, 50);
|
||||
block_breaker_min_breaking_time = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.block_breaker_min_breaking_time")
|
||||
.comment("Defines how much time the Small Block Breaker needs at least, better said it's an offset: " +
|
||||
"'reluctance' * hardness + min_time, you change the 'min_time' here, value " +
|
||||
"in ticks." + "The config value can be changed on-the-fly for tuning.")
|
||||
.defineInRange("block_breaker_min_breaking_time", BlockDecorBreaker.BTileEntity.DEFAULT_MIN_BREAKING_TIME, 10, 100);
|
||||
block_breaker_requires_power = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.block_breaker_requires_power")
|
||||
.comment("Defines if the Small Block Breaker does not work without RF power.")
|
||||
.define("block_breaker_requires_power", false);
|
||||
tree_cuttter_energy_consumption = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.tree_cuttter_energy_consumption")
|
||||
.comment("Defines how much RF power the Small Tree Cutter requires to magnificently increase the processing speed. " +
|
||||
"The config value can be changed on-the-fly for tuning.")
|
||||
.defineInRange("tree_cuttter_energy_consumption", BlockDecorTreeCutter.BTileEntity.DEFAULT_BOOST_ENERGY, 16, 512);
|
||||
tree_cuttter_cutting_time_needed = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.tree_cuttter_cutting_time_needed")
|
||||
.comment("Defines how much time the Small Tree Cutter needs to cut a tree without RF power. " +
|
||||
"The value is in seconds. With energy it is 6 times faster. " +
|
||||
"The config value can be changed on-the-fly for tuning.")
|
||||
.defineInRange("tree_cuttter_cutting_time_needed", BlockDecorTreeCutter.BTileEntity.DEFAULT_CUTTING_TIME_NEEDED, 10, 240);
|
||||
tree_cuttter_requires_power = builder
|
||||
.translation(ModEngineersDecor.MODID + ".config.tree_cuttter_requires_power")
|
||||
.comment("Defines if the Small Tree Cutter does not work without RF power.")
|
||||
.define("tree_cuttter_requires_power", false);
|
||||
builder.pop();
|
||||
}
|
||||
}
|
||||
|
|
@ -430,12 +503,17 @@ public class ModConfig
|
|||
if(block instanceof BlockDecorWasteIncinerator) return COMMON.without_waste_incinerator.get();
|
||||
if(block instanceof BlockDecorDropper) return COMMON.without_factory_dropper.get();
|
||||
if(block instanceof BlockDecorPlacer) return COMMON.without_factory_placer.get();
|
||||
if(block instanceof BlockDecorBreaker) return COMMON.without_factory_breaker.get();
|
||||
if(block instanceof BlockDecorBreaker) return COMMON.without_block_breaker.get();
|
||||
if(block instanceof BlockDecorHalfSlab) return COMMON.without_halfslabs.get();
|
||||
if(block instanceof BlockDecorLadder) return COMMON.without_ladders.get();
|
||||
if(block instanceof BlockDecorWindow) return COMMON.without_windows.get();
|
||||
if(block instanceof BlockDecorPipeValve) return COMMON.without_valves.get();
|
||||
if(block instanceof BlockDecorHorizontalSupport) return COMMON.without_hsupports.get();
|
||||
if(block instanceof BlockDecorFloorGrating) return COMMON.without_floor_grating.get();
|
||||
if(block instanceof BlockDecorHopper) return COMMON.without_factory_hopper.get();
|
||||
if(block instanceof BlockDecorFluidFunnel) return COMMON.without_fluid_funnel.get();
|
||||
if(block instanceof BlockDecorSolarPanel) return COMMON.without_solar_panel.get();
|
||||
if(block instanceof BlockDecorMineralSmelter) return COMMON.without_mineral_smelter.get();
|
||||
// Type based evaluation where later filters may match, too
|
||||
if(COMMON.without_slabs.get() && (block instanceof BlockDecorSlab)) return true;
|
||||
if(COMMON.without_stairs.get() && (block instanceof BlockDecorStairs)) return true;
|
||||
|
|
@ -476,10 +554,14 @@ public class ModConfig
|
|||
//--------------------------------------------------------------------------------------------------------------------
|
||||
private static final ArrayList<String> includes_ = new ArrayList<String>();
|
||||
private static final ArrayList<String> excludes_ = new ArrayList<String>();
|
||||
private static final CompoundNBT server_config_ = new CompoundNBT();
|
||||
public static boolean without_crafting_table = false;
|
||||
public static boolean immersiveengineering_installed = false;
|
||||
private static boolean with_experimental_features_ = false;
|
||||
|
||||
public static final CompoundNBT getServerConfig() // config that may be synchronized from server to client via net pkg.
|
||||
{ return server_config_; }
|
||||
|
||||
public static final void apply()
|
||||
{
|
||||
BlockDecorFurnace.BTileEntity.on_config(COMMON.furnace_smelting_speed_percent.get(), COMMON.furnace_fuel_efficiency_percent.get(), COMMON.furnace_boost_energy_consumption.get());
|
||||
|
|
@ -489,6 +571,8 @@ public class ModConfig
|
|||
BlockDecorPipeValve.on_config(COMMON.pipevalve_max_flowrate.get(), COMMON.pipevalve_redstone_gain.get());
|
||||
BlockDecorFurnaceElectrical.BTileEntity.on_config(COMMON.e_furnace_speed_percent.get(), COMMON.e_furnace_power_consumption.get(), COMMON.e_furnace_automatic_pulling.get());
|
||||
BlockDecorSolarPanel.BTileEntity.on_config(COMMON.small_solar_panel_peak_production.get());
|
||||
BlockDecorBreaker.BTileEntity.on_config(COMMON.block_breaker_power_consumption.get(), COMMON.block_breaker_reluctance.get(), COMMON.block_breaker_min_breaking_time.get(), COMMON.block_breaker_requires_power.get());
|
||||
BlockDecorTreeCutter.BTileEntity.on_config(COMMON.tree_cuttter_energy_consumption.get(), COMMON.tree_cuttter_cutting_time_needed.get(), COMMON.tree_cuttter_requires_power.get());
|
||||
without_crafting_table = isOptedOut(ModContent.TREATED_WOOD_CRAFTING_TABLE);
|
||||
immersiveengineering_installed = ModAuxiliaries.isModLoaded("immersiveengineering");
|
||||
with_experimental_features_ = COMMON.with_experimental.get();
|
||||
|
|
@ -516,5 +600,10 @@ public class ModConfig
|
|||
if(!excl[i].isEmpty()) excludes_.add(excl[i]);
|
||||
}
|
||||
}
|
||||
{
|
||||
// Check if the config is already synchronized or has to be synchronised.
|
||||
server_config_.putBoolean("tree_cuttter_requires_power", COMMON.tree_cuttter_requires_power.get());
|
||||
server_config_.putBoolean("block_breaker_requires_power", COMMON.block_breaker_requires_power.get());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
"engineersdecor.tooltip.hint.extended": "§6[§9SHIFT§r More Info§6]§r",
|
||||
"engineersdecor.tooltip.hint.help": "§6[§9CTRL-SHIFT§r Help§6]§r",
|
||||
"engineersdecor.tooltip.slabpickup.help": "§rFast pickup by left-clicking while looking up/down and holding this slab.",
|
||||
"engineersdecor.tooltip.requires_rf_power": "Requires RF power.",
|
||||
"engineersdecor.tooltip.massive_speed_boost_with_rf_power": "Apply RF power to magnificently increase the speed.",
|
||||
"engineersdecor.config.pattern_excludes": "Pattern excludes",
|
||||
"engineersdecor.config.pattern_includes": "Pattern includes",
|
||||
"engineersdecor.config.without_clinker_bricks": "Without clinker bricks",
|
||||
|
|
@ -172,13 +174,15 @@
|
|||
"block.engineersdecor.factory_placer": "Factory Block Placer",
|
||||
"block.engineersdecor.factory_placer.help": "§6Allows placing blocks and planting crops or trees.§r\n GUI Redstone controls: Not inverted / inverted (default), pulse mode / continuous mode (default).\\n Also supports spike planing from underneath the soil. Spits out items that it cannot place or plant.",
|
||||
"block.engineersdecor.small_block_breaker": "Small Block Breaker",
|
||||
"block.engineersdecor.small_block_breaker.help": "§6Breaks blocks in front of it.§r\n Can be disabled by applying a redstone signal. The time needed to destroy a block depends on the hardness of that block. Provide RF/FE power to speed up the breaking process (massively).",
|
||||
"block.engineersdecor.small_block_breaker.help": "§6Breaks blocks in front of it.§r\n Can be disabled by applying a redstone signal. The time needed to destroy a block depends on the hardness of that block. ${!block_breaker_requires_power?engineersdecor.tooltip.massive_speed_boost_with_rf_power} ${block_breaker_requires_power?engineersdecor.tooltip.requires_rf_power}",
|
||||
"block.engineersdecor.small_mineral_smelter": "Small Mineral Melting Furnace",
|
||||
"block.engineersdecor.small_mineral_smelter.help": "§6High temperature, high insulation electrical stone melting furnace.§r\n Heats up mineral blocks to magma blocks, and finally to lava. Click with a mineral block (stone, cobble, etc) or use item insertion to place a block in the melter. Use bucket or fluid extraction to retrieve the lava. When cooling down lava, obsidian is generated. Remove the RF power or apply a redstone signal to disable the furnace. For automation, use a redstone comparator to see in which melting phase the mineral is a moment.",
|
||||
"block.engineersdecor.small_solar_panel": "Small Solar Panel",
|
||||
"block.engineersdecor.small_solar_panel.help": "§6Produces a small amount of power when exposed to sunlight.§r\n Useful for charging LF capacitors in remote systems with low consumption. The internal charge pump circuit accumulates and frequently transfers RF. Production depends on day time and the weather.",
|
||||
"block.engineersdecor.small_tree_cutter": "Small Tree Cutter",
|
||||
"block.engineersdecor.small_tree_cutter.help": "§6Chops grown trees in front of it.§r\n Does not collect the lumbers. Deactivate with a redstone signal. Provide RF power to boost the cutting speed (takes a long time without power).",
|
||||
"block.engineersdecor.small_tree_cutter.help": "§6Chops grown trees in front of it.§r\n Does not collect the lumbers. Deactivate with a redstone signal. ${!tree_cuttter_requires_power?engineersdecor.tooltip.massive_speed_boost_with_rf_power} ${tree_cuttter_requires_power?engineersdecor.tooltip.requires_rf_power}",
|
||||
"block.engineersdecor.small_milking_machine": "Small Milking Machine",
|
||||
"block.engineersdecor.small_milking_machine.help": "§6Frequently attracts and milks cows.§r\n Has an internal fluid tank. Does not feed the animals. Use buckets to retrieve the milk.",
|
||||
"block.engineersdecor.sign_decor": "Sign Plate (Engineer's decor)",
|
||||
"block.engineersdecor.sign_decor.help": "§6This should not be craftable or visible in JEI. Used for creative tab and screenshots.",
|
||||
"block.engineersdecor.sign_hotwire": "Sign \"Caution Hot Wire\"",
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
"engineersdecor.tooltip.hint.extended": "§6[§9SHIFT§r Больше информации§6]§r",
|
||||
"engineersdecor.tooltip.hint.help": "§6[§9CTRL-SHIFT§r Помощь§6]§r",
|
||||
"engineersdecor.tooltip.slabpickup.help": "§rБыстрое поднятие щелчком ЛКМ, смотря вверх/вниз с этой плитой в руках.",
|
||||
"engineersdecor.tooltip.requires_rf_power": "Requires RF power.",
|
||||
"engineersdecor.tooltip.massive_speed_boost_with_rf_power": "Apply RF power to magnificently increase the speed.",
|
||||
"engineersdecor.config.pattern_excludes": "Pattern excludes",
|
||||
"engineersdecor.config.pattern_includes": "Pattern includes",
|
||||
"engineersdecor.config.without_clinker_bricks": "Без клинкерных кирпичей",
|
||||
|
|
@ -164,6 +166,7 @@
|
|||
"block.engineersdecor.small_mineral_smelter": "Small Mineral Melting Furnace",
|
||||
"block.engineersdecor.small_solar_panel": "Small Solar Panel",
|
||||
"block.engineersdecor.small_tree_cutter": "Small Tree Cutter",
|
||||
"block.engineersdecor.small_milking_machine": "Small Milking Machine",
|
||||
"block.engineersdecor.sign_decor": "Табличка с надписью (Логотип Engineer's decor)",
|
||||
"block.engineersdecor.sign_decor.help": "§Это не должно быть крафтовым или видимым в JEI. Используется для творческой вкладки и скриншотов.",
|
||||
"block.engineersdecor.sign_hotwire": "Знак «Осторожно, под напряжением»",
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
"engineersdecor.tooltip.hint.extended": "§6[§9SHIFT§r 查看更多信息§6]§r",
|
||||
"engineersdecor.tooltip.hint.help": "§6[§9CTRL-SHIFT§r 查看帮助§6]§r",
|
||||
"engineersdecor.tooltip.slabpickup.help": "§r手持同类台阶往上/下看时单击该台阶可无需破坏快速拾起。",
|
||||
"engineersdecor.tooltip.requires_rf_power": "Requires RF power.",
|
||||
"engineersdecor.tooltip.massive_speed_boost_with_rf_power": "Apply RF power to magnificently increase the speed.",
|
||||
"engineersdecor.config.pattern_excludes": "模式不包括",
|
||||
"engineersdecor.config.pattern_includes": "模式包括",
|
||||
"engineersdecor.config.without_clinker_bricks": "不要过烧砖",
|
||||
|
|
@ -170,6 +172,7 @@
|
|||
"block.engineersdecor.small_solar_panel.help": "§6暴露在阳光下时产生少量能量。§r\n 用于低消耗地在远程系统给低压电容器充电。 内部电荷泵电路积累并频繁输出RF。产出取决于时间 和天气。",
|
||||
"block.engineersdecor.small_tree_cutter": "小型砍树机",
|
||||
"block.engineersdecor.small_tree_cutter.help": "§6砍倒正前方的树。§r\n 不收集木材。通入红石信号停用。 提供RF来加快砍树速度。（没有的话会很慢。）",
|
||||
"block.engineersdecor.small_milking_machine": "Small Milking Machine",
|
||||
"block.engineersdecor.sign_decor": "标志板（工程师的装饰）",
|
||||
"block.engineersdecor.sign_decor.help": "§6这不应该可合成或在JEI看到。用于创造模式的物品栏标签和截屏。",
|
||||
"block.engineersdecor.sign_hotwire": "指示牌 \"小心电线\"",
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@
|
|||
},
|
||||
"result": {
|
||||
"item": "engineersdecor:clinker_brick_block",
|
||||
"count": 4
|
||||
"count": 8
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue