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

Biofuel

Browse source
This commit is contained in:
modmuss50 2019-08-19 13:30:15 +01:00
parent aab3a02184
commit 2d34ebc480
25 changed files with 248 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/techreborn/config/TechRebornConfig.java
View file

@ -306,10 +306,10 @@ public class TechRebornConfig {
public static int industrialBlastFurnaceMaxEnergy = 40_000;
@Config(config = "generators", category = "diesel_generator", key = "DieselGeneratorMaxOutput", comment = "Diesel Generator Max Output (Value in EU)")
public static int dieselGeneratorMaxOutput = 128;
public static int dieselGeneratorMaxOutput = 32;
@Config(config = "generators", category = "diesel_generator", key = "DieselGeneratorMaxEnergy", comment = "Diesel Generator Max Energy (Value in EU)")
public static int dieselGeneratorMaxEnergy = 1_000_000;
public static int dieselGeneratorMaxEnergy = 10_000;
@Config(config = "generators", category = "diesel_generator", key = "DieselGeneratorTankCapacity", comment = "Diesel Generator Tank Capacity")
public static int dieselGeneratorTankCapacity = 10_000;

3
src/main/java/techreborn/init/FluidGeneratorRecipes.java
View file

@ -24,12 +24,10 @@
package techreborn.init;
import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.Fluids;
import techreborn.api.generator.EFluidGenerator;
import techreborn.api.generator.GeneratorRecipeHelper;
import techreborn.init.ModFluids;
/**
* Created by Prospector
@ -44,6 +42,7 @@ public class FluidGeneratorRecipes {
register(EFluidGenerator.SEMIFLUID, ModFluids.SODIUM.getFluid(), 30);
register(EFluidGenerator.SEMIFLUID, ModFluids.LITHIUM.getFluid(), 60);
register(EFluidGenerator.SEMIFLUID, ModFluids.OIL.getFluid(), 16);
register(EFluidGenerator.SEMIFLUID, ModFluids.BIOFUEL.getFluid(), 6);
register(EFluidGenerator.THERMAL, Fluids.LAVA, 60);

3
src/main/java/techreborn/init/ModFluids.java
View file

@ -67,7 +67,8 @@ public enum ModFluids {
SULFUR,
SULFURIC_ACID,
TRITIUM,
WOLFRAMIUM;
WOLFRAMIUM,
BIOFUEL;
private RebornFluid stillFluid;
private RebornFluid flowingFluid;

50
src/main/java/techreborn/init/TRContent.java
View file

@ -31,10 +31,23 @@ import net.minecraft.entity.EntityType;
import net.minecraft.item.Item;
import net.minecraft.item.ItemConvertible;
import net.minecraft.item.ItemStack;
import reborncore.api.power.EnumPowerTier;
import reborncore.api.blockentity.IUpgrade;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.powerSystem.PowerAcceptorBlockEntity;
import techreborn.TechReborn;
import techreborn.blockentity.ChargeOMatBlockEntity;
import techreborn.blockentity.DigitalChestBlockEntity;
import techreborn.blockentity.IndustrialCentrifugeBlockEntity;
import techreborn.blockentity.generator.LightningRodBlockEntity;
import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity;
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.multiblock.*;
import techreborn.blockentity.machine.tier1.*;
import techreborn.blockentity.machine.tier3.*;
import techreborn.blockentity.storage.AdjustableSUBlockEntity;
import techreborn.blocks.*;
import techreborn.blocks.cable.BlockCable;
import techreborn.blocks.generator.*;
@ -42,8 +55,8 @@ import techreborn.blocks.lighting.BlockLamp;
import techreborn.blocks.storage.*;
import techreborn.blocks.tier0.BlockIronAlloyFurnace;
import techreborn.blocks.tier0.BlockIronFurnace;
import techreborn.blocks.tier1.*;
import techreborn.blocks.tier3.*;
import techreborn.blocks.tier1.BlockPlayerDetector;
import techreborn.blocks.tier3.BlockCreativeQuantumChest;
import techreborn.blocks.transformers.BlockHVTransformer;
import techreborn.blocks.transformers.BlockLVTransformer;
import techreborn.blocks.transformers.BlockMVTransformer;
@ -53,33 +66,6 @@ import techreborn.entities.EntityNukePrimed;
import techreborn.items.ItemDynamicCell;
import techreborn.items.ItemUpgrade;
import techreborn.utils.InitUtils;
import techreborn.blockentity.storage.AdjustableSUBlockEntity;
import techreborn.blockentity.ChargeOMatBlockEntity;
import techreborn.blockentity.DigitalChestBlockEntity;
import techreborn.blockentity.IndustrialCentrifugeBlockEntity;
import techreborn.blockentity.generator.LightningRodBlockEntity;
import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity;
import techreborn.blockentity.generator.advanced.DieselGeneratorBlockEntity;
import techreborn.blockentity.generator.advanced.DragonEggSyphonBlockEntity;
import techreborn.blockentity.generator.advanced.GasTurbineBlockEntity;
import techreborn.blockentity.generator.advanced.SemiFluidGeneratorBlockEntity;
import techreborn.blockentity.generator.advanced.ThermalGeneratorBlockEntity;
import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity;
import techreborn.blockentity.generator.basic.WaterMillBlockEntity;
import techreborn.blockentity.generator.basic.WindMillBlockEntity;
import techreborn.blockentity.machine.multiblock.DistillationTowerBlockEntity;
import techreborn.blockentity.machine.multiblock.FluidReplicatorBlockEntity;
import techreborn.blockentity.machine.multiblock.ImplosionCompressorBlockEntity;
import techreborn.blockentity.machine.multiblock.IndustrialBlastFurnaceBlockEntity;
import techreborn.blockentity.machine.multiblock.IndustrialGrinderBlockEntity;
import techreborn.blockentity.machine.multiblock.IndustrialSawmillBlockEntity;
import techreborn.blockentity.machine.multiblock.VacuumFreezerBlockEntity;
import techreborn.blockentity.machine.tier1.*;
import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity;
import techreborn.blockentity.machine.tier3.CreativeQuantumTankBlockEntity;
import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity;
import techreborn.blockentity.machine.tier3.QuantumChestBlockEntity;
import techreborn.blockentity.machine.tier3.QuantumTankBlockEntity;
import javax.annotation.Nullable;
import java.util.Arrays;
@ -656,7 +642,9 @@ public class TRContent {
RUBBER,
SAP,
SCRAP,
UU_MATTER;
UU_MATTER,
PLANTBALL,
COMPRESSED_PLANTBALL;
public final String name;
public final Item item;

5
src/main/resources/assets/techreborn/blockstates/biofuel.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/biofuel" }
}
}

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

@ -183,6 +183,7 @@
"block.techreborn.sulfuricacid": "Sulfuric Acid",
"block.techreborn.tritium": "Tritium",
"block.techreborn.wolframium": "Wolframium",
"block.techreborn.biofuel": "BioFuel",
"_comment6": "Fluids",
"fluid.fluidberylium": "Beryllium",
@ -219,6 +220,7 @@
"fluid.fluidsulfuricacid": "Sulfuric Acid",
"fluid.fluidtritium": "Tritium",
"fluid.fluidwolframium": "Wolframium",
"fluid.fluidbiofuel": "BioFuel",
"_comment7": "Dusts",
"item.techreborn.almandine_dust": "Almandine Dust",
@ -481,6 +483,8 @@
"item.techreborn.sap": "Sap",
"item.techreborn.scrap": "Scrap",
"item.techreborn.uu_matter": "UU-Matter",
"item.techreborn.plantball": "Plantball",
"item.techreborn.compressed_plantball": "Compressed Plantball",
"_comment14": "Items-Armor",
"item.techreborn.cloaking_device": "Cloaking Device",
@ -689,5 +693,6 @@
"item.techreborn.sulfur_bucket": "Sulfur",
"item.techreborn.sulfuric_acid_bucket": "Sulfuric Acid",
"item.techreborn.tritium_bucket": "Tritium",
"item.techreborn.wolframium_bucket": "Wolframium"
"item.techreborn.wolframium_bucket": "Wolframium",
"item.techreborn.biofuel_bucket": "Biofuel"
}

5
src/main/resources/assets/techreborn/models/block/fluid/bio_fuel.json Normal file
View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "techreborn:block/fluids/biofuel_flowing"
}
}

6
src/main/resources/assets/techreborn/models/item/compressed_plantball.json Normal file
View file

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

6
src/main/resources/assets/techreborn/models/item/plantball.json Normal file
View file

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

BIN
src/main/resources/assets/techreborn/textures/block/fluids/biofuel_flowing.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.3 KiB

5
src/main/resources/assets/techreborn/textures/block/fluids/biofuel_flowing.png.mcmeta Normal file
View file

@ -0,0 +1,5 @@
{
"animation":{
"frametime":4
}
}

BIN
src/main/resources/assets/techreborn/textures/item/part/compressed_plantball.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
src/main/resources/assets/techreborn/textures/item/part/plantball.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

16
src/main/resources/data/techreborn/recipes/compressor/compressed_plantball.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "techreborn:compressor",
"power": 2,
"time": 400,
"ingredients": [
{
"tag": "minecraft:leaves",
"count": 8
}
],
"results": [
{
"item": "techreborn:compressed_plantball"
}
]
}

16
src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_1.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "techreborn:compressor",
"power": 2,
"time": 400,
"ingredients": [
{
"tag": "minecraft:saplings",
"count": 8
}
],
"results": [
{
"item": "techreborn:compressed_plantball"
}
]
}

16
src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_10.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "techreborn:compressor",
"power": 2,
"time": 400,
"ingredients": [
{
"item": "minecraft:melon",
"count": 8
}
],
"results": [
{
"item": "techreborn:compressed_plantball"
}
]
}

16
src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_2.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "techreborn:compressor",
"power": 2,
"time": 400,
"ingredients": [
{
"item": "minecraft:sugar_cane",
"count": 8
}
],
"results": [
{
"item": "techreborn:compressed_plantball"
}
]
}

16
src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_3.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "techreborn:compressor",
"power": 2,
"time": 400,
"ingredients": [
{
"item": "minecraft:cactus",
"count": 8
}
],
"results": [
{
"item": "techreborn:compressed_plantball"
}
]
}

16
src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_4.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "techreborn:compressor",
"power": 2,
"time": 400,
"ingredients": [
{
"item": "minecraft:wheat",
"count": 8
}
],
"results": [
{
"item": "techreborn:compressed_plantball"
}
]
}

16
src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_5.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "techreborn:compressor",
"power": 2,
"time": 400,
"ingredients": [
{
"item": "minecraft:carrot",
"count": 8
}
],
"results": [
{
"item": "techreborn:compressed_plantball"
}
]
}

16
src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_6.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "techreborn:compressor",
"power": 2,
"time": 400,
"ingredients": [
{
"item": "minecraft:potato",
"count": 8
}
],
"results": [
{
"item": "techreborn:compressed_plantball"
}
]
}

16
src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_7.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "techreborn:compressor",
"power": 2,
"time": 400,
"ingredients": [
{
"item": "minecraft:apple",
"count": 8
}
],
"results": [
{
"item": "techreborn:compressed_plantball"
}
]
}

16
src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_8.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "techreborn:compressor",
"power": 2,
"time": 400,
"ingredients": [
{
"item": "minecraft:melon_slice",
"count": 64
}
],
"results": [
{
"item": "techreborn:compressed_plantball"
}
]
}

16
src/main/resources/data/techreborn/recipes/compressor/compressed_plantball_9.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "techreborn:compressor",
"power": 2,
"time": 400,
"ingredients": [
{
"item": "minecraft:pumpkin",
"count": 8
}
],
"results": [
{
"item": "techreborn:compressed_plantball"
}
]
}

15
src/main/resources/data/techreborn/recipes/compressor/plantball.json Normal file
View file

@ -0,0 +1,15 @@
{
"type": "techreborn:compressor",
"power": 2,
"time": 400,
"ingredients": [
{
"item": "techreborn:plantball"
}
],
"results": [
{
"item": "techreborn:compressed_plantball"
}
]
}