From 6dcd02dadeacc93d3aec7343ca320da0dd036e9b Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Wed, 24 Oct 2018 12:54:34 +0100 Subject: + Added 2 more planets to HD10180. $ Fixed GC Packet Decoding ASM. --- .../galacticraft/system/hd10180/SystemHD10180.java | 30 ++++++++--- .../c/blocks/BlockRegistrationHD10180C.java | 62 ++++++++++++++++++++++ .../planets/c/dim/WorldProviderHD10180C.java | 13 +++++ .../d/blocks/BlockRegistrationHD10180D.java | 62 ++++++++++++++++++++++ .../planets/d/dim/WorldProviderHD10180D.java | 13 +++++ 5 files changed, 174 insertions(+), 6 deletions(-) create mode 100644 src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/c/blocks/BlockRegistrationHD10180C.java create mode 100644 src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/c/dim/WorldProviderHD10180C.java create mode 100644 src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/d/blocks/BlockRegistrationHD10180D.java create mode 100644 src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/d/dim/WorldProviderHD10180D.java (limited to 'src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180') diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/SystemHD10180.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/SystemHD10180.java index 585634bc07..a6f51255db 100644 --- a/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/SystemHD10180.java +++ b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/SystemHD10180.java @@ -1,9 +1,14 @@ package gtPlusPlus.xmod.galacticraft.system.hd10180; -import gtPlusPlus.xmod.galacticraft.system.BaseSolarSystem; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.galacticraft.system.core.dim.BasicChunkProviderGalactic; +import gtPlusPlus.xmod.galacticraft.system.core.space.BaseSolarSystem; import gtPlusPlus.xmod.galacticraft.system.hd10180.planets.b.blocks.BlockRegistrationHD10180B; import gtPlusPlus.xmod.galacticraft.system.hd10180.planets.b.dim.WorldProviderHD10180B; +import gtPlusPlus.xmod.galacticraft.system.hd10180.planets.c.blocks.BlockRegistrationHD10180C; +import gtPlusPlus.xmod.galacticraft.system.hd10180.planets.c.dim.WorldProviderHD10180C; +import gtPlusPlus.xmod.galacticraft.system.hd10180.planets.d.blocks.BlockRegistrationHD10180D; +import gtPlusPlus.xmod.galacticraft.system.hd10180.planets.d.dim.WorldProviderHD10180D; import gtPlusPlus.xmod.galacticraft.system.objects.BiomeSettings; import gtPlusPlus.xmod.galacticraft.system.objects.DimensionSettings; import gtPlusPlus.xmod.galacticraft.system.objects.PlanetGenerator; @@ -26,15 +31,28 @@ public class SystemHD10180 extends BaseSolarSystem { @Override public void initSolarSystem() { //Lets pick a nice place - SolarSystem aSystemHD10180 = createSolarSystem(mSystemName, "hydrus", new Vector3(2.0D, -1.0D, 2.0D)); + SolarSystem aSystemHD10180 = createSolarSystem(mSystemName, "milkyWay", new Vector3(-1.2D, 0.0D, 0.0D)); this.registerSolarSystem(aSystemHD10180); //turn the lights on - Star aMainStar = this.createStar(mSystemName+"-A", -1); + Star aMainStar = this.createStar(mSystemName+"-A",3); this.setMainStarForSolarSystem(aMainStar); + //Planet B - PlanetGenerator B = this.createPlanet(mSystemName+"-B", new float[] {0.2f, 0.2f, 0.2f}, 3.1415927F, 1f, 2f, 11.861994F, new BlockRegistrationHD10180B()); - DimensionSettings Planet_B_Settings = new DimensionSettings(B, BasicChunkProviderGalactic.class, 5, true, 1, false, 240f, 0.1f, 0.2f, false, 48000L); + PlanetGenerator B = this.createPlanet(mSystemName+"-B", 5, new float[] {0.2f, 0.2f, 0.2f}, CORE.PI/2, 0.3f, 0.3f, 0.24096386F, new BlockRegistrationHD10180B()); + DimensionSettings Planet_B_Settings = new DimensionSettings(B, BasicChunkProviderGalactic.class, 5, false, 1, false, 240f, 0.1f, 0.2f, false, 12000L); BiomeSettings Planet_B_Biome = new BiomeSettings(mSystemName+"-B", 255, 0.1f, 0.2f); - this.registerPlanet(new WorldProviderHD10180B(new WorldProviderSettings(Planet_B_Settings, Planet_B_Biome)).getDim()); + this.registerPlanet(new WorldProviderHD10180B(new WorldProviderSettings(Planet_B_Settings, Planet_B_Biome)).getDim()); + + //Planet C + PlanetGenerator C = this.createPlanet(mSystemName+"-C", 4, new float[] {0.2f, 0.2f, 0.8f}, CORE.PI/2+0.45f, 0.5f, 0.5f, 2.861994F, new BlockRegistrationHD10180C()); + DimensionSettings Planet_C_Settings = new DimensionSettings(C, BasicChunkProviderGalactic.class, 4, true, 1, false, 120f, 2f, 2f, false, 24000L); + BiomeSettings Planet_C_Biome = new BiomeSettings(mSystemName+"-C", 255, 0.1f, 0.5f); + this.registerPlanet(new WorldProviderHD10180C(new WorldProviderSettings(Planet_C_Settings, Planet_C_Biome)).getDim()); + + //Planet D + PlanetGenerator D = this.createPlanet(mSystemName+"-D", 3, new float[] {0.2f, 0.2f, 0.2f}, CORE.PI-0.55f, 1.2f, 1.2f, 16.861994F, new BlockRegistrationHD10180D()); + DimensionSettings Planet_D_Settings = new DimensionSettings(D, BasicChunkProviderGalactic.class, 3, true, 1, false, 240f, 1f, 0.0f, false, 48000L); + BiomeSettings Planet_D_Biome = new BiomeSettings(mSystemName+"-D", 255, 0.2f, 0.4f); + this.registerPlanet(new WorldProviderHD10180D(new WorldProviderSettings(Planet_D_Settings, Planet_D_Biome)).getDim()); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/c/blocks/BlockRegistrationHD10180C.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/c/blocks/BlockRegistrationHD10180C.java new file mode 100644 index 0000000000..8cf401be40 --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/c/blocks/BlockRegistrationHD10180C.java @@ -0,0 +1,62 @@ +package gtPlusPlus.xmod.galacticraft.system.hd10180.planets.c.blocks; + +import java.util.LinkedHashMap; +import java.util.Map; + +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.xmod.galacticraft.system.objects.IPlanetBlockRegister; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; + +public class BlockRegistrationHD10180C implements IPlanetBlockRegister { + + private Map mBlocks = new LinkedHashMap(); + private static AutoMap mBlocksToRegister = new AutoMap(); + + public static void initialize() { + //mBlocksToRegister.put(new TCetiEBlocks()); + //mBlocksToRegister.put(new TCetiEBlockDandelions()); + } + + @Override + public Map getBlocks() { + return mBlocks; + } + + @Override + public Block getTopLayer() { + return mBlocks.get(0); + } + + @Override + public Block getSoil() { + return mBlocks.get(1); + } + + @Override + public Block getSoil2() { + return mBlocks.get(2); + } + + @Override + public Block getStone() { + return mBlocks.get(3); + } + + @Override + public Block getWaterBlock() { + return mBlocks.get(4); + } + + @Override + public void register() { + //Register Blocks, Add to List + mBlocks.put(0, Blocks.grass); + mBlocks.put(1, Blocks.dirt); + mBlocks.put(2, Blocks.gravel); + mBlocks.put(3, Blocks.stone); + mBlocks.put(4, Blocks.lava); + + } + +} diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/c/dim/WorldProviderHD10180C.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/c/dim/WorldProviderHD10180C.java new file mode 100644 index 0000000000..05d2a7155d --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/c/dim/WorldProviderHD10180C.java @@ -0,0 +1,13 @@ +package gtPlusPlus.xmod.galacticraft.system.hd10180.planets.c.dim; + +import gtPlusPlus.xmod.galacticraft.system.core.dim.BaseWorldProviderGalactic; +import gtPlusPlus.xmod.galacticraft.system.objects.WorldProviderSettings; + +public class WorldProviderHD10180C extends BaseWorldProviderGalactic { + + public WorldProviderHD10180C(WorldProviderSettings b) { + super(b); + } + + +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/d/blocks/BlockRegistrationHD10180D.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/d/blocks/BlockRegistrationHD10180D.java new file mode 100644 index 0000000000..e577d2bf6f --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/d/blocks/BlockRegistrationHD10180D.java @@ -0,0 +1,62 @@ +package gtPlusPlus.xmod.galacticraft.system.hd10180.planets.d.blocks; + +import java.util.LinkedHashMap; +import java.util.Map; + +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.xmod.galacticraft.system.objects.IPlanetBlockRegister; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; + +public class BlockRegistrationHD10180D implements IPlanetBlockRegister { + + private Map mBlocks = new LinkedHashMap(); + private static AutoMap mBlocksToRegister = new AutoMap(); + + public static void initialize() { + //mBlocksToRegister.put(new TCetiEBlocks()); + //mBlocksToRegister.put(new TCetiEBlockDandelions()); + } + + @Override + public Map getBlocks() { + return mBlocks; + } + + @Override + public Block getTopLayer() { + return mBlocks.get(0); + } + + @Override + public Block getSoil() { + return mBlocks.get(1); + } + + @Override + public Block getSoil2() { + return mBlocks.get(2); + } + + @Override + public Block getStone() { + return mBlocks.get(3); + } + + @Override + public Block getWaterBlock() { + return mBlocks.get(4); + } + + @Override + public void register() { + //Register Blocks, Add to List + mBlocks.put(0, Blocks.grass); + mBlocks.put(1, Blocks.dirt); + mBlocks.put(2, Blocks.gravel); + mBlocks.put(3, Blocks.stone); + mBlocks.put(4, Blocks.lava); + + } + +} diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/d/dim/WorldProviderHD10180D.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/d/dim/WorldProviderHD10180D.java new file mode 100644 index 0000000000..67bb43369d --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/d/dim/WorldProviderHD10180D.java @@ -0,0 +1,13 @@ +package gtPlusPlus.xmod.galacticraft.system.hd10180.planets.d.dim; + +import gtPlusPlus.xmod.galacticraft.system.core.dim.BaseWorldProviderGalactic; +import gtPlusPlus.xmod.galacticraft.system.objects.WorldProviderSettings; + +public class WorldProviderHD10180D extends BaseWorldProviderGalactic { + + public WorldProviderHD10180D(WorldProviderSettings b) { + super(b); + } + + +} \ No newline at end of file -- cgit