From de65fb804ee3473faabee38539b0d91ad6b6a471 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Tue, 9 Apr 2019 13:06:03 +0200 Subject: finetuned the veins a bit more +changed material names and colors/texture sets Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: a20c82f20965621c62070268fcfbf5545c175d8d --- .../bartworks/system/material/WerkstoffLoader.java | 22 +++++++++++----------- .../ross128/world/oregen/BW_WorldGenRoss128.java | 7 ++----- 2 files changed, 13 insertions(+), 16 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index 043dfd1f7d..ebb7242ebd 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -354,7 +354,7 @@ public class WerkstoffLoader implements Runnable { new Pair(Materials.Oxygen, 4) ); public static final Werkstoff Forsterit = new Werkstoff( - new short[]{150,150,150,0}, + new short[]{255,255,255,0}, "Forsterite", new Werkstoff.Stats().setElektrolysis(true), Werkstoff.Types.COMPOUND, @@ -380,28 +380,28 @@ public class WerkstoffLoader implements Runnable { new Pair(Materials.Silicon, 2), new Pair(Materials.Oxygen, 6) ); - public static final Werkstoff DescolizitZNVO4 = new Werkstoff( - new short[]{100,60,30,0}, - "Descolizite(ZnVO4)",//Pb(Zn,Cu)[OH|VO4 + public static final Werkstoff DescloiziteZNVO4 = new Werkstoff( + new short[]{0xBF,0x18,0x0F,0}, + "Red Descloizite",//Pb(Zn,Cu)[OH|VO4 new Werkstoff.Stats().setElektrolysis(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures(), 26, - TextureSet.SET_METALLIC, + TextureSet.SET_QUARTZ, Arrays.asList(Materials.Lead,Materials.Copper,Materials.Vanadium), new Pair(Materials.Lead, 1), new Pair(Materials.Zinc, 1), new Pair(Materials.Vanadium, 1), new Pair(Materials.Oxygen, 4) ); - public static final Werkstoff DescolizitCUVO4 = new Werkstoff( - new short[]{100,60,30,0}, - "Descolizite(CuVO4)",//Pb(Zn,Cu)[OH|VO4 + public static final Werkstoff DescloiziteCUVO4 = new Werkstoff( + new short[]{0xf9,0x6d,0x18,0}, + "Orange Descolizite",//Pb(Zn,Cu)[OH|VO4 new Werkstoff.Stats().setElektrolysis(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures(), 27, - TextureSet.SET_METALLIC, + TextureSet.SET_QUARTZ, Arrays.asList(Materials.Lead,Materials.Zinc,Materials.Vanadium), new Pair(Materials.Lead, 1), new Pair(Materials.Copper, 1), @@ -410,7 +410,7 @@ public class WerkstoffLoader implements Runnable { ); public static final Werkstoff FuchsitAL = new Werkstoff( new short[]{0x4D,0x7F,0x64,0}, - "Fuchsite(Al)", + "Green Fuchsite", "KAl3Si3O10(OH)2", new Werkstoff.Stats().setElektrolysis(true), Werkstoff.Types.COMPOUND, @@ -427,7 +427,7 @@ public class WerkstoffLoader implements Runnable { ); public static final Werkstoff FuchsitCR = new Werkstoff( new short[]{128,0,0,0}, - "Fuchsite(Cr)", + "Red Fuchsite", "KCr3Si3O10(OH)2", new Werkstoff.Stats().setElektrolysis(true), Werkstoff.Types.COMPOUND, diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128/world/oregen/BW_WorldGenRoss128.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128/world/oregen/BW_WorldGenRoss128.java index 5fa9218ef2..d907b7ce69 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128/world/oregen/BW_WorldGenRoss128.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128/world/oregen/BW_WorldGenRoss128.java @@ -22,13 +22,10 @@ package com.github.bartimaeusnek.crossmod.galacticraft.planets.ross128.world.oregen; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.bartimaeusnek.crossmod.galacticraft.planets.ross128.world.worldprovider.WorldProviderRoss128b; import com.github.bartimaeusnek.crossmod.galacticraft.solarsystems.Ross128; import gregtech.api.enums.Materials; import gregtech.api.interfaces.ISubTagContainer; -import gregtech.api.world.GT_Worldgen; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; @@ -51,8 +48,8 @@ public class BW_WorldGenRoss128 extends BW_OreLayer { new BW_WorldGenRoss128("ore.mix.ross128.Roquesit", true, 5, 250, 3, 1, 12, WerkstoffLoader.Arsenopyrite, WerkstoffLoader.Ferberite, WerkstoffLoader.Loellingit, WerkstoffLoader.Roquesit); new BW_WorldGenRoss128("ore.mix.ross128.Tungstate", true, 5, 250, 10, 4, 14, WerkstoffLoader.Ferberite, WerkstoffLoader.Huebnerit, WerkstoffLoader.Loellingit, Materials.Scheelite); new BW_WorldGenRoss128("ore.mix.ross128.CopperSulfits", true, 40, 70, 80, 3, 24, WerkstoffLoader.Djurleit, WerkstoffLoader.Bornite, WerkstoffLoader.Wittichenit, Materials.Tetrahedrite); - new BW_WorldGenRoss128("ore.mix.ross128.Forsterit", true, 60, 180, 50, 2, 32, WerkstoffLoader.Forsterit, WerkstoffLoader.Fayalit, WerkstoffLoader.DescolizitCUVO4, WerkstoffLoader.DescolizitZNVO4); - new BW_WorldGenRoss128("ore.mix.ross128.Hedenbergit", true, 30, 60, 50, 2, 32, WerkstoffLoader.Hedenbergit, WerkstoffLoader.Fayalit, WerkstoffLoader.DescolizitZNVO4, WerkstoffLoader.Forsterit); + new BW_WorldGenRoss128("ore.mix.ross128.Forsterit", true, 20, 180, 50, 2, 32, WerkstoffLoader.Forsterit, WerkstoffLoader.Fayalit, WerkstoffLoader.DescloiziteCUVO4, WerkstoffLoader.DescloiziteZNVO4); + new BW_WorldGenRoss128("ore.mix.ross128.Hedenbergit", true, 20, 180, 50, 2, 32, WerkstoffLoader.Hedenbergit, WerkstoffLoader.Fayalit, WerkstoffLoader.DescloiziteCUVO4, WerkstoffLoader.DescloiziteZNVO4); new BW_WorldGenRoss128("ore.mix.ross128.RedZircon", true, 10, 40, 40, 3, 24, WerkstoffLoader.Fayalit,WerkstoffLoader.FuchsitAL , WerkstoffLoader.RedZircon,WerkstoffLoader.FuchsitCR); } -- cgit