Merge remote-tracking branch 'remotes/origin/1.15' into 1.16

# Conflicts:
#	src/main/java/techreborn/init/TRContent.java
#	src/main/java/techreborn/items/armor/BatpackItem.java
This commit is contained in:
modmuss50 2020-03-23 20:19:53 +00:00
commit acf59dd1a5
29 changed files with 297 additions and 154 deletions

View file

@ -172,6 +172,9 @@ public class TechRebornConfig {
@Config(config = "items", category = "power", key = "nanoSaberCost", comment = "Energy Cost for Nano Saber")
public static int nanosaberCost = 150;
@Config(config = "items", category = "power", key = "nanoSaberDamage", comment = "Damage value for the Nano Saber")
public static int nanosaberDamage = 20;
@Config(config = "items", category = "power", key = "electricTreetapCharge", comment = "Energy Capacity for Electric Treetap")
public static int electricTreetapCharge = 10_000;
@ -589,4 +592,52 @@ public class TechRebornConfig {
@Config(config = "world", category = "loot", key = "enableEndLoot", comment = "When true TechReborn will add ingots, machine frames and circuits to The End loot chests.")
public static boolean enableEndLoot = true;
@Config(config = "world", category = "ore", key = "enableBauxiteOre", comment = "Generate Bauxite Ore in The Overworld.")
public static boolean enableBauxiteOre = true;
@Config(config = "world", category = "ore", key = "enableCopperOre", comment = "Generate Copper Ore in The Overworld.")
public static boolean enableCopperOre = true;
@Config(config = "world", category = "ore", key = "enableGalenaOre", comment = "Generate Galena Ore in The Overworld.")
public static boolean enableGalenaOre = true;
@Config(config = "world", category = "ore", key = "enableIridiumOre", comment = "Generate Iridium Ore in The Overworld.")
public static boolean enableIridiumOre = true;
@Config(config = "world", category = "ore", key = "enableLeadOre", comment = "Generate Lead Ore in The Overworld.")
public static boolean enableLeadOre = true;
@Config(config = "world", category = "ore", key = "enableRubyOre", comment = "Generate Ruby Ore in The Overworld.")
public static boolean enableRubyOre = true;
@Config(config = "world", category = "ore", key = "enableSapphireOre", comment = "Generate Sapphire Ore in The Overworld.")
public static boolean enableSapphireOre = true;
@Config(config = "world", category = "ore", key = "enableSilverOre", comment = "Generate Silver Ore in The Overworld.")
public static boolean enableSilverOre = true;
@Config(config = "world", category = "ore", key = "enableTinOre", comment = "Generate Tin Ore in The Overworld.")
public static boolean enableTinOre = true;
@Config(config = "world", category = "ore", key = "enableCinnabarOre", comment = "Generate Cinnabar Ore in The Nether.")
public static boolean enableCinnabarOre = true;
@Config(config = "world", category = "ore", key = "enablePyriteOre", comment = "Generate Pyrite Ore in The Nether.")
public static boolean enablePyriteOre = true;
@Config(config = "world", category = "ore", key = "enableSphaleriteOre", comment = "Generate Sphalerite Ore in The Nether.")
public static boolean enableSphaleriteOre = true;
@Config(config = "world", category = "ore", key = "enablePeridotOre", comment = "Generate Peridot Ore in The End.")
public static boolean enablePeridotOre = true;
@Config(config = "world", category = "ore", key = "enableSheldoniteOre", comment = "Generate Sheldonite Ore in The End.")
public static boolean enableSheldoniteOre = true;
@Config(config = "world", category = "ore", key = "enableSodaliteOre", comment = "Generate Sodalite Ore in The End.")
public static boolean enableSodaliteOre = true;
@Config(config = "world", category = "ore", key = "enableTungstenOre", comment = "Generate Tungsten Ore in The End.")
public static boolean enableTungstenOre = true;
}

View file

@ -48,28 +48,38 @@ import techreborn.blockentity.generator.advanced.*;
import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity;
import techreborn.blockentity.generator.basic.WaterMillBlockEntity;
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.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.fluid.CreativeQuantumTankBlockEntity;
import techreborn.blockentity.storage.fluid.QuantumTankBlockEntity;
import techreborn.blockentity.storage.item.CreativeQuantumChestBlockEntity;
import techreborn.blockentity.storage.item.DigitalChestBlockEntity;
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.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.machine.tier0.IronAlloyFurnaceBlock;
import techreborn.blocks.machine.tier0.IronFurnaceBlock;
import techreborn.blocks.machine.tier1.BlockPlayerDetector;
import techreborn.blocks.misc.BlockAlarm;
import techreborn.blocks.misc.BlockMachineCasing;
import techreborn.blocks.misc.BlockMachineFrame;
import techreborn.blocks.misc.BlockStorage;
import techreborn.blocks.storage.OldBlock;
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.item.StorageUnitBlock;
import techreborn.blocks.transformers.BlockEVTransformer;
import techreborn.blocks.transformers.BlockHVTransformer;
import techreborn.blocks.transformers.BlockLVTransformer;
@ -454,7 +464,7 @@ public class TRContent {
return casing;
}
public static ItemConvertible[] getCasings(){
public static ItemConvertible[] getCasings() {
return Arrays.stream(MachineBlocks.values()).map((Function<MachineBlocks, ItemConvertible>) machineBlocks -> () -> Item.fromBlock(machineBlocks.casing)).toArray(ItemConvertible[]::new);
}
}
@ -718,10 +728,10 @@ public class TRContent {
NEUTRON_REFLECTOR,
THICK_NEUTRON_REFLECTOR,
IRIDIUM_NEUTRON_REFLECTOR
IRIDIUM_NEUTRON_REFLECTOR,
//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_60K,
@ -738,7 +748,9 @@ public class TRContent {
SCRAP,
UU_MATTER,
PLANTBALL,
COMPRESSED_PLANTBALL;
COMPRESSED_PLANTBALL,
SYNTHETIC_REDSTONE_CRYSTAL;
public final String name;
public final Item item;

View file

@ -34,6 +34,7 @@ import net.minecraft.item.ArmorMaterial;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.util.collection.DefaultedList;
import net.minecraft.util.Identifier;
import net.minecraft.world.World;
import reborncore.common.powerSystem.PowerSystem;
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));
this.maxCharge = maxCharge;
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) {

View file

@ -181,7 +181,7 @@ public class NanosaberItem extends SwordItem implements EnergyHolder, ItemDurabi
attributes.removeAll(EntityAttributes.ATTACK_SPEED.getId());
if (slot== EquipmentSlot.MAINHAND && ItemUtils.isActive(stack)) {
attributes.put(EntityAttributes.ATTACK_DAMAGE.getId(), new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_UUID, "Weapon modifier", 12, EntityAttributeModifier.Operation.ADDITION));
attributes.put(EntityAttributes.ATTACK_DAMAGE.getId(), new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_UUID, "Weapon modifier", TechRebornConfig.nanosaberDamage, EntityAttributeModifier.Operation.ADDITION));
attributes.put(EntityAttributes.ATTACK_SPEED.getId(), new EntityAttributeModifier(ATTACK_SPEED_MODIFIER_UUID, "Weapon modifier", 3, EntityAttributeModifier.Operation.ADDITION));
}
}

View file

@ -45,6 +45,7 @@ import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
import reborncore.common.world.CustomOreFeature;
import reborncore.common.world.CustomOreFeatureConfig;
import techreborn.blocks.misc.BlockRubberLog;
import techreborn.config.TechRebornConfig;
import techreborn.init.TRContent;
import java.util.ArrayList;
@ -108,25 +109,56 @@ public class WorldGenerator {
checkedBiomes.add(biome);
if (biome.getCategory() == Category.NETHER) {
if (TechRebornConfig.enableCinnabarOre){
addOre(biome, OreFeatureConfig.Target.NETHERRACK, TRContent.Ores.CINNABAR);
}
if (TechRebornConfig.enablePyriteOre){
addOre(biome, OreFeatureConfig.Target.NETHERRACK, TRContent.Ores.PYRITE);
}
if (TechRebornConfig.enableSphaleriteOre){
addOre(biome, OreFeatureConfig.Target.NETHERRACK, TRContent.Ores.SPHALERITE);
}
} else if (biome.getCategory() == Category.THEEND) {
if (TechRebornConfig.enableSphaleriteOre){
addEndOre(biome, TRContent.Ores.PERIDOT);
}
if (TechRebornConfig.enableSheldoniteOre){
addEndOre(biome, TRContent.Ores.SHELDONITE);
}
if (TechRebornConfig.enableSodaliteOre){
addEndOre(biome, TRContent.Ores.SODALITE);
}
if (TechRebornConfig.enableTungstenOre){
addEndOre(biome, TRContent.Ores.TUNGSTEN);
}
} else {
if (TechRebornConfig.enableBauxiteOre){
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.BAUXITE);
}
if (TechRebornConfig.enableBauxiteOre){
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.COPPER);
}
if (TechRebornConfig.enableGalenaOre){
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.GALENA);
}
if (TechRebornConfig.enableIridiumOre){
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.IRIDIUM);
}
if (TechRebornConfig.enableLeadOre){
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.LEAD);
}
if (TechRebornConfig.enableRubyOre){
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.RUBY);
}
if (TechRebornConfig.enableSapphireOre) {
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.SAPPHIRE);
}
if (TechRebornConfig.enableSilverOre) {
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.SILVER);
}
if (TechRebornConfig.enableTinOre) {
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.TIN);
}
if (biome.getCategory() == Category.FOREST || biome.getCategory() == Category.TAIGA || biome.getCategory() == Category.SWAMP) {
biome.addFeature(GenerationStep.Feature.VEGETAL_DECORATION,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 488 B

After

Width:  |  Height:  |  Size: 457 B

View file

@ -515,6 +515,7 @@
"item.techreborn.uu_matter": "UU-Matter",
"item.techreborn.plantball": "Plantball",
"item.techreborn.compressed_plantball": "Compressed Plantball",
"item.techreborn.synthetic_redstone_crystal": "Synthetic Redstone Crystal",
"_comment14": "Items-Armor",
"item.techreborn.cloaking_device": "Cloaking Device",
@ -530,7 +531,7 @@
"item.techreborn.lapotron_crystal": "Lapotron Crystal",
"item.techreborn.lapotronic_orb": "Lapotronic Energy Orb",
"item.techreborn.lithium_ion_battery": "Lithium Battery",
"item.techreborn.red_cell_battery": "Battery",
"item.techreborn.red_cell_battery": "Red Cell Battery",
"_comment16": "Items-Tools",
"item.techreborn.advanced_chainsaw": "Advanced Chainsaw",
@ -544,9 +545,9 @@
"item.techreborn.nanosaber": "Nanosaber",
"item.techreborn.omni_tool": "Omni-Tool",
"item.techreborn.rock_cutter": "Rockcutter",
"item.techreborn.basic_chainsaw": "Iron Chainsaw",
"item.techreborn.basic_drill": "Iron Drill",
"item.techreborn.basic_jackhammer": "Iron Jackhammer",
"item.techreborn.basic_chainsaw": "Basic Chainsaw",
"item.techreborn.basic_drill": "Basic Drill",
"item.techreborn.basic_jackhammer": "Basic Jackhammer",
"item.techreborn.treetap": "Treetap",
"item.techreborn.wrench": "Wrench",
"item.techreborn.destructopack": "Destructopack",

View file

@ -2,5 +2,13 @@
"parent": "minecraft:item/generated",
"textures": {
"layer0": "techreborn:item/armor/lithium_batpack"
},
"overrides": [
{
"predicate": {
"techreborn:empty": 1
},
"model": "techreborn:item/override/lithium_batpack_empty"
}
]
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "techreborn:item/armor/lithium_batpack_empty"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "techreborn:item/part/synthetic_redstone_crystal"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 552 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 364 B

After

Width:  |  Height:  |  Size: 362 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 353 B

View file

@ -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"
}
]
}

View file

@ -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"
}
]
}

View file

@ -10,7 +10,7 @@
"results": [
{
"item": "techreborn:lapis_plate",
"count": 9
"count": 1
}
]
}

View file

@ -10,7 +10,7 @@
"results": [
{
"item": "techreborn:redstone_plate",
"count": 9
"count": 1
}
]
}

View file

@ -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"
}
}

View file

@ -7,10 +7,10 @@
],
"key": {
"L": {
"item": "minecraft:lapis_lazuli"
"tag": "c:lazurite_plate"
},
"C": {
"item": "techreborn:electronic_circuit"
"item": "techreborn:industrial_circuit"
},
"E": {
"item": "techreborn:energy_crystal"

View file

@ -2,15 +2,15 @@
"type": "minecraft:crafting_shaped",
"pattern": [
" DD",
"TCD",
"TBD",
"ST "
],
"key": {
"D": {
"item": "minecraft:diamond"
},
"C": {
"item": "techreborn:advanced_circuit"
"B": {
"item": "techreborn:lithium_ion_battery"
},
"T": {
"tag": "c:titanium_ingot"

View file

@ -2,15 +2,15 @@
"type": "minecraft:crafting_shaped",
"pattern": [
" D ",
"DCD",
"DBD",
"TST"
],
"key": {
"D": {
"item": "minecraft:diamond"
},
"C": {
"item": "techreborn:advanced_circuit"
"B": {
"item": "techreborn:lithium_ion_battery"
},
"T": {
"tag": "c:titanium_ingot"

View file

@ -2,15 +2,15 @@
"type": "minecraft:crafting_shaped",
"pattern": [
"DSD",
"TCT",
"TBT",
" D "
],
"key": {
"D": {
"item": "minecraft:diamond"
},
"C": {
"item": "techreborn:advanced_circuit"
"B": {
"item": "techreborn:lithium_ion_battery"
},
"T": {
"tag": "c:titanium_ingot"

View file

@ -2,18 +2,18 @@
"type": "minecraft:crafting_shaped",
"pattern": [
" SS",
"SCS",
"BS "
"SBS",
"CS "
],
"key": {
"S": {
"item": "techreborn:refined_iron_ingot"
},
"C": {
"item": "techreborn:electronic_circuit"
},
"B": {
"item": "techreborn:red_cell_battery"
},
"C": {
"item": "techreborn:electronic_circuit"
}
},
"result": {

View file

@ -2,18 +2,18 @@
"type": "minecraft:crafting_shaped",
"pattern": [
" S ",
"SCS",
"SBS"
"SBS",
"SCS"
],
"key": {
"S": {
"item": "techreborn:refined_iron_ingot"
},
"C": {
"item": "techreborn:electronic_circuit"
},
"B": {
"item": "techreborn:red_cell_battery"
},
"C": {
"item": "techreborn:electronic_circuit"
}
},
"result": {

View file

@ -1,19 +1,19 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"SBS",
"SCS",
"SBS",
" S "
],
"key": {
"S": {
"item": "techreborn:refined_iron_ingot"
},
"C": {
"item": "techreborn:electronic_circuit"
},
"B": {
"item": "techreborn:red_cell_battery"
},
"C": {
"item": "techreborn:electronic_circuit"
}
},
"result": {