mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-15 05:33:42 +01:00
Move obsidian movement from tag to config
This commit is contained in:
parent
4d7f56d052
commit
411ff6cfee
3 changed files with 11 additions and 8 deletions
|
@ -38,6 +38,8 @@ public class CKinetics extends ConfigBase {
|
||||||
public final ConfigInt maxCartCouplingLength = i(32, 1, "maxCartCouplingLength", Comments.maxCartCouplingLength);
|
public final ConfigInt maxCartCouplingLength = i(32, 1, "maxCartCouplingLength", Comments.maxCartCouplingLength);
|
||||||
public final ConfigEnum<ContraptionMovementSetting> spawnerMovement =
|
public final ConfigEnum<ContraptionMovementSetting> spawnerMovement =
|
||||||
e(ContraptionMovementSetting.NO_PICKUP, "movableSpawners", Comments.spawnerMovement);
|
e(ContraptionMovementSetting.NO_PICKUP, "movableSpawners", Comments.spawnerMovement);
|
||||||
|
public final ConfigEnum<ContraptionMovementSetting> obsidianMovement =
|
||||||
|
e(ContraptionMovementSetting.UNMOVABLE, "movableObsidian", Comments.obsidianMovement);
|
||||||
|
|
||||||
public final CStress stressValues = nested(1, CStress::new, Comments.stress);
|
public final CStress stressValues = nested(1, CStress::new, Comments.stress);
|
||||||
|
|
||||||
|
@ -99,6 +101,7 @@ public class CKinetics extends ConfigBase {
|
||||||
static String ejectorScanInterval =
|
static String ejectorScanInterval =
|
||||||
"Time in ticks until the next item launched by an ejector scans blocks for potential collisions";
|
"Time in ticks until the next item launched by an ejector scans blocks for potential collisions";
|
||||||
static String spawnerMovement = "Configure how Spawner blocks can be moved by contraptions.";
|
static String spawnerMovement = "Configure how Spawner blocks can be moved by contraptions.";
|
||||||
|
static String obsidianMovement = "Configure how Obsidian blocks can be moved by contraptions.";
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum DeployerAggroSetting {
|
public enum DeployerAggroSetting {
|
||||||
|
|
|
@ -1,17 +1,17 @@
|
||||||
package com.simibubi.create.foundation.config;
|
package com.simibubi.create.foundation.config;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.Blocks;
|
import net.minecraft.block.Blocks;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.world.gen.feature.template.Template;
|
import net.minecraft.world.gen.feature.template.Template;
|
||||||
import net.minecraftforge.common.extensions.IForgeBlock;
|
import net.minecraftforge.common.extensions.IForgeBlock;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
public enum ContraptionMovementSetting {
|
public enum ContraptionMovementSetting {
|
||||||
MOVABLE, NO_PICKUP, UNMOVABLE;
|
MOVABLE, NO_PICKUP, UNMOVABLE;
|
||||||
|
|
||||||
|
@ -22,8 +22,9 @@ public enum ContraptionMovementSetting {
|
||||||
}
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
// config isnt registered at this point, so im using lambda instead of a method reference
|
|
||||||
register(Blocks.SPAWNER.getRegistryName(), () -> AllConfigs.SERVER.kinetics.spawnerMovement.get());
|
register(Blocks.SPAWNER.getRegistryName(), () -> AllConfigs.SERVER.kinetics.spawnerMovement.get());
|
||||||
|
register(Blocks.OBSIDIAN.getRegistryName(), () -> AllConfigs.SERVER.kinetics.obsidianMovement.get());
|
||||||
|
register(Blocks.CRYING_OBSIDIAN.getRegistryName(), () -> AllConfigs.SERVER.kinetics.obsidianMovement.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
"replace": false,
|
"replace": false,
|
||||||
"values": [
|
"values": [
|
||||||
"minecraft:obsidian"
|
|
||||||
],
|
],
|
||||||
"optional": [
|
"optional": [
|
||||||
"immersiveengineering:connector_lv",
|
"immersiveengineering:connector_lv",
|
||||||
|
|
Loading…
Reference in a new issue