diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 86d2bdb8b..ff25a4337 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -128,14 +128,14 @@ public class ModItems { // buckets bucketBerylium = new ItemFluidbucket(ModFluids.BlockFluidBerylium); - bucketBerylium.setUnlocalizedName("bucketBerylium").setContainerItem(Items.bucket); - GameRegistry.registerItem(bucketBerylium, "bucketBerylium"); + bucketBerylium.setUnlocalizedName("bucketberylium").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketBerylium, "bucketberylium"); FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidberylium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketBerylium), new ItemStack(Items.bucket)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidBerylium, bucketBerylium); bucketcalcium = new ItemFluidbucket(ModFluids.BlockFluidCalcium); - bucketcalcium.setUnlocalizedName("bucketCalcium").setContainerItem(Items.bucket); - GameRegistry.registerItem(bucketcalcium, "bucketCalcium"); + bucketcalcium.setUnlocalizedName("bucketcalcium").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketcalcium, "bucketcalcium"); FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidcalcium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketcalcium), new ItemStack(Items.bucket)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidCalcium, bucketcalcium); @@ -150,6 +150,120 @@ public class ModItems { GameRegistry.registerItem(bucketChlorite, "bucketcalchlorite"); FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidchlorite", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.bucket)); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidChlorite, bucketChlorite); + + bucketDeuterium = new ItemFluidbucket(ModFluids.BlockFluidDeuterium); + bucketDeuterium.setUnlocalizedName("bucketdeuterium").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketDeuterium, "bucketdeuterium"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluiddeuterium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketDeuterium), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidDeuterium, bucketDeuterium); + + bucketGlyceryl = new ItemFluidbucket(ModFluids.BlockFluidGlyceryl); + bucketGlyceryl.setUnlocalizedName("bucketglyceryl").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketGlyceryl, "bucketglyceryl"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidglyceryl", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketGlyceryl), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidGlyceryl, bucketGlyceryl); + + bucketHelium = new ItemFluidbucket(ModFluids.BlockFluidHelium); + bucketHelium.setUnlocalizedName("buckethelium").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketHelium, "buckethelium"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidhelium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketHelium), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium, bucketHelium); + + bucketHelium3 = new ItemFluidbucket(ModFluids.BlockFluidHelium3); + bucketHelium3.setUnlocalizedName("buckethelium3").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketHelium3, "buckethelium3"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidhelium3", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketHelium3), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium3, bucketHelium3); + + bucketHeliumplasma = new ItemFluidbucket(ModFluids.BlockFluidHeliumplasma); + bucketHeliumplasma.setUnlocalizedName("bucketheliumplasma").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketHeliumplasma, "bucketheliumplasma"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidheliumplasma", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketHeliumplasma), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHeliumplasma, bucketHeliumplasma); + + bucketHydrogen = new ItemFluidbucket(ModFluids.BlockFluidHydrogen); + bucketHydrogen.setUnlocalizedName("buckethydrogen").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketHydrogen, "buckethydrogen"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidhydrogen", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketHydrogen), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHydrogen, bucketHydrogen); + + bucketLithium = new ItemFluidbucket(ModFluids.BlockFluidLithium); + bucketLithium.setUnlocalizedName("bucketlithium").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketLithium, "bucketlithium"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidlithium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketLithium), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidLithium, bucketLithium); + + bucketMercury = new ItemFluidbucket(ModFluids.BlockFluidMercury); + bucketMercury.setUnlocalizedName("bucketmercury").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketMercury, "bucketmercury"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidmercury", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketMercury), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMercury, bucketMercury); + + bucketMethane = new ItemFluidbucket(ModFluids.BlockFluidMethane); + bucketMethane.setUnlocalizedName("bucketmethane").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketMethane, "bucketmethane"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidmethane", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketMethane), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMethane, bucketMethane); + + bucketNitrocoalfuel = new ItemFluidbucket(ModFluids.BlockFluidNitrocoalfuel); + bucketNitrocoalfuel.setUnlocalizedName("bucketnitrocoalfuel").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketNitrocoalfuel, "bucketnitrocoalfuel"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidnitrocoalfuel", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketNitrocoalfuel), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrocoalfuel, bucketNitrocoalfuel); + + bucketNitrofuel = new ItemFluidbucket(ModFluids.BlockFluidNitrofuel); + bucketNitrofuel.setUnlocalizedName("bucketnitrofuel").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketNitrofuel, "bucketnitrofuel"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidnitrofuel", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketNitrofuel), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrofuel, bucketNitrofuel); + + bucketNitrogen = new ItemFluidbucket(ModFluids.BlockFluidNitrogen); + bucketNitrogen.setUnlocalizedName("bucketnitrogen").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketNitrogen, "bucketnitrogen"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidnitrogen", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketNitrogen), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogen, bucketNitrogen); + + bucketNitrogendioxide = new ItemFluidbucket(ModFluids.BlockFluidNitrogendioxide); + bucketNitrogendioxide.setUnlocalizedName("bucketnitrogendioxide").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketNitrogendioxide, "bucketnitrogendioxide"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidnitrogendioxide", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketNitrogendioxide), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogendioxide, bucketNitrogendioxide); + + bucketPotassium = new ItemFluidbucket(ModFluids.BlockFluidPotassium); + bucketPotassium.setUnlocalizedName("bucketpotassium").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketPotassium, "bucketpotassium"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidpotassium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketPotassium), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidPotassium, bucketPotassium); + + bucketSilicon = new ItemFluidbucket(ModFluids.BlockFluidSilicon); + bucketSilicon.setUnlocalizedName("bucketsilicon").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketSilicon, "bucketsilicon"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidsilicon", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketSilicon), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSilicon, bucketSilicon); + + bucketSodium = new ItemFluidbucket(ModFluids.BlockFluidSodium); + bucketSodium.setUnlocalizedName("bucketsodium").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketSodium, "bucketsodium"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidsodium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketSodium), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodium, bucketSodium); + + bucketSodiumpersulfate = new ItemFluidbucket(ModFluids.BlockFluidSodiumpersulfate); + bucketSodiumpersulfate.setUnlocalizedName("bucketsodiumpersulfate").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketSodiumpersulfate, "bucketsodiumpersulfate"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidsodiumpersulfate", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketSodiumpersulfate), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodiumpersulfate, bucketSodiumpersulfate); + + bucketTritium = new ItemFluidbucket(ModFluids.BlockFluidTritium); + bucketTritium.setUnlocalizedName("buckettritium").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketTritium, "buckettritium"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidtritium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketTritium), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidTritium, bucketTritium); + + bucketWolframium = new ItemFluidbucket(ModFluids.BlockFluidWolframium); + bucketWolframium.setUnlocalizedName("bucketwolframium").setContainerItem(Items.bucket); + GameRegistry.registerItem(bucketWolframium, "bucketwolframium"); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidwolframium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketWolframium), new ItemStack(Items.bucket)); + BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidWolframium, bucketWolframium); MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index e79eb7c89..84ab298aa 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -80,6 +80,9 @@ tile.techreborn.storage.Nickel.name=Block of Nickel tile.techreborn.storage.Invar.name=Block of Invar tile.techreborn.storage.Tungsten.name=Block of Tungsten +#Fluids + + #Dusts item.techreborn.dust.Almandine.name=Almandine Dust item.techreborn.dust.Aluminium.name=Aluminium Dust @@ -329,6 +332,32 @@ item.techreborn.lapotronpack.name=Lapotron Pack item.techreborn.omniTool.name=Omni tool item.techreborn.advancedDrill.name=Advanced Drill +#Buckets +item.bucketberylium.name=Berylium Bucket +item.bucketcalcium.name=Calcium Bucket +item.bucketcalciumcarbonate.name=Calciumcarbonate Bucket +item.bucketchlorite.name=Chlorite Bucket +item.bucketdeuterium.name=Deuterium Bucket +item.bucketglyceryl.name=Glyceryl Bucket +item.buckethelium.name=Helium Bucket +item.buckethelium3.name=Helium3 Bucket +item.bucketheliumplasma.name=Heliumplasma Bucket +item.buckethydrogen.name=Hydrogen Bucket +item.bucketlithium.name=Lithium Bucket +item.bucketmercury.name=Mercury Bucket +item.bucketmethane.name=Methane Bucket +item.bucketnitrocoalfuel.name=Nitrocoalfuel Bucket +item.bucketnitrofuel.name=Nitrofuel Bucket +item.bucketnitrogen.name=Nitrogen Bucket +item.bucketnitrogendioxide.name=Nitrogendioxide Bucket +item.bucketpotassium.name=Potassium Bucket +item.bucketsilicon.name=Silicon Bucket +item.bucketsodium.name=Sodium Bucket +item.bucketsodiumpersulfate.name=Sodiumpersulfate Bucket +item.buckettritium.name=Tritium Bucket +item.bucketwolframium.name=Wolframium Bucket + + #Configs config.techreborn.allow.galenaOre=Allow Galena Ore config.techreborn.allow.galenaOre.tooltip=Decide whether Galena Ore spawns or not