maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
modmuss50 2020-01-12 18:40:30 +00:00
commit 7e6f0d1906
4 changed files with 66 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java
View file

@ -384,7 +384,7 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity
@Override @Override
public boolean isValidInvStack(int slot, ItemStack stack) { public boolean isValidInvStack(int slot, ItemStack stack) {
if (slot == INPUT_SLOT && !storeItemStack.isEmpty() && !ItemUtils.isItemEqual(stack, storeItemStack, true, false)) { if (slot == INPUT_SLOT && !(isEmpty() || isSameType(stack))) {
return false; return false;
} }
return super.isValidInvStack(slot, stack); return super.isValidInvStack(slot, stack);

80
src/main/resources/assets/techreborn/lang/en_us.json
View file

@ -742,31 +742,31 @@
"_comment24": "Advancements", "_comment24": "Advancements",
"advancements.techreborn.root": "Tech Reborn", "advancements.techreborn.root": "Tech Reborn",
"advancements.techreborn.root.desc": "Acquire Tech Reborn ore", "advancements.techreborn.root.desc": "Acquire Tech Reborn ore",
"advancements.techreborn.treetap": "Tapping time", "advancements.techreborn.treetap": "Tapping Time",
"advancements.techreborn.treetap.desc": "Craft a tree tap", "advancements.techreborn.treetap.desc": "Craft a Treetap",
"advancements.techreborn.sap": "Nectar of the tree", "advancements.techreborn.sap": "Nectar of the Tree",
"advancements.techreborn.sap.desc": "Use a tree tap on a sticky spot on a rubber tree", "advancements.techreborn.sap.desc": "Use a treetap on a sticky spot on a rubber tree",
"advancements.techreborn.refinediron": "Refined iron", "advancements.techreborn.refinediron": "Refined Iron",
"advancements.techreborn.refinediron.desc": "Smelt an iron ingot in a furnace to refine impurities out of it", "advancements.techreborn.refinediron.desc": "Smelt an iron ingot in a furnace to refine impurities out of it",
"advancements.techreborn.machineblock": "Heart of the machine", "advancements.techreborn.machineblock": "Heart of the Machine",
"advancements.techreborn.machineblock.desc": "Craft a basic machine frame out of refined iron", "advancements.techreborn.machineblock.desc": "Craft a basic machine frame out of refined iron",
"advancements.techreborn.rubber": "Not so sticky", "advancements.techreborn.rubber": "Not So Sticky",
"advancements.techreborn.rubber.desc": "Smelt sap into rubber", "advancements.techreborn.rubber.desc": "Smelt sap into rubber",
"advancements.techreborn.coppercable": "Flowing power", "advancements.techreborn.coppercable": "Flowing Power",
"advancements.techreborn.coppercable.desc": "Craft copper cable insulated with rubber", "advancements.techreborn.coppercable.desc": "Craft copper cable insulated with rubber",
"advancements.techreborn.cellbattery": "Storing power", "advancements.techreborn.cellbattery": "Storing Power",
"advancements.techreborn.cellbattery.desc": "Craft a battery", "advancements.techreborn.cellbattery.desc": "Craft a battery",
"advancements.techreborn.ironalloyfurnace": "Now we're alloying", "advancements.techreborn.ironalloyfurnace": "Now We're Alloying",
"advancements.techreborn.ironalloyfurnace.desc": "Craft a basic iron alloy furnace", "advancements.techreborn.ironalloyfurnace.desc": "Craft a basic iron alloy furnace",
"advancements.techreborn.ironfurnace": "Flashy furnace", "advancements.techreborn.ironfurnace": "Flashy Furnace",
"advancements.techreborn.ironfurnace.desc": "Craft an iron furnace", "advancements.techreborn.ironfurnace.desc": "Craft an iron furnace",
"advancements.techreborn.generator": "LIMITED POWER!", "advancements.techreborn.generator": "LIMITED POWER!",
"advancements.techreborn.generator.desc": "Place a generator", "advancements.techreborn.generator.desc": "Place a generator",
"advancements.techreborn.basicsolar": "Power from above", "advancements.techreborn.basicsolar": "Power From Above",
"advancements.techreborn.basicsolar.desc": "Craft a basic solar panel", "advancements.techreborn.basicsolar.desc": "Craft a basic solar panel",
"advancements.techreborn.advancedsolar": "Sun++", "advancements.techreborn.advancedsolar": "Sun++",
"advancements.techreborn.advancedsolar.desc": "Craft the upgraded advanced solar panel", "advancements.techreborn.advancedsolar.desc": "Craft the upgraded advanced solar panel",
"advancements.techreborn.industrialsolar": "Industrialization of sunlight", "advancements.techreborn.industrialsolar": "Industrialization of Sunlight",
"advancements.techreborn.industrialsolar.desc": "Craft the industrial solar panel", "advancements.techreborn.industrialsolar.desc": "Craft the industrial solar panel",
"advancements.techreborn.ultimatesolar": "Ultimate clean energy", "advancements.techreborn.ultimatesolar": "Ultimate clean energy",
"advancements.techreborn.ultimatesolar.desc": "Craft the ultimate solar panel", "advancements.techreborn.ultimatesolar.desc": "Craft the ultimate solar panel",
@ -774,15 +774,15 @@
"advancements.techreborn.quantumsolar.desc": "Place a quantum solar panel", "advancements.techreborn.quantumsolar.desc": "Place a quantum solar panel",
"advancements.techreborn.batbox": "Accumulating", "advancements.techreborn.batbox": "Accumulating",
"advancements.techreborn.batbox.desc": "Craft a battery box", "advancements.techreborn.batbox.desc": "Craft a battery box",
"advancements.techreborn.mfe": "One small step for man", "advancements.techreborn.mfe": "One Small Step For Man...",
"advancements.techreborn.mfe.desc": "Craft a MFE", "advancements.techreborn.mfe.desc": "Craft an MFE",
"advancements.techreborn.mfsu": "One giant leap for mankind", "advancements.techreborn.mfsu": "...One Giant Leap For Mankind",
"advancements.techreborn.mfsu.desc": "Craft a MFSU", "advancements.techreborn.mfsu.desc": "Craft an MFSU",
"advancements.techreborn.nuke": "Old Man Atom", "advancements.techreborn.nuke": "Old Man Atom",
"advancements.techreborn.nuke.desc": "Peace in the world, or the world in pieces!", "advancements.techreborn.nuke.desc": "Peace in the world, or the world in pieces!",
"advancements.techreborn.electricfurnace": "Industrialization", "advancements.techreborn.electricfurnace": "Industrialization",
"advancements.techreborn.electricfurnace.desc": "Place an electric furnace down", "advancements.techreborn.electricfurnace.desc": "Place an electric furnace down",
"advancements.techreborn.alloysmelter": "Alloying bliss", "advancements.techreborn.alloysmelter": "Alloying Bliss",
"advancements.techreborn.alloysmelter.desc": "Craft an electric alloy smelter", "advancements.techreborn.alloysmelter.desc": "Craft an electric alloy smelter",
"advancements.techreborn.watermill": "Hydropower", "advancements.techreborn.watermill": "Hydropower",
"advancements.techreborn.watermill.desc": "Place a watermill surrounded by 4 water sources", "advancements.techreborn.watermill.desc": "Place a watermill surrounded by 4 water sources",
@ -790,57 +790,57 @@
"advancements.techreborn.thermalgenerator.desc": "Craft a thermal generator", "advancements.techreborn.thermalgenerator.desc": "Craft a thermal generator",
"advancements.techreborn.wiremill": "Wired", "advancements.techreborn.wiremill": "Wired",
"advancements.techreborn.wiremill.desc": "Craft a wire mill", "advancements.techreborn.wiremill.desc": "Craft a wire mill",
"advancements.techreborn.advancedmachineblock": "Now we're evolving", "advancements.techreborn.advancedmachineblock": "Now We're Evolving",
"advancements.techreborn.advancedmachineblock.desc": "Craft an advanced machine frame", "advancements.techreborn.advancedmachineblock.desc": "Craft an advanced machine frame",
"advancements.techreborn.compressor": "Singularity impending", "advancements.techreborn.compressor": "Singularity Impending",
"advancements.techreborn.compressor.desc": "Craft a compressor", "advancements.techreborn.compressor.desc": "Craft a compressor",
"advancements.techreborn.canningmachine": "Liquid goes where?", "advancements.techreborn.canningmachine": "Liquid Goes Where?",
"advancements.techreborn.canningmachine.desc": "Craft a canning machine", "advancements.techreborn.canningmachine.desc": "Craft a canning machine",
"advancements.techreborn.extractor": "From within thou I grow", "advancements.techreborn.extractor": "From Within Thou I Grow",
"advancements.techreborn.extractor.desc": "Craft an extractor", "advancements.techreborn.extractor.desc": "Craft an extractor",
"advancements.techreborn.grinder": "Dust to dust", "advancements.techreborn.grinder": "Dust To Dust",
"advancements.techreborn.grinder.desc": "Craft a grinder. Maybe try throwing ore in it?", "advancements.techreborn.grinder.desc": "Craft a grinder. Maybe try throwing ore in it?",
"advancements.techreborn.rollingmachine": "Flatten", "advancements.techreborn.rollingmachine": "Flatten",
"advancements.techreborn.rollingmachine.desc": "Craft a rolling machine", "advancements.techreborn.rollingmachine.desc": "Craft a rolling machine",
"advancements.techreborn.lvtransformer": "Current transformer", "advancements.techreborn.lvtransformer": "Current Transformer",
"advancements.techreborn.lvtransformer.desc": "Craft a LV Transformer", "advancements.techreborn.lvtransformer.desc": "Craft a LV Transformer",
"advancements.techreborn.futuretransformer": "Future transformer", "advancements.techreborn.futuretransformer": "Future Transformer",
"advancements.techreborn.futuretransformer.desc": "Craft any other Transformer", "advancements.techreborn.futuretransformer.desc": "Craft any other Transformer",
"advancements.techreborn.windmill": "Slight breeze", "advancements.techreborn.windmill": "Slight Breeze",
"advancements.techreborn.windmill.desc": "Place a wind mill", "advancements.techreborn.windmill.desc": "Place a wind mill",
"advancements.techreborn.lightningrod": "I smite thee", "advancements.techreborn.lightningrod": "I Smite Thee!",
"advancements.techreborn.lightningrod.desc": "Place a lightning rod into the world", "advancements.techreborn.lightningrod.desc": "Place a lightning rod into the world",
"advancements.techreborn.quantumarmor": "Quantum supremacy", "advancements.techreborn.quantumarmor": "Quantum Supremacy",
"advancements.techreborn.quantumarmor.desc": "Craft any piece of quantum armor", "advancements.techreborn.quantumarmor.desc": "Craft any piece of quantum armor",
"advancements.techreborn.recycler": "One man's rubbish..", "advancements.techreborn.recycler": "One Man's Rubbish..",
"advancements.techreborn.recycler.desc": "Place a recycler down", "advancements.techreborn.recycler.desc": "Place a recycler down",
"advancements.techreborn.industrialcentrifuge": "Round and round it goes", "advancements.techreborn.industrialcentrifuge": "Round And Round It Goes",
"advancements.techreborn.industrialcentrifuge.desc": "Craft an industrial centrifuge", "advancements.techreborn.industrialcentrifuge.desc": "Craft an industrial centrifuge",
"advancements.techreborn.industrialmachineblock": "Endgame", "advancements.techreborn.industrialmachineblock": "Endgame",
"advancements.techreborn.industrialmachineblock.desc": "Craft an industrial machine frame", "advancements.techreborn.industrialmachineblock.desc": "Craft an industrial machine frame",
"advancements.techreborn.matterfabricator": "Something from nothing", "advancements.techreborn.matterfabricator": "Something From Nothing",
"advancements.techreborn.matterfabricator.desc": "Craft a matter fabricator", "advancements.techreborn.matterfabricator.desc": "Craft a matter fabricator",
"advancements.techreborn.nickeldust": "Small beginnings", "advancements.techreborn.nickeldust": "Small Beginnings",
"advancements.techreborn.nickeldust.desc": "Get a small pile of nickel dust from the centrifuge", "advancements.techreborn.nickeldust.desc": "Get a small pile of nickel dust from the centrifuge",
"advancements.techreborn.fusioncoil": "Coiling", "advancements.techreborn.fusioncoil": "Coiling",
"advancements.techreborn.fusioncoil.desc": "Craft a fusion coil", "advancements.techreborn.fusioncoil.desc": "Craft a fusion coil",
"advancements.techreborn.fusioncomputer": "Fusion and the furious", "advancements.techreborn.fusioncomputer": "Fusion and The Furious",
"advancements.techreborn.fusioncomputer.desc": "Craft a Fusion control computer", "advancements.techreborn.fusioncomputer.desc": "Craft a Fusion control computer",
"advancements.techreborn.alarm": "Super critical", "advancements.techreborn.alarm": "Super Critical",
"advancements.techreborn.alarm.desc": "Place an alarm in the world", "advancements.techreborn.alarm.desc": "Place an alarm in the world",
"advancements.techreborn.scrapboxinator": "Open sesame", "advancements.techreborn.scrapboxinator": "Open Sesame!",
"advancements.techreborn.scrapboxinator.desc": "Craft a scrapboxinator", "advancements.techreborn.scrapboxinator.desc": "Craft a scrapboxinator",
"advancements.techreborn.upgrade": "Today junior", "advancements.techreborn.upgrade": "Today Junior",
"advancements.techreborn.upgrade.desc": "Craft any upgrade", "advancements.techreborn.upgrade.desc": "Craft any upgrade",
"advancements.techreborn.blastfurnace": "What a steel", "advancements.techreborn.blastfurnace": "What A Steel",
"advancements.techreborn.blastfurnace.desc": "Place a blast furnace", "advancements.techreborn.blastfurnace.desc": "Place a blast furnace",
"advancements.techreborn.industrialgrinder": "Iridiyum", "advancements.techreborn.industrialgrinder": "Iridiyum",
"advancements.techreborn.industrialgrinder.desc": "Grind iridium ore in an industrial grinder to get an iridium ingot", "advancements.techreborn.industrialgrinder.desc": "Grind iridium ore in an industrial grinder to get an iridium ingot",
"advancements.techreborn.implosion": "Mini supernova", "advancements.techreborn.implosion": "Mini Supernova",
"advancements.techreborn.implosion.desc": "Place an implosion compressor down", "advancements.techreborn.implosion.desc": "Place an implosion compressor down",
"advancements.techreborn.interdimensionalsu": "Is this a tesseract?", "advancements.techreborn.interdimensionalsu": "Is This A Tesseract?",
"advancements.techreborn.interdimensionalsu.desc": "Place down an interdimensional SU", "advancements.techreborn.interdimensionalsu.desc": "Place down an interdimensional SU",
"advancements.techreborn.quantumtank": "Some serious tankage", "advancements.techreborn.quantumtank": "Some Serious Tankage",
"advancements.techreborn.quantumtank.desc": "Place a quantum tank down", "advancements.techreborn.quantumtank.desc": "Place a quantum tank down",

6
src/main/resources/data/techreborn/recipes/solid_canning_machine/bio_cell.json
View file

@ -4,11 +4,11 @@
"time": 100, "time": 100,
"ingredients": [ "ingredients": [
{ {
"item": "techreborn:cell", "item": "techreborn:compressed_plantball"
"nbt": "empty"
}, },
{ {
"item": "techreborn:compressed_plantball" "item": "techreborn:cell",
"nbt": "empty"
} }
], ],
"results": [ "results": [

22
src/main/resources/data/techreborn/recipes/solid_canning_machine/sulfur_cell.json Normal file
View file

@ -0,0 +1,22 @@
{
"type": "techreborn:solid_canning_machine",
"power": 1,
"time": 100,
"ingredients": [
{
"item": "techreborn:sulfur_dust"
},
{
"item": "techreborn:cell",
"nbt": "empty"
}
],
"results": [
{
"item": "techreborn:cell",
"nbt": {
"fluid": "techreborn:sulfur"
}
}
]
}