Update some textures and rebalance a few recipes
|
@ -38,39 +38,44 @@ import reborncore.common.powerSystem.PowerAcceptorBlockEntity;
|
||||||
import team.reborn.energy.EnergySide;
|
import team.reborn.energy.EnergySide;
|
||||||
import team.reborn.energy.EnergyTier;
|
import team.reborn.energy.EnergyTier;
|
||||||
import techreborn.TechReborn;
|
import techreborn.TechReborn;
|
||||||
import techreborn.blockentity.machine.misc.ChargeOMatBlockEntity;
|
|
||||||
import techreborn.blockentity.machine.misc.DrainBlockEntity;
|
|
||||||
import techreborn.blockentity.storage.fluid.CreativeQuantumTankBlockEntity;
|
|
||||||
import techreborn.blockentity.storage.fluid.QuantumTankBlockEntity;
|
|
||||||
import techreborn.blockentity.machine.tier3.IndustrialCentrifugeBlockEntity;
|
|
||||||
import techreborn.blockentity.generator.LightningRodBlockEntity;
|
import techreborn.blockentity.generator.LightningRodBlockEntity;
|
||||||
import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity;
|
import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity;
|
||||||
import techreborn.blockentity.generator.advanced.*;
|
import techreborn.blockentity.generator.advanced.*;
|
||||||
import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity;
|
import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity;
|
||||||
import techreborn.blockentity.generator.basic.WaterMillBlockEntity;
|
import techreborn.blockentity.generator.basic.WaterMillBlockEntity;
|
||||||
import techreborn.blockentity.generator.basic.WindMillBlockEntity;
|
import techreborn.blockentity.generator.basic.WindMillBlockEntity;
|
||||||
|
import techreborn.blockentity.machine.misc.ChargeOMatBlockEntity;
|
||||||
|
import techreborn.blockentity.machine.misc.DrainBlockEntity;
|
||||||
import techreborn.blockentity.machine.multiblock.*;
|
import techreborn.blockentity.machine.multiblock.*;
|
||||||
import techreborn.blockentity.machine.tier1.*;
|
import techreborn.blockentity.machine.tier1.*;
|
||||||
import techreborn.blockentity.machine.tier3.*;
|
import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity;
|
||||||
|
import techreborn.blockentity.machine.tier3.IndustrialCentrifugeBlockEntity;
|
||||||
|
import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity;
|
||||||
import techreborn.blockentity.storage.energy.AdjustableSUBlockEntity;
|
import techreborn.blockentity.storage.energy.AdjustableSUBlockEntity;
|
||||||
|
import techreborn.blockentity.storage.fluid.CreativeQuantumTankBlockEntity;
|
||||||
|
import techreborn.blockentity.storage.fluid.QuantumTankBlockEntity;
|
||||||
import techreborn.blockentity.storage.item.CreativeQuantumChestBlockEntity;
|
import techreborn.blockentity.storage.item.CreativeQuantumChestBlockEntity;
|
||||||
import techreborn.blockentity.storage.item.DigitalChestBlockEntity;
|
import techreborn.blockentity.storage.item.DigitalChestBlockEntity;
|
||||||
import techreborn.blockentity.storage.item.QuantumChestBlockEntity;
|
import techreborn.blockentity.storage.item.QuantumChestBlockEntity;
|
||||||
import techreborn.blocks.*;
|
import techreborn.blocks.DataDrivenMachineBlock;
|
||||||
|
import techreborn.blocks.GenericMachineBlock;
|
||||||
import techreborn.blocks.cable.CableBlock;
|
import techreborn.blocks.cable.CableBlock;
|
||||||
import techreborn.blocks.generator.*;
|
import techreborn.blocks.generator.BlockFusionCoil;
|
||||||
|
import techreborn.blocks.generator.BlockFusionControlComputer;
|
||||||
|
import techreborn.blocks.generator.BlockSolarPanel;
|
||||||
|
import techreborn.blocks.generator.GenericGeneratorBlock;
|
||||||
import techreborn.blocks.lighting.BlockLamp;
|
import techreborn.blocks.lighting.BlockLamp;
|
||||||
|
import techreborn.blocks.machine.tier0.IronAlloyFurnaceBlock;
|
||||||
|
import techreborn.blocks.machine.tier0.IronFurnaceBlock;
|
||||||
|
import techreborn.blocks.machine.tier1.BlockPlayerDetector;
|
||||||
import techreborn.blocks.misc.BlockAlarm;
|
import techreborn.blocks.misc.BlockAlarm;
|
||||||
import techreborn.blocks.misc.BlockMachineCasing;
|
import techreborn.blocks.misc.BlockMachineCasing;
|
||||||
import techreborn.blocks.misc.BlockMachineFrame;
|
import techreborn.blocks.misc.BlockMachineFrame;
|
||||||
import techreborn.blocks.misc.BlockStorage;
|
import techreborn.blocks.misc.BlockStorage;
|
||||||
import techreborn.blocks.storage.OldBlock;
|
import techreborn.blocks.storage.OldBlock;
|
||||||
import techreborn.blocks.storage.energy.*;
|
import techreborn.blocks.storage.energy.*;
|
||||||
import techreborn.blocks.machine.tier0.IronAlloyFurnaceBlock;
|
|
||||||
import techreborn.blocks.machine.tier0.IronFurnaceBlock;
|
|
||||||
import techreborn.blocks.machine.tier1.BlockPlayerDetector;
|
|
||||||
import techreborn.blocks.storage.item.StorageUnitBlock;
|
|
||||||
import techreborn.blocks.storage.fluid.TankUnitBlock;
|
import techreborn.blocks.storage.fluid.TankUnitBlock;
|
||||||
|
import techreborn.blocks.storage.item.StorageUnitBlock;
|
||||||
import techreborn.blocks.transformers.BlockEVTransformer;
|
import techreborn.blocks.transformers.BlockEVTransformer;
|
||||||
import techreborn.blocks.transformers.BlockHVTransformer;
|
import techreborn.blocks.transformers.BlockHVTransformer;
|
||||||
import techreborn.blocks.transformers.BlockLVTransformer;
|
import techreborn.blocks.transformers.BlockLVTransformer;
|
||||||
|
@ -719,10 +724,10 @@ public class TRContent {
|
||||||
|
|
||||||
NEUTRON_REFLECTOR,
|
NEUTRON_REFLECTOR,
|
||||||
THICK_NEUTRON_REFLECTOR,
|
THICK_NEUTRON_REFLECTOR,
|
||||||
IRIDIUM_NEUTRON_REFLECTOR
|
IRIDIUM_NEUTRON_REFLECTOR,
|
||||||
|
|
||||||
//java vars can't start with numbers, so these get suffixes
|
//java vars can't start with numbers, so these get suffixes
|
||||||
, WATER_COOLANT_CELL_10K,
|
WATER_COOLANT_CELL_10K,
|
||||||
WATER_COOLANT_CELL_30K,
|
WATER_COOLANT_CELL_30K,
|
||||||
WATER_COOLANT_CELL_60K,
|
WATER_COOLANT_CELL_60K,
|
||||||
|
|
||||||
|
@ -739,7 +744,9 @@ public class TRContent {
|
||||||
SCRAP,
|
SCRAP,
|
||||||
UU_MATTER,
|
UU_MATTER,
|
||||||
PLANTBALL,
|
PLANTBALL,
|
||||||
COMPRESSED_PLANTBALL;
|
COMPRESSED_PLANTBALL,
|
||||||
|
|
||||||
|
SYNTHETIC_REDSTONE_CRYSTAL;
|
||||||
|
|
||||||
public final String name;
|
public final String name;
|
||||||
public final Item item;
|
public final Item item;
|
||||||
|
|
|
@ -34,6 +34,7 @@ import net.minecraft.item.ArmorMaterial;
|
||||||
import net.minecraft.item.ItemGroup;
|
import net.minecraft.item.ItemGroup;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.DefaultedList;
|
import net.minecraft.util.DefaultedList;
|
||||||
|
import net.minecraft.util.Identifier;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.util.ItemDurabilityExtensions;
|
import reborncore.common.util.ItemDurabilityExtensions;
|
||||||
|
@ -53,6 +54,13 @@ public class BatpackItem extends ArmorItem implements EnergyHolder, ItemDurabili
|
||||||
super(material, EquipmentSlot.CHEST, new Settings().group(TechReborn.ITEMGROUP).maxCount(1).maxDamage(-1));
|
super(material, EquipmentSlot.CHEST, new Settings().group(TechReborn.ITEMGROUP).maxCount(1).maxDamage(-1));
|
||||||
this.maxCharge = maxCharge;
|
this.maxCharge = maxCharge;
|
||||||
this.tier = tier;
|
this.tier = tier;
|
||||||
|
|
||||||
|
this.addPropertyGetter(new Identifier("techreborn:empty"), (stack, worldIn, entityIn) -> {
|
||||||
|
if (!stack.isEmpty() && Energy.of(stack).getEnergy() == 0) {
|
||||||
|
return 1.0F;
|
||||||
|
}
|
||||||
|
return 0.0F;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void distributePowerToInventory(World world, PlayerEntity player, ItemStack itemStack, int maxOutput) {
|
private void distributePowerToInventory(World world, PlayerEntity player, ItemStack itemStack, int maxOutput) {
|
||||||
|
|
Before Width: | Height: | Size: 488 B After Width: | Height: | Size: 457 B |
|
@ -515,6 +515,7 @@
|
||||||
"item.techreborn.uu_matter": "UU-Matter",
|
"item.techreborn.uu_matter": "UU-Matter",
|
||||||
"item.techreborn.plantball": "Plantball",
|
"item.techreborn.plantball": "Plantball",
|
||||||
"item.techreborn.compressed_plantball": "Compressed Plantball",
|
"item.techreborn.compressed_plantball": "Compressed Plantball",
|
||||||
|
"item.techreborn.synthetic_redstone_crystal": "Synthetic Redstone Crystal",
|
||||||
|
|
||||||
"_comment14": "Items-Armor",
|
"_comment14": "Items-Armor",
|
||||||
"item.techreborn.cloaking_device": "Cloaking Device",
|
"item.techreborn.cloaking_device": "Cloaking Device",
|
||||||
|
@ -530,7 +531,7 @@
|
||||||
"item.techreborn.lapotron_crystal": "Lapotron Crystal",
|
"item.techreborn.lapotron_crystal": "Lapotron Crystal",
|
||||||
"item.techreborn.lapotronic_orb": "Lapotronic Energy Orb",
|
"item.techreborn.lapotronic_orb": "Lapotronic Energy Orb",
|
||||||
"item.techreborn.lithium_ion_battery": "Lithium Battery",
|
"item.techreborn.lithium_ion_battery": "Lithium Battery",
|
||||||
"item.techreborn.red_cell_battery": "Battery",
|
"item.techreborn.red_cell_battery": "Red Cell Battery",
|
||||||
|
|
||||||
"_comment16": "Items-Tools",
|
"_comment16": "Items-Tools",
|
||||||
"item.techreborn.advanced_chainsaw": "Advanced Chainsaw",
|
"item.techreborn.advanced_chainsaw": "Advanced Chainsaw",
|
||||||
|
@ -544,9 +545,9 @@
|
||||||
"item.techreborn.nanosaber": "Nanosaber",
|
"item.techreborn.nanosaber": "Nanosaber",
|
||||||
"item.techreborn.omni_tool": "Omni-Tool",
|
"item.techreborn.omni_tool": "Omni-Tool",
|
||||||
"item.techreborn.rock_cutter": "Rockcutter",
|
"item.techreborn.rock_cutter": "Rockcutter",
|
||||||
"item.techreborn.basic_chainsaw": "Iron Chainsaw",
|
"item.techreborn.basic_chainsaw": "Basic Chainsaw",
|
||||||
"item.techreborn.basic_drill": "Iron Drill",
|
"item.techreborn.basic_drill": "Basic Drill",
|
||||||
"item.techreborn.basic_jackhammer": "Iron Jackhammer",
|
"item.techreborn.basic_jackhammer": "Basic Jackhammer",
|
||||||
"item.techreborn.treetap": "Treetap",
|
"item.techreborn.treetap": "Treetap",
|
||||||
"item.techreborn.wrench": "Wrench",
|
"item.techreborn.wrench": "Wrench",
|
||||||
"item.techreborn.destructopack": "Destructopack",
|
"item.techreborn.destructopack": "Destructopack",
|
||||||
|
|
|
@ -2,5 +2,13 @@
|
||||||
"parent": "minecraft:item/generated",
|
"parent": "minecraft:item/generated",
|
||||||
"textures": {
|
"textures": {
|
||||||
"layer0": "techreborn:item/armor/lithium_batpack"
|
"layer0": "techreborn:item/armor/lithium_batpack"
|
||||||
|
},
|
||||||
|
"overrides": [
|
||||||
|
{
|
||||||
|
"predicate": {
|
||||||
|
"techreborn:empty": 1
|
||||||
|
},
|
||||||
|
"model": "techreborn:item/override/lithium_batpack_empty"
|
||||||
}
|
}
|
||||||
|
]
|
||||||
}
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "techreborn:item/armor/lithium_batpack_empty"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "techreborn:item/part/synthetic_redstone_crystal"
|
||||||
|
}
|
||||||
|
}
|
Before Width: | Height: | Size: 552 B After Width: | Height: | Size: 1.6 KiB |
After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 315 B |
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
"type": "techreborn:assembling_machine",
|
||||||
|
"power": 40,
|
||||||
|
"time": 200,
|
||||||
|
"ingredients": [
|
||||||
|
{
|
||||||
|
"item": "techreborn:silicon_plate"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"item": "techreborn:synthetic_redstone_crystal",
|
||||||
|
"count": 2
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"results": [
|
||||||
|
{
|
||||||
|
"item": "techreborn:energy_crystal"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
"type": "techreborn:chemical_reactor",
|
||||||
|
"power": 50,
|
||||||
|
"time": 1200,
|
||||||
|
"ingredients": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:redstone",
|
||||||
|
"count": 32
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"item": "minecraft:diamond"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"results": [
|
||||||
|
{
|
||||||
|
"item": "techreborn:synthetic_redstone_crystal"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -10,7 +10,7 @@
|
||||||
"results": [
|
"results": [
|
||||||
{
|
{
|
||||||
"item": "techreborn:lapis_plate",
|
"item": "techreborn:lapis_plate",
|
||||||
"count": 9
|
"count": 1
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -10,7 +10,7 @@
|
||||||
"results": [
|
"results": [
|
||||||
{
|
{
|
||||||
"item": "techreborn:redstone_plate",
|
"item": "techreborn:redstone_plate",
|
||||||
"count": 9
|
"count": 1
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -1,19 +0,0 @@
|
||||||
{
|
|
||||||
"type": "minecraft:crafting_shaped",
|
|
||||||
"pattern": [
|
|
||||||
"RRR",
|
|
||||||
"RDR",
|
|
||||||
"RRR"
|
|
||||||
],
|
|
||||||
"key": {
|
|
||||||
"R": {
|
|
||||||
"item": "minecraft:redstone"
|
|
||||||
},
|
|
||||||
"D": {
|
|
||||||
"item": "minecraft:diamond"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"result": {
|
|
||||||
"item": "techreborn:energy_crystal"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -7,10 +7,10 @@
|
||||||
],
|
],
|
||||||
"key": {
|
"key": {
|
||||||
"L": {
|
"L": {
|
||||||
"item": "minecraft:lapis_lazuli"
|
"tag": "c:lazurite_plate"
|
||||||
},
|
},
|
||||||
"C": {
|
"C": {
|
||||||
"item": "techreborn:electronic_circuit"
|
"item": "techreborn:industrial_circuit"
|
||||||
},
|
},
|
||||||
"E": {
|
"E": {
|
||||||
"item": "techreborn:energy_crystal"
|
"item": "techreborn:energy_crystal"
|
||||||
|
|
|
@ -2,15 +2,15 @@
|
||||||
"type": "minecraft:crafting_shaped",
|
"type": "minecraft:crafting_shaped",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
" DD",
|
" DD",
|
||||||
"TCD",
|
"TBD",
|
||||||
"ST "
|
"ST "
|
||||||
],
|
],
|
||||||
"key": {
|
"key": {
|
||||||
"D": {
|
"D": {
|
||||||
"item": "minecraft:diamond"
|
"item": "minecraft:diamond"
|
||||||
},
|
},
|
||||||
"C": {
|
"B": {
|
||||||
"item": "techreborn:advanced_circuit"
|
"item": "techreborn:lithium_ion_battery"
|
||||||
},
|
},
|
||||||
"T": {
|
"T": {
|
||||||
"tag": "c:titanium_ingot"
|
"tag": "c:titanium_ingot"
|
||||||
|
|
|
@ -2,15 +2,15 @@
|
||||||
"type": "minecraft:crafting_shaped",
|
"type": "minecraft:crafting_shaped",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
" D ",
|
" D ",
|
||||||
"DCD",
|
"DBD",
|
||||||
"TST"
|
"TST"
|
||||||
],
|
],
|
||||||
"key": {
|
"key": {
|
||||||
"D": {
|
"D": {
|
||||||
"item": "minecraft:diamond"
|
"item": "minecraft:diamond"
|
||||||
},
|
},
|
||||||
"C": {
|
"B": {
|
||||||
"item": "techreborn:advanced_circuit"
|
"item": "techreborn:lithium_ion_battery"
|
||||||
},
|
},
|
||||||
"T": {
|
"T": {
|
||||||
"tag": "c:titanium_ingot"
|
"tag": "c:titanium_ingot"
|
||||||
|
|
|
@ -2,15 +2,15 @@
|
||||||
"type": "minecraft:crafting_shaped",
|
"type": "minecraft:crafting_shaped",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
"DSD",
|
"DSD",
|
||||||
"TCT",
|
"TBT",
|
||||||
" D "
|
" D "
|
||||||
],
|
],
|
||||||
"key": {
|
"key": {
|
||||||
"D": {
|
"D": {
|
||||||
"item": "minecraft:diamond"
|
"item": "minecraft:diamond"
|
||||||
},
|
},
|
||||||
"C": {
|
"B": {
|
||||||
"item": "techreborn:advanced_circuit"
|
"item": "techreborn:lithium_ion_battery"
|
||||||
},
|
},
|
||||||
"T": {
|
"T": {
|
||||||
"tag": "c:titanium_ingot"
|
"tag": "c:titanium_ingot"
|
||||||
|
|
|
@ -2,18 +2,18 @@
|
||||||
"type": "minecraft:crafting_shaped",
|
"type": "minecraft:crafting_shaped",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
" SS",
|
" SS",
|
||||||
"SCS",
|
"SBS",
|
||||||
"BS "
|
"CS "
|
||||||
],
|
],
|
||||||
"key": {
|
"key": {
|
||||||
"S": {
|
"S": {
|
||||||
"item": "techreborn:refined_iron_ingot"
|
"item": "techreborn:refined_iron_ingot"
|
||||||
},
|
},
|
||||||
"C": {
|
|
||||||
"item": "techreborn:electronic_circuit"
|
|
||||||
},
|
|
||||||
"B": {
|
"B": {
|
||||||
"item": "techreborn:red_cell_battery"
|
"item": "techreborn:red_cell_battery"
|
||||||
|
},
|
||||||
|
"C": {
|
||||||
|
"item": "techreborn:electronic_circuit"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
|
|
|
@ -2,18 +2,18 @@
|
||||||
"type": "minecraft:crafting_shaped",
|
"type": "minecraft:crafting_shaped",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
" S ",
|
" S ",
|
||||||
"SCS",
|
"SBS",
|
||||||
"SBS"
|
"SCS"
|
||||||
],
|
],
|
||||||
"key": {
|
"key": {
|
||||||
"S": {
|
"S": {
|
||||||
"item": "techreborn:refined_iron_ingot"
|
"item": "techreborn:refined_iron_ingot"
|
||||||
},
|
},
|
||||||
"C": {
|
|
||||||
"item": "techreborn:electronic_circuit"
|
|
||||||
},
|
|
||||||
"B": {
|
"B": {
|
||||||
"item": "techreborn:red_cell_battery"
|
"item": "techreborn:red_cell_battery"
|
||||||
|
},
|
||||||
|
"C": {
|
||||||
|
"item": "techreborn:electronic_circuit"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
{
|
{
|
||||||
"type": "minecraft:crafting_shaped",
|
"type": "minecraft:crafting_shaped",
|
||||||
"pattern": [
|
"pattern": [
|
||||||
"SBS",
|
|
||||||
"SCS",
|
"SCS",
|
||||||
|
"SBS",
|
||||||
" S "
|
" S "
|
||||||
],
|
],
|
||||||
"key": {
|
"key": {
|
||||||
"S": {
|
"S": {
|
||||||
"item": "techreborn:refined_iron_ingot"
|
"item": "techreborn:refined_iron_ingot"
|
||||||
},
|
},
|
||||||
"C": {
|
|
||||||
"item": "techreborn:electronic_circuit"
|
|
||||||
},
|
|
||||||
"B": {
|
"B": {
|
||||||
"item": "techreborn:red_cell_battery"
|
"item": "techreborn:red_cell_battery"
|
||||||
|
},
|
||||||
|
"C": {
|
||||||
|
"item": "techreborn:electronic_circuit"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
|
|