Gui fixes, 393

This commit is contained in:
modmuss50 2019-02-22 14:02:04 +00:00
parent 06632be822
commit d68c65641d
20 changed files with 189 additions and 452 deletions

View file

@ -24,297 +24,63 @@
package techreborn.init;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import reborncore.RebornRegistry;
import techreborn.TechReborn;
import techreborn.blocks.fluid.BlockFluidTechReborn;
import techreborn.blocks.fluid.TechRebornFluid;
public class ModFluids {
public static Fluid BERYLLIUM = new TechRebornFluid("berylium");
public static BlockFluidTechReborn BLOCK_BERYLLIUM;
public static Fluid CALCIUM = new TechRebornFluid("calcium");
public static BlockFluidTechReborn BLOCK_CALCIUM;
public static Fluid CALCIUM_CARBONATE = new TechRebornFluid("calciumcarbonate");
public static BlockFluidTechReborn BLOCK_CALCIUM_CARBONATE;
public static Fluid CHLORITE = new TechRebornFluid("chlorite");
public static BlockFluidTechReborn BLOCK_CHLORITE;
public static Fluid DEUTERIUM = new TechRebornFluid("deuterium");
public static BlockFluidTechReborn BLOCK_DEUTERIUM;
public static Fluid GLYCERYL = new TechRebornFluid("glyceryl");
public static BlockFluidTechReborn BLOCK_GLYCERYL;
public static Fluid HELIUM = new TechRebornFluid("helium");
public static BlockFluidTechReborn BLOCK_HELIUM;
public static Fluid HELIUM_3 = new TechRebornFluid("helium3");
public static BlockFluidTechReborn BLOCK_HELIUM_3;
public static Fluid HELIUMPLASMA = new TechRebornFluid("heliumplasma");
public static BlockFluidTechReborn BLOCK_HELIUMPLASMA;
public static Fluid HYDROGEN = new TechRebornFluid("hydrogen");
public static BlockFluidTechReborn BLOCK_HYDROGEN;
public static Fluid LITHIUM = new TechRebornFluid("lithium");
public static BlockFluidTechReborn BLOCK_LITHIUM;
public static Fluid MERCURY = new TechRebornFluid("mercury");
public static BlockFluidTechReborn BLOCK_MERCURY;
public static Fluid METHANE = new TechRebornFluid("methane");
public static BlockFluidTechReborn BLOCK_METHANE;
public static Fluid NITROCOAL_FUEL = new TechRebornFluid("nitrocoalfuel");
public static BlockFluidTechReborn BLOCK_NITROCOAL_FUEL;
public static Fluid NITROFUEL = new TechRebornFluid("nitrofuel");
public static BlockFluidTechReborn BLOCK_NITROFUEL;
public static Fluid NITROGEN = new TechRebornFluid("nitrogen");
public static BlockFluidTechReborn BLOCK_NITROGEN;
public static Fluid NITROGENDIOXIDE = new TechRebornFluid("nitrogendioxide");
public static BlockFluidTechReborn BLOCK_NITROGENDIOXIDE;
public static Fluid POTASSIUM = new TechRebornFluid("potassium");
public static BlockFluidTechReborn BLOCK_POTASSIUM;
public static Fluid SILICON = new TechRebornFluid("silicon");
public static BlockFluidTechReborn BLOCK_SILICON;
public static Fluid SODIUM = new TechRebornFluid("sodium");
public static BlockFluidTechReborn BLOCK_SODIUM;
public static Fluid SODIUMPERSULFATE = new TechRebornFluid("sodiumpersulfate");
public static BlockFluidTechReborn BLOCK_SODIUMPERSULFATE;
public static Fluid TRITIUM = new TechRebornFluid("tritium");
public static BlockFluidTechReborn BLOCK_TRITIUM;
public static Fluid WOLFRAMIUM = new TechRebornFluid("wolframium");
public static BlockFluidTechReborn BLOCK_WOLFRAMIUM;
public static Fluid CARBON = new TechRebornFluid("carbon");
public static BlockFluidTechReborn BLOCK_CARBON;
public static Fluid CARBON_FIBER = new TechRebornFluid("carbonfiber");
public static BlockFluidTechReborn BLOCK_CARBON_FIBER;
public static Fluid NITRO_CARBON = new TechRebornFluid("nitrocarbon");
public static BlockFluidTechReborn BLOCK_NITRO_CARBON;
public static Fluid SULFUR = new TechRebornFluid("Sulfur");
public static BlockFluidTechReborn BLOCK_SULFUR;
public static Fluid SODIUM_SULFIDE = new TechRebornFluid("sodiumSulfide");
public static BlockFluidTechReborn BLOCK_SODIUM_SULFIDE;
public static Fluid DIESEL = new TechRebornFluid("diesel");
public static BlockFluidTechReborn BLOCK_DIESEL;
public static Fluid NITRO_DIESEL = new TechRebornFluid("nitrodiesel");
public static BlockFluidTechReborn BLOCK_NITRO_DIESEL;
public static Fluid OIL = new TechRebornFluid("oil");
public static BlockFluidTechReborn BLOCK_OIL;
public static Fluid SULFURIC_ACID = new TechRebornFluid("sulfuricacid");
public static BlockFluidTechReborn BLOCK_SULFURIC_ACID;
public static Fluid COMPRESSED_AIR = new TechRebornFluid("compressedair");
public static BlockFluidTechReborn BLOCK_COMPRESSED_AIR;
public static Fluid ELECTROLYZED_WATER = new TechRebornFluid("electrolyzedwater");
public static BlockFluidTechReborn BLOCK_ELECTROLYZED_WATER;
public static void init() {
FluidRegistry.registerFluid(BERYLLIUM);
BLOCK_BERYLLIUM = new BlockFluidTechReborn(BERYLLIUM, Material.WATER, "techreborn.berylium");
registerBlock(BLOCK_BERYLLIUM, TechReborn.MOD_ID + "_" + BLOCK_BERYLLIUM.getTranslationKey().substring(5));
FluidRegistry.registerFluid(CALCIUM);
BLOCK_CALCIUM = new BlockFluidTechReborn(CALCIUM, Material.WATER, "techreborn.calcium");
registerBlock(BLOCK_CALCIUM,
TechReborn.MOD_ID + "_" + BLOCK_CALCIUM.getTranslationKey().substring(5));
FluidRegistry.registerFluid(CALCIUM_CARBONATE);
BLOCK_CALCIUM_CARBONATE = new BlockFluidTechReborn(CALCIUM_CARBONATE, Material.WATER,
"techreborn.calciumcarbonate");
registerBlock(BLOCK_CALCIUM_CARBONATE,
TechReborn.MOD_ID + "_" + BLOCK_CALCIUM_CARBONATE.getTranslationKey().substring(5));
FluidRegistry.registerFluid(CHLORITE);
BLOCK_CHLORITE = new BlockFluidTechReborn(CHLORITE, Material.WATER, "techreborn.chlorite");
registerBlock(BLOCK_CHLORITE,
TechReborn.MOD_ID + "_" + BLOCK_CHLORITE.getTranslationKey().substring(5));
FluidRegistry.registerFluid(DEUTERIUM);
BLOCK_DEUTERIUM = new BlockFluidTechReborn(DEUTERIUM, Material.WATER, "techreborn.deuterium");
registerBlock(BLOCK_DEUTERIUM,
TechReborn.MOD_ID + "_" + BLOCK_DEUTERIUM.getTranslationKey().substring(5));
FluidRegistry.registerFluid(GLYCERYL);
BLOCK_GLYCERYL = new BlockFluidTechReborn(GLYCERYL, Material.WATER, "techreborn.glyceryl");
registerBlock(BLOCK_GLYCERYL,
TechReborn.MOD_ID + "_" + BLOCK_GLYCERYL.getTranslationKey().substring(5));
FluidRegistry.registerFluid(HELIUM);
BLOCK_HELIUM = new BlockFluidTechReborn(HELIUM, Material.WATER, "techreborn.helium");
registerBlock(BLOCK_HELIUM,
TechReborn.MOD_ID + "_" + BLOCK_HELIUM.getTranslationKey().substring(5));
FluidRegistry.registerFluid(HELIUM_3);
BLOCK_HELIUM_3 = new BlockFluidTechReborn(HELIUM_3, Material.WATER, "techreborn.helium3");
registerBlock(BLOCK_HELIUM_3,
TechReborn.MOD_ID + "_" + BLOCK_HELIUM_3.getTranslationKey().substring(5));
FluidRegistry.registerFluid(HELIUMPLASMA);
BLOCK_HELIUMPLASMA = new BlockFluidTechReborn(HELIUMPLASMA, Material.WATER, "techreborn.heliumplasma");
registerBlock(BLOCK_HELIUMPLASMA,
TechReborn.MOD_ID + "_" + BLOCK_HELIUMPLASMA.getTranslationKey().substring(5));
FluidRegistry.registerFluid(HYDROGEN);
BLOCK_HYDROGEN = new BlockFluidTechReborn(HYDROGEN, Material.WATER, "techreborn.hydrogen");
registerBlock(BLOCK_HYDROGEN,
TechReborn.MOD_ID + "_" + BLOCK_HYDROGEN.getTranslationKey().substring(5));
FluidRegistry.registerFluid(LITHIUM);
BLOCK_LITHIUM = new BlockFluidTechReborn(LITHIUM, Material.WATER, "techreborn.lithium");
registerBlock(BLOCK_LITHIUM,
TechReborn.MOD_ID + "_" + BLOCK_LITHIUM.getTranslationKey().substring(5));
FluidRegistry.registerFluid(MERCURY);
BLOCK_MERCURY = new BlockFluidTechReborn(MERCURY, Material.WATER, "techreborn.mercury");
registerBlock(BLOCK_MERCURY,
TechReborn.MOD_ID + "_" + BLOCK_MERCURY.getTranslationKey().substring(5));
FluidRegistry.registerFluid(METHANE);
BLOCK_METHANE = new BlockFluidTechReborn(METHANE, Material.WATER, "techreborn.methane");
registerBlock(BLOCK_METHANE,
TechReborn.MOD_ID + "_" + BLOCK_METHANE.getTranslationKey().substring(5));
FluidRegistry.registerFluid(NITROCOAL_FUEL);
BLOCK_NITROCOAL_FUEL = new BlockFluidTechReborn(NITROCOAL_FUEL, Material.WATER,
"techreborn.nitrocoalfuel");
registerBlock(BLOCK_NITROCOAL_FUEL,
TechReborn.MOD_ID + "_" + BLOCK_NITROCOAL_FUEL.getTranslationKey().substring(5));
FluidRegistry.registerFluid(NITROFUEL);
BLOCK_NITROFUEL = new BlockFluidTechReborn(NITROFUEL, Material.WATER, "techreborn.nitrofuel");
registerBlock(BLOCK_NITROFUEL,
TechReborn.MOD_ID + "_" + BLOCK_NITROFUEL.getTranslationKey().substring(5));
FluidRegistry.registerFluid(NITROGEN);
BLOCK_NITROGEN = new BlockFluidTechReborn(NITROGEN, Material.WATER, "techreborn.nitrogen");
registerBlock(BLOCK_NITROGEN,
TechReborn.MOD_ID + "_" + BLOCK_NITROGEN.getTranslationKey().substring(5));
FluidRegistry.registerFluid(NITROGENDIOXIDE);
BLOCK_NITROGENDIOXIDE = new BlockFluidTechReborn(NITROGENDIOXIDE, Material.WATER,
"techreborn.nitrogendioxide");
registerBlock(BLOCK_NITROGENDIOXIDE,
TechReborn.MOD_ID + "_" + BLOCK_NITROGENDIOXIDE.getTranslationKey().substring(5));
FluidRegistry.registerFluid(POTASSIUM);
BLOCK_POTASSIUM = new BlockFluidTechReborn(POTASSIUM, Material.WATER, "techreborn.potassium");
registerBlock(BLOCK_POTASSIUM,
TechReborn.MOD_ID + "_" + BLOCK_POTASSIUM.getTranslationKey().substring(5));
FluidRegistry.registerFluid(SILICON);
BLOCK_SILICON = new BlockFluidTechReborn(SILICON, Material.WATER, "techreborn.silicon");
registerBlock(BLOCK_SILICON,
TechReborn.MOD_ID + "_" + BLOCK_SILICON.getTranslationKey().substring(5));
FluidRegistry.registerFluid(SODIUM);
BLOCK_SODIUM = new BlockFluidTechReborn(SODIUM, Material.WATER, "techreborn.sodium");
registerBlock(BLOCK_SODIUM,
TechReborn.MOD_ID + "_" + BLOCK_SODIUM.getTranslationKey().substring(5));
FluidRegistry.registerFluid(SODIUMPERSULFATE);
BLOCK_SODIUMPERSULFATE = new BlockFluidTechReborn(SODIUMPERSULFATE, Material.WATER,
"techreborn.sodiumpersulfate");
registerBlock(BLOCK_SODIUMPERSULFATE,
TechReborn.MOD_ID + "_" + BLOCK_SODIUMPERSULFATE.getTranslationKey().substring(5));
FluidRegistry.registerFluid(TRITIUM);
BLOCK_TRITIUM = new BlockFluidTechReborn(TRITIUM, Material.WATER, "techreborn.tritium");
registerBlock(BLOCK_TRITIUM,
TechReborn.MOD_ID + "_" + BLOCK_TRITIUM.getTranslationKey().substring(5));
FluidRegistry.registerFluid(WOLFRAMIUM);
BLOCK_WOLFRAMIUM = new BlockFluidTechReborn(WOLFRAMIUM, Material.WATER, "techreborn.wolframium");
registerBlock(BLOCK_WOLFRAMIUM,
TechReborn.MOD_ID + "_" + BLOCK_WOLFRAMIUM.getTranslationKey().substring(5));
FluidRegistry.registerFluid(CARBON);
BLOCK_CARBON = new BlockFluidTechReborn(CARBON, Material.WATER, "techreborn.carbon");
registerBlock(BLOCK_CARBON,
TechReborn.MOD_ID + "_" + BLOCK_CARBON.getTranslationKey().substring(5));
FluidRegistry.registerFluid(CARBON_FIBER);
BLOCK_CARBON_FIBER = new BlockFluidTechReborn(CARBON_FIBER, Material.WATER, "techreborn.carbonfiber");
registerBlock(BLOCK_CARBON_FIBER,
TechReborn.MOD_ID + "_" + BLOCK_CARBON_FIBER.getTranslationKey().substring(5));
FluidRegistry.registerFluid(NITRO_CARBON);
BLOCK_NITRO_CARBON = new BlockFluidTechReborn(NITRO_CARBON, Material.WATER, "techreborn.nitrocarbon");
registerBlock(BLOCK_NITRO_CARBON,
TechReborn.MOD_ID + "_" + BLOCK_NITRO_CARBON.getTranslationKey().substring(5));
FluidRegistry.registerFluid(SULFUR);
BLOCK_SULFUR = new BlockFluidTechReborn(SULFUR, Material.WATER, "techreborn.sulfur");
registerBlock(BLOCK_SULFUR,
TechReborn.MOD_ID + "_" + BLOCK_SULFUR.getTranslationKey().substring(5));
FluidRegistry.registerFluid(SODIUM_SULFIDE);
BLOCK_SODIUM_SULFIDE = new BlockFluidTechReborn(SODIUM_SULFIDE, Material.WATER, "techreborn.sodiumsulfide");
registerBlock(BLOCK_SODIUM_SULFIDE,
TechReborn.MOD_ID + "_" + BLOCK_SODIUM_SULFIDE.getTranslationKey().substring(5));
FluidRegistry.registerFluid(DIESEL);
BLOCK_DIESEL = new BlockFluidTechReborn(DIESEL, Material.WATER, "techreborn.diesel");
registerBlock(BLOCK_DIESEL,
TechReborn.MOD_ID + "_" + BLOCK_DIESEL.getTranslationKey().substring(5));
FluidRegistry.registerFluid(NITRO_DIESEL);
BLOCK_NITRO_DIESEL = new BlockFluidTechReborn(NITRO_DIESEL, Material.WATER, "techreborn.nitrodiesel");
registerBlock(BLOCK_NITRO_DIESEL,
TechReborn.MOD_ID + "_" + BLOCK_NITRO_DIESEL.getTranslationKey().substring(5));
FluidRegistry.registerFluid(OIL);
BLOCK_OIL = new BlockFluidTechReborn(OIL, Material.WATER, "techreborn.oil");
registerBlock(BLOCK_OIL,
TechReborn.MOD_ID + "_" + BLOCK_OIL.getTranslationKey().substring(5));
FluidRegistry.registerFluid(SULFURIC_ACID);
BLOCK_SULFURIC_ACID = new BlockFluidTechReborn(SULFURIC_ACID, Material.WATER, "techreborn.sulfuricacid");
registerBlock(BLOCK_SULFURIC_ACID,
TechReborn.MOD_ID + "_" + BLOCK_SULFURIC_ACID.getTranslationKey().substring(5));
FluidRegistry.registerFluid(COMPRESSED_AIR);
BLOCK_COMPRESSED_AIR = new BlockFluidTechReborn(COMPRESSED_AIR, Material.WATER, "techreborn.compressedair");
registerBlock(BLOCK_COMPRESSED_AIR,
TechReborn.MOD_ID + "_" + BLOCK_COMPRESSED_AIR.getTranslationKey().substring(5));
FluidRegistry.registerFluid(ELECTROLYZED_WATER);
BLOCK_ELECTROLYZED_WATER = new BlockFluidTechReborn(ELECTROLYZED_WATER, Material.WATER, "techreborn.electrolyzedwater");
registerBlock(BLOCK_ELECTROLYZED_WATER,
TechReborn.MOD_ID + "_" + BLOCK_ELECTROLYZED_WATER.getTranslationKey().substring(5));
public enum ModFluids {
BERYLLIUM,
CALCIUM,
CALCIUM_CARBONATE,
CHLORITE,
DEUTERIUM,
GLYCERYL,
HELIUM,
HELIUM_3,
HELIUMPLASMA,
HYDROGEN,
LITHIUM,
MERCURY,
METHANE,
NITROCOAL_FUEL,
NITROFUEL,
NITROGEN,
NITROGENDIOXIDE,
POTASSIUM,
SILICON,
SODIUM,
SODIUMPERSULFATE,
TRITIUM,
WOLFRAMIUM,
CARBON,
CARBON_FIBER,
NITRO_CARBON,
SULFUR,
SODIUM_SULFIDE,
DIESEL,
NITRO_DIESEL,
OIL,
SULFURIC_ACID,
COMPRESSED_AIR,
ELECTROLYZED_WATER;
public Fluid fluid;
public BlockFluidTechReborn block;
public String name;
ModFluids() {
this.name = this.toString().replace("_", "").toLowerCase(); //Is this ok?
fluid = new Fluid(name, new ResourceLocation("techreborn", "fixme"), new ResourceLocation("techrebonr", "alsofixme"));
}
public static void registerBlock(Block block, String name) {
RebornRegistry.registerBlock(block, name);
public Fluid getFluid() {
return fluid;
}
public BlockFluidTechReborn getBlock() {
return block;
}
public String getName() {
return name;
}
}

View file

@ -24,6 +24,7 @@
package techreborn.init.recipes;
import net.minecraft.init.Fluids;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import techreborn.api.generator.EFluidGenerator;
@ -35,21 +36,22 @@ import techreborn.init.ModFluids;
*/
public class FluidGeneratorRecipes extends RecipeMethods {
public static void init() {
register(EFluidGenerator.DIESEL, ModFluids.NITROFUEL, 24);
register(EFluidGenerator.DIESEL, ModFluids.NITROCOAL_FUEL, 48);
register(EFluidGenerator.DIESEL, ModFluids.DIESEL, 128);
register(EFluidGenerator.DIESEL, ModFluids.NITRO_DIESEL, 400);
register(EFluidGenerator.DIESEL, ModFluids.NITROFUEL.getFluid(), 24);
register(EFluidGenerator.DIESEL, ModFluids.NITROCOAL_FUEL.getFluid(), 48);
register(EFluidGenerator.DIESEL, ModFluids.DIESEL.getFluid(), 128);
register(EFluidGenerator.DIESEL, ModFluids.NITRO_DIESEL.getFluid(), 400);
register(EFluidGenerator.SEMIFLUID, ModFluids.SODIUM, 30);
register(EFluidGenerator.SEMIFLUID, ModFluids.LITHIUM, 60);
register(EFluidGenerator.SEMIFLUID, ModFluids.OIL, 16);
register(EFluidGenerator.SEMIFLUID, ModFluids.SODIUM.getFluid(), 30);
register(EFluidGenerator.SEMIFLUID, ModFluids.LITHIUM.getFluid(), 60);
register(EFluidGenerator.SEMIFLUID, ModFluids.OIL.getFluid(), 16);
register(EFluidGenerator.THERMAL, FluidRegistry.LAVA, 60);
//TODO 1.13 forge and mc fluids are 2 diffrent things, fix later
//register(EFluidGenerator.THERMAL, Fluids.LAVA, 60);
register(EFluidGenerator.GAS, ModFluids.HYDROGEN, 15);
register(EFluidGenerator.GAS, ModFluids.METHANE, 45);
register(EFluidGenerator.GAS, ModFluids.HYDROGEN.getFluid(), 15);
register(EFluidGenerator.GAS, ModFluids.METHANE.getFluid(), 45);
register(EFluidGenerator.PLASMA, ModFluids.HELIUMPLASMA, 8192);
register(EFluidGenerator.PLASMA, ModFluids.HELIUMPLASMA.getFluid(), 8192);
}
static void register(EFluidGenerator generator, Fluid fluid, int euPerMB) {