Compare commits

...

8 Commits

Author SHA1 Message Date
TheBrokenRail 9dde7b4288 1.0.4
EnergonRelics/pipeline/head This commit looks good Details
2020-09-10 19:10:56 -04:00
TheBrokenRail 40de5445d1 1.0.3
EnergonRelics/pipeline/head This commit looks good Details
2020-09-06 10:41:30 -04:00
TheBrokenRail 643e287e23 1.0.2
EnergonRelics/pipeline/head This commit looks good Details
2020-08-31 19:19:54 -04:00
TheBrokenRail e5135deef1 Add Veridium Block To Beacon Base Blocks Tag
EnergonRelics/pipeline/head This commit looks good Details
2020-08-30 19:10:33 -04:00
TheBrokenRail 7cb97d4bb6 1.0.1
EnergonRelics/pipeline/head This commit looks good Details
2020-08-30 17:18:29 -04:00
TheBrokenRail a754b43b7c Merge pull request 'fix up ru_ru.lang' (#3) from Yoghurt4C/EnergonRelics:webedit-1 into master
EnergonRelics/pipeline/head This commit looks good Details
2020-08-29 21:37:00 +00:00
Yoghurt4C 89b42442fd Either Hot Shit or Total Bollocks 2020-08-27 13:48:32 +00:00
Yoghurt4C ac1c09cc5f Update 'src/main/resources/assets/energonrelics/lang/ru_ru.json' 2020-08-27 13:21:16 +00:00
24 changed files with 378 additions and 65 deletions

View File

@ -1,5 +1,19 @@
# Changelog # Changelog
**1.0.4**
* Fix Crash When Sneak-Using Dye On A Block
**1.0.3**
* Fix Gravity Crash
**1.0.2**
* Attempt To Fix Structure Generation Crash
**1.0.1**
* Add Advancements
* Industrial Laser Can Smelt Nether Gold Ore
* Rework Network Chip Recipe
**1.0.8** **1.0.8**
* Update Textures * Update Textures

View File

@ -10,7 +10,7 @@ org.gradle.jvmargs = -Xmx1G
fabric_loader_version = 0.9.2+build.206 fabric_loader_version = 0.9.2+build.206
# Mod Properties # Mod Properties
mod_version = 1.0.0 mod_version = 1.0.4
maven_group = com.thebrokenrail maven_group = com.thebrokenrail
# Dependencies # Dependencies

View File

@ -106,15 +106,17 @@ public class PhaseShifterBlock extends EnergyBlock {
UseBlockCallback.EVENT.register((player, world, hand, hit) -> { UseBlockCallback.EVENT.register((player, world, hand, hit) -> {
if (!player.isSpectator() && player.shouldCancelInteraction()) { if (!player.isSpectator() && player.shouldCancelInteraction()) {
BlockState state = world.getBlockState(hit.getBlockPos()); BlockState state = world.getBlockState(hit.getBlockPos());
ItemStack stack = player.getStackInHand(hand); if (state.getBlock() == PhaseShifterBlock.this) {
if (stack.getItem() instanceof DyeItem) { ItemStack stack = player.getStackInHand(hand);
DyeColor newColor = ((DyeItem) stack.getItem()).getColor(); if (stack.getItem() instanceof DyeItem) {
if (state.get(PhaseShifterBlock.COLOR) != newColor) { DyeColor newColor = ((DyeItem) stack.getItem()).getColor();
world.setBlockState(hit.getBlockPos(), state.with(PhaseShifterBlock.COLOR, newColor)); if (state.get(PhaseShifterBlock.COLOR) != newColor) {
if (!player.isCreative()) { world.setBlockState(hit.getBlockPos(), state.with(PhaseShifterBlock.COLOR, newColor));
stack.decrement(1); if (!player.isCreative()) {
stack.decrement(1);
}
return ActionResult.SUCCESS;
} }
return ActionResult.SUCCESS;
} }
} }
} }

View File

@ -19,17 +19,23 @@ class StructureGeneratorPiece extends StructurePiece {
private final StructureGeneratorBlock block; private final StructureGeneratorBlock block;
private final BlockRotation rotation; private final BlockRotation rotation;
private final BlockPos pos; private final BlockPos pos;
private boolean placed;
StructureGeneratorPiece(StructureGeneratorBlock block, BlockRotation rotation, BlockPos pos) { private StructureGeneratorPiece(StructureGeneratorBlock block, BlockRotation rotation, BlockPos pos, boolean placed) {
super(block.piece, 0); super(block.piece, 0);
this.block = block; this.block = block;
this.rotation = rotation; this.rotation = rotation;
this.pos = pos; this.pos = pos;
this.placed = placed;
boundingBox = BlockBox.create(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1); boundingBox = BlockBox.create(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1);
} }
StructureGeneratorPiece(StructureGeneratorBlock block, BlockRotation rotation, BlockPos pos) {
this(block, rotation, pos, false);
}
StructureGeneratorPiece(StructureGeneratorBlock block, CompoundTag tag) { StructureGeneratorPiece(StructureGeneratorBlock block, CompoundTag tag) {
this(block, BlockRotation.valueOf(tag.getString("Rot")), new BlockPos(tag.getInt("X"), tag.getInt("Y"), tag.getInt("Z"))); this(block, BlockRotation.valueOf(tag.getString("Rot")), new BlockPos(tag.getInt("X"), tag.getInt("Y"), tag.getInt("Z")), tag.getBoolean("Placed"));
} }
@Override @Override
@ -38,19 +44,24 @@ class StructureGeneratorPiece extends StructurePiece {
tag.putInt("X", pos.getX()); tag.putInt("X", pos.getX());
tag.putInt("Y", pos.getY()); tag.putInt("Y", pos.getY());
tag.putInt("Z", pos.getZ()); tag.putInt("Z", pos.getZ());
tag.putBoolean("Placed", placed);
} }
@Override @Override
public boolean generate(StructureWorldAccess world, StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, Random random, BlockBox boundingBox, ChunkPos chunkPos, BlockPos blockPos) { public boolean generate(StructureWorldAccess world, StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, Random random, BlockBox boundingBox, ChunkPos chunkPos, BlockPos blockPos) {
BlockState state = block.getDefaultState().rotate(rotation); if (!placed) {
BlockState state = block.getDefaultState().rotate(rotation);
world.setBlockState(pos, state, 3); world.setBlockState(pos, state, 3);
BlockEntity entity = world.getBlockEntity(pos); BlockEntity entity = world.getBlockEntity(pos);
if (entity instanceof StructureGeneratorBlockEntity) { if (entity instanceof StructureGeneratorBlockEntity) {
((StructureGeneratorBlockEntity) entity).setSeed(random.nextLong()); ((StructureGeneratorBlockEntity) entity).setSeed(random.nextLong());
}
block.schedule(world, pos);
placed = true;
} }
block.schedule(world, pos);
return true; return true;
} }
} }

View File

@ -5,6 +5,7 @@ import com.thebrokenrail.energonrelics.block.forcefield.util.BeamBlock;
import com.thebrokenrail.energonrelics.block.portal.PortalCooldownEntity; import com.thebrokenrail.energonrelics.block.portal.PortalCooldownEntity;
import com.thebrokenrail.energonrelics.config.HardcodedConfig; import com.thebrokenrail.energonrelics.config.HardcodedConfig;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@ -26,6 +27,8 @@ import java.util.function.Predicate;
public abstract class MixinEntity implements PortalCooldownEntity { public abstract class MixinEntity implements PortalCooldownEntity {
@Unique @Unique
private int energyPortalCooldown = 0; private int energyPortalCooldown = 0;
@Unique
private boolean touchingBeam = false;
@Shadow @Shadow
public abstract Box getBoundingBox(); public abstract Box getBoundingBox();
@ -53,7 +56,8 @@ public abstract class MixinEntity implements PortalCooldownEntity {
for (int q = k; q < l; ++q) { for (int q = k; q < l; ++q) {
for (int r = m; r < n; ++r) { for (int r = m; r < n; ++r) {
pos.set(p, q, r); pos.set(p, q, r);
if (test.test(getEntityWorld().getBlockState(pos).getBlock())) { BlockState state = getEntityWorld().getBlockState(pos);
if (state.getCollisionShape(getEntityWorld(), pos).isEmpty() && test.test(state.getBlock())) {
getEntityWorld().getProfiler().pop(); getEntityWorld().getProfiler().pop();
return true; return true;
} }
@ -71,7 +75,7 @@ public abstract class MixinEntity implements PortalCooldownEntity {
@Inject(at = @At("HEAD"), method = "hasNoGravity", cancellable = true) @Inject(at = @At("HEAD"), method = "hasNoGravity", cancellable = true)
public void hasNoGravity(CallbackInfoReturnable<Boolean> info) { public void hasNoGravity(CallbackInfoReturnable<Boolean> info) {
if (!saving && isTouching(block -> block instanceof BeamBlock)) { if (!saving && touchingBeam) {
info.setReturnValue(true); info.setReturnValue(true);
} }
} }
@ -92,8 +96,13 @@ public abstract class MixinEntity implements PortalCooldownEntity {
energyPortalCooldown = tag.getInt(EnergonRelics.NAMESPACE + ":EnergyPortalCooldown"); energyPortalCooldown = tag.getInt(EnergonRelics.NAMESPACE + ":EnergyPortalCooldown");
} }
@Inject(at = @At("HEAD"), method = "tick")
public void tickHead(CallbackInfo info) {
touchingBeam = isTouching(block -> block instanceof BeamBlock);
}
@Inject(at = @At("RETURN"), method = "tick") @Inject(at = @At("RETURN"), method = "tick")
public void tick(CallbackInfo info) { public void tickReturn(CallbackInfo info) {
energyPortalCooldown--; energyPortalCooldown--;
} }

View File

@ -34,7 +34,9 @@ public class IndustrialLaserRegistry {
return new ItemStack(ingot, count); return new ItemStack(ingot, count);
}); });
map.put(storage, random -> new ItemStack(ingot, HardcodedConfig.INDUSTRIAL_LASER_INGOTS_FROM_STORAGE)); if (storage != null) {
map.put(storage, random -> new ItemStack(ingot, HardcodedConfig.INDUSTRIAL_LASER_INGOTS_FROM_STORAGE));
}
} }
/** /**
@ -62,6 +64,7 @@ public class IndustrialLaserRegistry {
add(Blocks.COAL_ORE, Items.COAL, Blocks.COAL_BLOCK); add(Blocks.COAL_ORE, Items.COAL, Blocks.COAL_BLOCK);
add(Blocks.IRON_ORE, Items.IRON_INGOT, Blocks.IRON_BLOCK); add(Blocks.IRON_ORE, Items.IRON_INGOT, Blocks.IRON_BLOCK);
add(Blocks.GOLD_ORE, Items.GOLD_INGOT, Blocks.GOLD_BLOCK); add(Blocks.GOLD_ORE, Items.GOLD_INGOT, Blocks.GOLD_BLOCK);
add(Blocks.NETHER_GOLD_ORE, Items.GOLD_INGOT, null);
add(Blocks.DIAMOND_ORE, Items.DIAMOND, Blocks.DIAMOND_BLOCK); add(Blocks.DIAMOND_ORE, Items.DIAMOND, Blocks.DIAMOND_BLOCK);
add(Blocks.EMERALD_ORE, Items.EMERALD, Blocks.EMERALD_BLOCK); add(Blocks.EMERALD_ORE, Items.EMERALD, Blocks.EMERALD_BLOCK);
add(EnergonRelics.Blocks.VERIDIUM_ORE, EnergonRelics.Items.VERIDIUM_INGOT, EnergonRelics.Blocks.VERIDIUM_BLOCK); add(EnergonRelics.Blocks.VERIDIUM_ORE, EnergonRelics.Items.VERIDIUM_INGOT, EnergonRelics.Blocks.VERIDIUM_BLOCK);

View File

@ -1,7 +1,7 @@
{ {
"parent": "minecraft:block/block", "parent": "minecraft:block/block",
"textures": { "textures": {
"0": "energonrelics:block/gold_block", "0": "minecraft:block/gold_block",
"1": "energonrelics:block/lightning_rod_base", "1": "energonrelics:block/lightning_rod_base",
"particle": "#1" "particle": "#1"
}, },

View File

@ -2,7 +2,7 @@
"credit": "Made by Azazelthedemonlord", "credit": "Made by Azazelthedemonlord",
"textures": { "textures": {
"0": "energonrelics:block/lightning_rod", "0": "energonrelics:block/lightning_rod",
"particle": "energonrelics:block/gold_block" "particle": "minecraft:block/gold_block"
}, },
"elements": [ "elements": [
{ {

View File

@ -3,7 +3,7 @@
"textures": { "textures": {
"0": "energonrelics:block/lightning_rod", "0": "energonrelics:block/lightning_rod",
"1": "energonrelics:block/lightning_rod_base", "1": "energonrelics:block/lightning_rod_base",
"particle": "energonrelics:block/gold_block" "particle": "minecraft:block/gold_block"
}, },
"elements": [ "elements": [
{ {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 416 B

View File

@ -65,5 +65,21 @@
"block.energonrelics.phase_shifter": "Phase Shifter", "block.energonrelics.phase_shifter": "Phase Shifter",
"text.energonrelics.phase_shifter_extra": "Phased Items: %s", "text.energonrelics.phase_shifter_extra": "Phased Items: %s",
"category.rei.energonrelics.information.structure_generation.title": "Structures", "category.rei.energonrelics.information.structure_generation.title": "Structures",
"category.rei.energonrelics.information.structure_generation.research_complex": "Found In The Research Complex Underground Structure" "category.rei.energonrelics.information.structure_generation.research_complex": "Found In The Research Complex Underground Structure",
"advancements.energonrelics.root.title": "EnergonRelics",
"advancements.energonrelics.root.description": "A Simple Technology Mod",
"advancements.energonrelics.find_circuit_board.title": "Mysterious Machines",
"advancements.energonrelics.find_circuit_board.description": "Find a Circuit Board",
"advancements.energonrelics.craft_solar_panel.title": "Power of The Sun",
"advancements.energonrelics.craft_solar_panel.description": "Craft a Solar Panel",
"advancements.energonrelics.craft_network_chip.title": "Invisible Wires",
"advancements.energonrelics.craft_network_chip.description": "Craft a Network Chip",
"advancements.energonrelics.smelt_veridium_ore.title": "Hidden Power",
"advancements.energonrelics.smelt_veridium_ore.description": "Smelt Veridium Ore",
"advancements.energonrelics.craft_switch.title": "Logical Constellations",
"advancements.energonrelics.craft_switch.description": "Craft a Switch",
"advancements.energonrelics.craft_multimeter.title": "Measuring Madness",
"advancements.energonrelics.craft_multimeter.description": "Craft a Multimeter",
"advancements.energonrelics.craft_reactor_core.title": "Artificial Star",
"advancements.energonrelics.craft_reactor_core.description": "Craft a Reactor Core"
} }

View File

@ -1,55 +1,55 @@
{ {
"item.energonrelics.network_chip": "Сетевой чип", "item.energonrelics.network_chip": "Сетевой чип",
"block.energonrelics.energon_light": "Энергон Свет", "block.energonrelics.energon_light": "Энергоновая лампа",
"block.energonrelics.solar_panel": "Сонячна панель", "block.energonrelics.solar_panel": "Солнечная панель",
"block.energonrelics.switch": "Переключатель", "block.energonrelics.switch": "Переключатель",
"item.energonrelics.multimeter": "Мультиметр", "item.energonrelics.multimeter": "Мультиметр",
"text.energonrelics.energy_required": "Требуемая энергия: %s Енергон", "text.energonrelics.energy_required": "Требуемая энергия: %s Энергон",
"text.energonrelics.energy_available": "Доступная энергия: %s Енергон", "text.energonrelics.energy_available": "Доступная энергия: %s Энергон",
"block.energonrelics.thermal_casing": "Тепловой кожух", "block.energonrelics.thermal_casing": "Термальнй кожух",
"block.energonrelics.thermal_glass": "Термальное стекло", "block.energonrelics.thermal_glass": "Термостекло",
"block.energonrelics.battery_core": "Батерейне ядро", "block.energonrelics.battery_core": "Ядро батареи",
"block.energonrelics.passive_battery_controller": "Пассивный контроллер батареи", "block.energonrelics.passive_battery_controller": "Пассивный контроллер батареи",
"block.energonrelics.active_battery_controller": "Активный контроллер батареи", "block.energonrelics.active_battery_controller": "Активный контроллер батареи",
"item.energonrelics.circuit_board": "Монтажная плата", "item.energonrelics.circuit_board": "Печатная плата",
"block.energonrelics.reactor_controller": "Реактор контролер", "block.energonrelics.reactor_controller": "Контроллер реактора",
"block.energonrelics.reactor_input": "Вход реактора", "block.energonrelics.reactor_input": "Порт реактора",
"block.energonrelics.reactor_core": "Ядро реактора", "block.energonrelics.reactor_core": "Ядро реактора",
"item.energonrelics.veridium_ingot": "Слиток Веридиума", "item.energonrelics.veridium_ingot": "Веридиумный слиток",
"block.energonrelics.veridium_ore": "Веридиумна руда", "block.energonrelics.veridium_ore": "Веридиумная руда",
"block.energonrelics.veridium_block": "Веридиумный блок", "block.energonrelics.veridium_block": "Веридиумный блок",
"item.energonrelics.defensive_laser_core": "Защитное лазерное ядро", "item.energonrelics.defensive_laser_core": "Защитное лазерное ядро",
"block.energonrelics.defensive_laser": "Защитный лазер", "block.energonrelics.defensive_laser": "Защитный лазер",
"text.autoconfig.energonrelics.option.textureSet": "Набор текстур", "text.autoconfig.energonrelics.option.textureSet": "Набор текстур",
"death.attack.energonrelics.defensive_laser": "%s был испарен защитным лазером", "death.attack.energonrelics.defensive_laser": "%s был испарен защитным лазером",
"death.attack.energonrelics.defensive_laser.player": "%s был испарен защитным лазером во время боя %s", "death.attack.energonrelics.defensive_laser.player": "%s был испарен защитным лазером во время боя с %s",
"block.energonrelics.research_complex_generator": "Генератор исследовательского комплекс", "block.energonrelics.research_complex_generator": "Генератор исследовательского комплекса",
"block.energonrelics.block_breaker": "Блок отмени", "block.energonrelics.block_breaker": "Ломатель блоков",
"item.energonrelics.veridium_powder": "Веридиум порошок", "item.energonrelics.veridium_powder": "Веридиумный порошок",
"effect.energonrelics.veridium_poison": "Веридиумная зелья", "effect.energonrelics.veridium_poison": "Веридиумный яд",
"item.minecraft.potion.effect.energonrelics.veridium_poison": "Зелья деградации", "item.minecraft.potion.effect.energonrelics.veridium_poison": "Зелье деградации",
"item.minecraft.splash_potion.effect.energonrelics.veridium_poison": "Взривное зелья деградации", "item.minecraft.splash_potion.effect.energonrelics.veridium_poison": "Взрывное зелье деградации",
"item.minecraft.lingering_potion.effect.energonrelics.veridium_poison": "Туманое зелья деградации", "item.minecraft.lingering_potion.effect.energonrelics.veridium_poison": "Туманное зелье деградации",
"item.minecraft.tipped_arrow.effect.energonrelics.veridium_poison": "Стрела деградации", "item.minecraft.tipped_arrow.effect.energonrelics.veridium_poison": "Стрела деградации",
"block.energonrelics.lightning_rod_base": "Молниеотвод", "block.energonrelics.lightning_rod_base": "Молниеотвод",
"block.energonrelics.forcefield": "Силовое поле", "block.energonrelics.forcefield": "Силовое поле",
"block.energonrelics.forcefield_projector": "Проектор силового поля", "block.energonrelics.forcefield_projector": "Проектор силового поля",
"block.energonrelics.creative_energy_source": "Источник творческой энергии", "block.energonrelics.creative_energy_source": "Креативный источник энергии",
"block.energonrelics.holographic_sky": "Голографическое небо", "block.energonrelics.holographic_sky": "Голографическое небо",
"block.energonrelics.tractor_beam_projector": "Проектор тракторного луча", "block.energonrelics.tractor_beam_projector": "Проектор тягового луча",
"block.energonrelics.tractor_beam": "Луч трактора", "block.energonrelics.tractor_beam": "Тяговый луч",
"block.energonrelics.repulsor_beam": "Репульсорный луч", "block.energonrelics.repulsor_beam": "Репульсорный луч",
"block.energonrelics.industrial_laser_projector": "Промышленный лазерный проектор", "block.energonrelics.industrial_laser_projector": "Промышленный лазерный проектор",
"block.energonrelics.industrial_laser": "Промышленный лазер", "block.energonrelics.industrial_laser": "Промышленный лазер",
"death.attack.energonrelics.industrial_laser": "%s был расплавлен промышленным лазером", "death.attack.energonrelics.industrial_laser": "%s был расплавлен промышленным лазером",
"death.attack.energonrelics.industrial_laser.player": "%s был расплавлен промышленным лазером во время боя %s", "death.attack.energonrelics.industrial_laser.player": "%s был расплавлен промышленным лазером во время боя с %s",
"block.energonrelics.infuser": "Инфузиор", "block.energonrelics.infuser": "Насыщатель",
"text.energonrelics.infuser_progress": "Инфузионный прогресс: %s%%", "text.energonrelics.infuser_progress": "Прогресс насыщения: %s%%",
"text.energonrelics.battery_core_tooltip": "%s Еергон", "text.energonrelics.battery_core_tooltip": "%s Энергон",
"category.rei.energonrelics.infusing.chance": "%s%% Шанс", "category.rei.energonrelics.infusing.chance": "%s%% Шанс",
"category.rei.energonrelics.infusing.cost": "%s Енергон", "category.rei.energonrelics.infusing.cost": "%s Энергон",
"category.rei.energonrelics.infusing.name": "Инфузиор", "category.rei.energonrelics.infusing.name": "Насыщатель",
"item.energonrelics.veridium_orb": "Сфера Веридиума", "item.energonrelics.veridium_orb": "Веридиумная сфера",
"block.energonrelics.energy_projector": "Энергетический проектор", "block.energonrelics.energy_projector": "Энергетический проектор",
"block.energonrelics.energy_beam": "Энергетический луч", "block.energonrelics.energy_beam": "Энергетический луч",
"block.energonrelics.energy_portal": "Энергетический портал", "block.energonrelics.energy_portal": "Энергетический портал",
@ -59,7 +59,7 @@
"category.rei.energonrelics.reactor_fuel.name": "Реакторное топливо", "category.rei.energonrelics.reactor_fuel.name": "Реакторное топливо",
"category.rei.energonrelics.reactor_fuel.multiplier": "%sx Реакция", "category.rei.energonrelics.reactor_fuel.multiplier": "%sx Реакция",
"block.energonrelics.phase_shifter": "Фазовращатель", "block.energonrelics.phase_shifter": "Фазовращатель",
"text.energonrelics.phase_shifter_extra": "Поэтапные предметы: %s", "text.energonrelics.phase_shifter_extra": "Фазированные предметы: %s",
"category.rei.energonrelics.information.structure_generation.title": "Структуры", "category.rei.energonrelics.information.structure_generation.title": "Структуры",
"category.rei.energonrelics.information.structure_generation.research_complex": "Найдено в подземном сооружении исследовательского комплекса" "category.rei.energonrelics.information.structure_generation.research_complex": "Найдено в подземной структуре исследовательского комплекса"
} }

View File

@ -1,7 +1,7 @@
{ {
"parent": "minecraft:block/block", "parent": "minecraft:block/block",
"textures": { "textures": {
"1": "energonrelics:block/lightning_rod_base", "1": "minecraft:block/blackstone",
"particle": "#1" "particle": "#1"
}, },
"elements": [ "elements": [

Binary file not shown.

Before

Width:  |  Height:  |  Size: 282 B

View File

@ -0,0 +1,26 @@
{
"display": {
"icon": {
"item": "energonrelics:multimeter"
},
"title": {
"translate": "advancements.energonrelics.craft_multimeter.title"
},
"description": {
"translate": "advancements.energonrelics.craft_multimeter.description"
}
},
"parent": "energonrelics:craft_network_chip",
"criteria": {
"chest_boat": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "energonrelics:multimeter"
}
]
}
}
}
}

View File

@ -0,0 +1,26 @@
{
"display": {
"icon": {
"item": "energonrelics:network_chip"
},
"title": {
"translate": "advancements.energonrelics.craft_network_chip.title"
},
"description": {
"translate": "advancements.energonrelics.craft_network_chip.description"
}
},
"parent": "energonrelics:find_circuit_board",
"criteria": {
"chest_boat": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "energonrelics:network_chip"
}
]
}
}
}
}

View File

@ -0,0 +1,30 @@
{
"display": {
"icon": {
"item": "energonrelics:reactor_core"
},
"title": {
"translate": "advancements.energonrelics.craft_reactor_core.title"
},
"description": {
"translate": "advancements.energonrelics.craft_reactor_core.description"
},
"frame": "goal"
},
"parent": "energonrelics:smelt_veridium_ore",
"rewards": {
"experience": 100
},
"criteria": {
"chest_boat": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "energonrelics:reactor_core"
}
]
}
}
}
}

View File

@ -0,0 +1,26 @@
{
"display": {
"icon": {
"item": "energonrelics:solar_panel"
},
"title": {
"translate": "advancements.energonrelics.craft_solar_panel.title"
},
"description": {
"translate": "advancements.energonrelics.craft_solar_panel.description"
}
},
"parent": "energonrelics:find_circuit_board",
"criteria": {
"chest_boat": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "energonrelics:solar_panel"
}
]
}
}
}
}

View File

@ -0,0 +1,26 @@
{
"display": {
"icon": {
"item": "energonrelics:switch"
},
"title": {
"translate": "advancements.energonrelics.craft_switch.title"
},
"description": {
"translate": "advancements.energonrelics.craft_switch.description"
}
},
"parent": "energonrelics:craft_network_chip",
"criteria": {
"chest_boat": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "energonrelics:switch"
}
]
}
}
}
}

View File

@ -0,0 +1,57 @@
{
"display": {
"icon": {
"item": "energonrelics:circuit_board"
},
"title": {
"translate": "advancements.energonrelics.find_circuit_board.title"
},
"description": {
"translate": "advancements.energonrelics.find_circuit_board.description"
},
"frame": "challenge"
},
"parent": "energonrelics:root",
"rewards": {
"experience": 100,
"recipes": [
"energonrelics:active_battery_controller",
"energonrelics:battery_core",
"energonrelics:block_breaker",
"energonrelics:defensive_laser_core",
"energonrelics:defensive_laser",
"energonrelics:duplicate_network_chip",
"energonrelics:energon_light",
"energonrelics:energy_projector",
"energonrelics:forcefield_projector",
"energonrelics:holographic_sky",
"energonrelics:industrial_laser_projector",
"energonrelics:infuser",
"energonrelics:lightning_rod_base",
"energonrelics:multimeter",
"energonrelics:network_chip",
"energonrelics:passive_battery_controller",
"energonrelics:phase_shifter",
"energonrelics:reactor_controller",
"energonrelics:reactor_core",
"energonrelics:reactor_input",
"energonrelics:solar_panel",
"energonrelics:switch",
"energonrelics:thermal_casing",
"energonrelics:thermal_glass",
"energonrelics:tractor_beam_projector"
]
},
"criteria": {
"chest_boat": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "energonrelics:circuit_board"
}
]
}
}
}
}

View File

@ -0,0 +1,30 @@
{
"display": {
"icon": {
"item": "energonrelics:network_chip"
},
"title": {
"translate": "advancements.energonrelics.root.title"
},
"description": {
"translate": "advancements.energonrelics.root.description"
},
"background": "minecraft:textures/block/blackstone.png",
"show_toast": false,
"announce_to_chat": false
},
"rewards": {
"recipes": [
"energonrelics:veridium_block",
"energonrelics:veridium_ingot_from_blasting",
"energonrelics:veridium_ingot_from_veridium_block",
"energonrelics:veridium_ingot",
"energonrelics:veridium_powder"
]
},
"criteria": {
"tick": {
"trigger": "minecraft:tick"
}
}
}

View File

@ -0,0 +1,26 @@
{
"display": {
"icon": {
"item": "energonrelics:veridium_ingot"
},
"title": {
"translate": "advancements.energonrelics.smelt_veridium_ore.title"
},
"description": {
"translate": "advancements.energonrelics.smelt_veridium_ore.description"
}
},
"parent": "energonrelics:find_circuit_board",
"criteria": {
"chest_boat": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "energonrelics:veridium_ingot"
}
]
}
}
}
}

View File

@ -1,13 +1,18 @@
{ {
"type": "minecraft:crafting_shapeless", "type": "minecraft:crafting_shaped",
"ingredients": [ "pattern": [
{ " I ",
"item": "minecraft:iron_ingot" "I#I",
" I "
],
"key": {
"I": {
"item": "minecraft:iron_nugget"
}, },
{ "#": {
"item": "energonrelics:circuit_board" "item": "energonrelics:circuit_board"
} }
], },
"result": { "result": {
"item": "energonrelics:network_chip", "item": "energonrelics:network_chip",
"count": 1 "count": 1

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"energonrelics:veridium_block"
]
}