From 7268dadb3243f68fcb3ae4bf5e4376223470d780 Mon Sep 17 00:00:00 2001 From: ROMVoid95 Date: Sun, 13 Sep 2020 11:16:28 -0500 Subject: [PATCH] Update somet stuff --- .idea/compiler.xml | 17 - .idea/gradle.xml | 20 - .idea/jarRepositories.xml | 70 --- .idea/misc.xml | 8 - .idea/vcs.xml | 6 - .idea/workspace.xml | 338 -------------- .../romvoid95/api/event/ExoStormEvent.java | 2 +- .../net/romvoid95/api/math/Conversion.java | 33 ++ .../java/net/romvoid95/api/math/Vect3.java | 57 +++ .../net/romvoid95/api/math/package-info.java | 1 + .../net/romvoid95/api/space/AstroBuilder.java | 422 ------------------ .../romvoid95/api/space/PlanetConstants.java | 73 ++- .../net/romvoid95/api/space/Universe.java | 50 +-- .../api/space/interfaces/IExoSystem.java | 9 + .../api/space/interfaces/package-info.java | 1 - .../romvoid95/api/space/objects/ExoStar.java | 40 -- .../romvoid95/api/space/prefab/ExoSystem.java | 35 ++ .../api/space/stellarmathmatics/Vec3.java | 5 + .../romvoid95/api/world/ExoWorldProvider.java | 21 +- .../net/romvoid95/api/world/IExoProvider.java | 31 ++ .../world/{ => weather}/CloudProvider.java | 3 +- .../world/{ => weather}/IClimateProvider.java | 2 +- .../world/{ => weather}/ICloudProvider.java | 2 +- .../world/{ => weather}/IStormProvider.java | 6 +- .../api/world/weather/Lightning.java | 116 +++++ .../world/{ => weather}/StormProvider.java | 24 +- .../net/romvoid95/client/ExoClientProxy.java | 6 +- .../client/event/ClientEventHandler.java | 38 +- .../net/romvoid95/client/model/ModelUtil.java | 2 +- .../trappist1/d/SkyProviderTrappist1D.java | 8 + .../trappist1/d/WorldProviderTrappist1D.java | 35 +- .../trappist1/d/biomes/BiomeOceananic.java | 21 +- .../trappist1/d/biomes/Trap1D_Island.java | 23 +- .../d/client/CloudProviderTrappist1D.java | 5 +- .../trappist1/d/client/Lightning.java | 8 +- .../d/client/StormProviderTrappist1D.java | 4 +- .../d/client/TickHandlerClientTrappistD.java | 78 ++-- .../trappist1/e/StormProviderTrappist1E.java | 2 +- .../trappist1/e/WorldProviderTrappist1E.java | 6 +- .../integration/jei/ExoplanetsPlugin.java | 25 +- .../core/initialization/ExoBlocks.java | 1 - .../core/initialization/ExoDimensions.java | 26 +- .../core/initialization/Planets.java | 46 +- .../core/initialization/SolarSystems.java | 57 +-- .../models/block/kepler_surface2.json | 3 +- .../exoplanets/models/item/meteor_ore.json | 6 - .../exoplanets/models/item/tungsten_ore.json | 3 + ...verlay_aluminium.png => aluminium_ore.png} | Bin .../{overlay_copper.png => copper_ore.png} | Bin .../ores/{overlay_lead.png => lead_ore.png} | Bin .../{overlay_nickel.png => nickel_ore.png} | Bin ...{overlay_platnium.png => platinum_ore.png} | Bin .../textures/blocks/ores/silver_ore.png | Bin 0 -> 2478 bytes .../ores/{overlay_tin.png => tin_ore.png} | Bin ...{overlay_titanium.png => titanium_ore.png} | Bin ...{overlay_tungsten.png => tungsten_ore.png} | Bin .../ores/{overlay_zinc.png => zinc_ore.png} | Bin .../net/romvoid95/exoplanets/MathTests.java | 63 +++ test/net/romvoid95/exoplanets/MathTests.class | Bin 0 -> 1310 bytes 59 files changed, 635 insertions(+), 1223 deletions(-) delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml create mode 100644 src/main/java/net/romvoid95/api/math/Conversion.java create mode 100644 src/main/java/net/romvoid95/api/math/Vect3.java create mode 100644 src/main/java/net/romvoid95/api/math/package-info.java delete mode 100644 src/main/java/net/romvoid95/api/space/AstroBuilder.java create mode 100644 src/main/java/net/romvoid95/api/space/interfaces/IExoSystem.java delete mode 100644 src/main/java/net/romvoid95/api/space/interfaces/package-info.java delete mode 100644 src/main/java/net/romvoid95/api/space/objects/ExoStar.java create mode 100644 src/main/java/net/romvoid95/api/space/prefab/ExoSystem.java create mode 100644 src/main/java/net/romvoid95/api/space/stellarmathmatics/Vec3.java create mode 100644 src/main/java/net/romvoid95/api/world/IExoProvider.java rename src/main/java/net/romvoid95/api/world/{ => weather}/CloudProvider.java (99%) rename src/main/java/net/romvoid95/api/world/{ => weather}/IClimateProvider.java (75%) rename src/main/java/net/romvoid95/api/world/{ => weather}/ICloudProvider.java (96%) rename src/main/java/net/romvoid95/api/world/{ => weather}/IStormProvider.java (89%) create mode 100644 src/main/java/net/romvoid95/api/world/weather/Lightning.java rename src/main/java/net/romvoid95/api/world/{ => weather}/StormProvider.java (96%) delete mode 100644 src/main/resources/assets/exoplanets/models/item/meteor_ore.json create mode 100644 src/main/resources/assets/exoplanets/models/item/tungsten_ore.json rename src/main/resources/assets/exoplanets/textures/blocks/ores/{overlay_aluminium.png => aluminium_ore.png} (100%) rename src/main/resources/assets/exoplanets/textures/blocks/ores/{overlay_copper.png => copper_ore.png} (100%) rename src/main/resources/assets/exoplanets/textures/blocks/ores/{overlay_lead.png => lead_ore.png} (100%) rename src/main/resources/assets/exoplanets/textures/blocks/ores/{overlay_nickel.png => nickel_ore.png} (100%) rename src/main/resources/assets/exoplanets/textures/blocks/ores/{overlay_platnium.png => platinum_ore.png} (100%) create mode 100644 src/main/resources/assets/exoplanets/textures/blocks/ores/silver_ore.png rename src/main/resources/assets/exoplanets/textures/blocks/ores/{overlay_tin.png => tin_ore.png} (100%) rename src/main/resources/assets/exoplanets/textures/blocks/ores/{overlay_titanium.png => titanium_ore.png} (100%) rename src/main/resources/assets/exoplanets/textures/blocks/ores/{overlay_tungsten.png => tungsten_ore.png} (100%) rename src/main/resources/assets/exoplanets/textures/blocks/ores/{overlay_zinc.png => zinc_ore.png} (100%) create mode 100644 src/test/java/net/romvoid95/exoplanets/MathTests.java create mode 100644 test/net/romvoid95/exoplanets/MathTests.class diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 60edd02..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 213e9f6..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 8ffec79..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index c3df5ec..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 2027e35..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,338 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - true - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - 1597094615098 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/net/romvoid95/api/event/ExoStormEvent.java b/src/main/java/net/romvoid95/api/event/ExoStormEvent.java index b0f5503..96dbb9e 100644 --- a/src/main/java/net/romvoid95/api/event/ExoStormEvent.java +++ b/src/main/java/net/romvoid95/api/event/ExoStormEvent.java @@ -3,7 +3,7 @@ import net.minecraft.world.WorldProvider; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; -import net.romvoid95.api.world.StormProvider; +import net.romvoid95.api.world.weather.StormProvider; /** * Event is thrown when a StormProvider is set to execute diff --git a/src/main/java/net/romvoid95/api/math/Conversion.java b/src/main/java/net/romvoid95/api/math/Conversion.java new file mode 100644 index 0000000..dc7f9a6 --- /dev/null +++ b/src/main/java/net/romvoid95/api/math/Conversion.java @@ -0,0 +1,33 @@ +package net.romvoid95.api.math; + +public class Conversion { + + //// Fahrenheit -> Celcius //// + + public static double toCelciusDouble (double fahrenheit) { + return calculateFah2Cel(fahrenheit); + } + + public static int toCelciusInt (double fahrenheit) { + return (int) calculateFah2Cel(fahrenheit); + } + + //// Celcius -> Fahrenheit //// + + public static double toFahrenheit (double celcius) { + return toFahrenheit((int) celcius); + } + + public static double toFahrenheit (int celcius) { + return calculateCel2Feh(celcius); + } + + private static int calculateFah2Cel (double fahrenheit) { + return (int) ((fahrenheit - 32) / 1.8000); + } + + private static double calculateCel2Feh (int celcius) { + return (celcius * 1.8000 + 32.00); + } + +} diff --git a/src/main/java/net/romvoid95/api/math/Vect3.java b/src/main/java/net/romvoid95/api/math/Vect3.java new file mode 100644 index 0000000..ea36a04 --- /dev/null +++ b/src/main/java/net/romvoid95/api/math/Vect3.java @@ -0,0 +1,57 @@ +package net.romvoid95.api.math; + +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.entity.Entity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.romvoid95.client.RGB; + +public class Vect3 extends Vector3 { + + public double x; + public double y; + public double z; + + public Vect3(double x, double y, double z) { + this.x = x; + this.y = y; + this.y = y; + } + + public Vect3(Vector3 vector3) { + new Vect3(vector3.x, vector3.y, vector3.z); + } + + public Vect3() { + this(0, 0, 0); + } + + public Vect3(Vect3 vector) { + this(vector.x, vector.y, vector.z); + } + + public Vect3(double amount) { + this(amount, amount, amount); + } + + public Vect3(Entity par1) { + this(par1.posX, par1.posY, par1.posZ); + } + + public Vect3(BlockPos pos) { + this(pos.getX(), pos.getY(), pos.getZ()); + } + + public Vect3(TileEntity par1) { + this(par1.getPos()); + } + + @SideOnly(Side.CLIENT) + public BufferBuilder toPos (BufferBuilder b, Vect3 v, RGB c) { + return b.pos(v.x, v.y, v.z).color(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha()); + } + +} diff --git a/src/main/java/net/romvoid95/api/math/package-info.java b/src/main/java/net/romvoid95/api/math/package-info.java new file mode 100644 index 0000000..6200ddc --- /dev/null +++ b/src/main/java/net/romvoid95/api/math/package-info.java @@ -0,0 +1 @@ +package net.romvoid95.api.math; \ No newline at end of file diff --git a/src/main/java/net/romvoid95/api/space/AstroBuilder.java b/src/main/java/net/romvoid95/api/space/AstroBuilder.java deleted file mode 100644 index eb1c3b4..0000000 --- a/src/main/java/net/romvoid95/api/space/AstroBuilder.java +++ /dev/null @@ -1,422 +0,0 @@ -/** - * Copyright (C) 2020 Interstellar: Exoplanets -<<<<<<< HEAD - * -======= - * ->>>>>>> parent of c40ce9e... uhg - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. -<<<<<<< HEAD - * -======= - * ->>>>>>> parent of c40ce9e... uhg - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. -<<<<<<< HEAD - * -======= - * ->>>>>>> parent of c40ce9e... uhg - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.romvoid95.api.space; - -import javax.annotation.Nullable; - -import asmodeuscore.api.dimension.IAdvancedSpace.ClassBody; -import asmodeuscore.core.astronomy.BodiesRegistry; -import asmodeuscore.core.prefab.celestialbody.ExPlanet; -import micdoodle8.mods.galacticraft.api.GalacticraftRegistry; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody.ScalableDistance; -import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry; -import micdoodle8.mods.galacticraft.api.galaxies.Moon; -import micdoodle8.mods.galacticraft.api.galaxies.Planet; -import micdoodle8.mods.galacticraft.api.galaxies.Satellite; -import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.api.world.AtmosphereInfo; -import micdoodle8.mods.galacticraft.api.world.EnumAtmosphericGas; -import micdoodle8.mods.galacticraft.api.world.ITeleportType; -import micdoodle8.mods.galacticraft.core.world.gen.BiomeOrbit; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.WorldProvider; -import net.minecraft.world.biome.Biome; -import net.romvoid95.api.space.prefab.ExoStar; -import net.romvoid95.client.Assets; -import net.romvoid95.common.config.SConfigCore; - -@Deprecated -public class AstroBuilder { - - public static final boolean REALISM = SConfigCore.enableRealism; - - /** The modid. */ - private String modid; - - /** - * Instantiates a new astro builder. - */ - public AstroBuilder() { - super(); - } - - /** - * Instantiates a new astro builder. - * - * @param modid the modid - */ - public AstroBuilder(String modid) { - super(); - this.setModid(modid); - } - - /** - * Gets the modid. - * - * @return the modid - */ - public String getModid () { - return modid; - } - - /** - * Sets the modid. - * - * @param modid set modid - */ - public void setModid (String modid) { - this.modid = modid; - } - - /** - * Builds the exo star. - * - * @param starName the star name - * @param temp the temp - * @param mass the mass - * @param radius the radius - * @return the exo star - */ - public ExoStar buildExoStar (String starName, int temp, double mass, double radius) { - ExoStar star = new ExoStar(starName); - star.setStarName(starName); - star.setSurfaceTemp(temp); - star.setStarMass(mass); - star.setStarRadius(radius); - star.setSpectralClass(); - return star; - } - - /** - * Builds the solar system. - * - * @param name the name - * @param galaxy the galaxy - * @param pos the pos - * @param exoStar the exo star - * @return the solar system - */ - public SolarSystem buildSolarSystem (String name, Vector3 pos, ExoStar exoStar) { - SolarSystem body = new SolarSystem(name, "milky_way"); - body.setMapPosition(new Vector3(pos)); - exoStar.setParentSolarSystem(body); - body.setMainStar(exoStar); - exoStar.setBodyIcon(Assets.getCelestialTexture(exoStar.getName())); - - return body; - } - - public ExoPlanet buildExoPlanet (SolarSystem system, String name, Class provider, int dimID, int tier, float phase, float distance) { - ExoPlanet body = (ExoPlanet) new ExoPlanet(name).setParentSolarSystem(system); - body.setPhaseShift(phase); - body.setRingColorRGB(0.1F, 0.9F, 2.6F); - body.setRelativeSize(1.0F); - body.setBodyIcon(Assets.getCelestialTexture(name)); - body.addChecklistKeys("equipOxygenSuit"); - return body; - } - - /** - * Builds the exo planet. - * - * @param system the system - * @param name the name - * @param provider the provider - * @param dimID the dim ID - * @param tier the tier - * @param phase the phase - * @return the exo planet - */ - // public ExoPlanet buildExoPlanet (SolarSystem system, String name, float distance) { - // ExoPlanet body = (ExoPlanet) new ExoPlanet(name).setParentSolarSystem(system); - // body.setRelativeSize(1.0F); - // registerExPlanet(system, name, distance); - // body.addChecklistKeys("equipOxygenSuit"); - // return body; - // } - - public static ExPlanet registerExPlanet (SolarSystem system, String name, float distancefromcenter, ClassBody clazz) { - ExPlanet body = new ExPlanet(name).setParentSolarSystem(system); - body.setClassPlanet(clazz); - body.setRingColorRGB(0.0F, 0.4F, 0.9F); - body.setRelativeDistanceFromCenter(new CelestialBody.ScalableDistance(distancefromcenter, distancefromcenter)); - body.setBodyIcon(Assets.getCelestialTexture(name)); - - return body; - } - - /** - * Sets the biomes. - * - * @param body the body - * @param biomes the biomes - */ - public void setBiomes (CelestialBody body, Biome... biomes) { - body.setBiomeInfo(biomes); - } - - /** - * Sets the atmos. - * - * @param body the body - * @param gasses the gasses - */ - public void setAtmos (CelestialBody body, EnumAtmosphericGas... gasses) { - ((ExoPlanet) body).setAtmosGasses(gasses); - } - - public static void setAtmosphere (CelestialBody body, EnumAtmosphericGas... gasses) { - boolean canBreathe = false; - boolean canRain = false; - boolean isCorr = false; - float d = 0.0f; - for (EnumAtmosphericGas enumAtmosphericGas : gasses) { - d++; - body.atmosphereComponent(enumAtmosphericGas); - if (enumAtmosphericGas == EnumAtmosphericGas.OXYGEN) - canBreathe = true; - if (enumAtmosphericGas == EnumAtmosphericGas.CO2) - canRain = true; - if (enumAtmosphericGas == EnumAtmosphericGas.METHANE) - isCorr = true; - } - body.setAtmosphere(new AtmosphereInfo(canBreathe, canRain, isCorr, 0.0F, 0.0F, d)); - } - - /** - * Sets the data. - * - * @param body the body - * @param clazz the clazz - * @param distance the distance - * @param gravity the gravity - * @param orbit the orbit - * @param pressure the pressure - * @param day the day - */ - public void setData (CelestialBody body, ClassBody clazz, float distance, float gravity, float orbit, int pressure, long day) { - ((ExoPlanet) body).setClassBody(clazz); - body.setRelativeDistanceFromCenter(new ScalableDistance(distance, distance)); - body.setRelativeOrbitTime(orbit); - body.setRingColorRGB(0.0F, 0.4F, 0.9F); - ((ExoPlanet) body).setPlanetGravity(gravity); - ((ExoPlanet) body).setAtmosphericPressure(pressure); - BodiesRegistry.setPlanetData(body, 0, day, BodiesRegistry.calculateGravity(gravity), false); - - } - - /** - * Sets the exo data. - * - * @param body the body - * @param temp the temp - * @param mass the mass - * @param radius the radius - */ - public void setExoData (CelestialBody body, float temp, float mass, float radius) { - ((ExoPlanet) body).setPlanetTemp(temp); - ((ExoPlanet) body).setPlanetMass(mass); - ((ExoPlanet) body).setPlanetRadius(radius); - } - - /** - * Sets the normal orbit. - * - * @param body the new normal orbit - */ - public void setNormalOrbit (CelestialBody body) { - BodiesRegistry.setOrbitData(body, body.getPhaseShift(), 1.0f, body.getRelativeOrbitTime()); - - } - - /** - * Sets the orbit. - * - * @param body the body - * @param eccentricityX the eccentricity X - * @param eccentricityY the eccentricity Y - * @param orbitOffsetX the orbit offset X - * @param orbitOffsetY the orbit offset Y - */ - public void setOrbit (CelestialBody body, float eccentricityX, float eccentricityY, float orbitOffsetX, float orbitOffsetY) { - ((ExoPlanet) body).setOrbitEccentricity(eccentricityY, orbitOffsetX); - ((ExoPlanet) body).setOrbitOffset(orbitOffsetX, orbitOffsetY); - BodiesRegistry.setOrbitData(body, body.getPhaseShift(), 1.0f, body - .getRelativeOrbitTime(), eccentricityX, eccentricityY, orbitOffsetX, orbitOffsetY); - - } - - /** - * builds SpaceStation. - * - * @param parent the parent - * @param color the color - * @param provider the provider - * @param dimID the dim ID - * @param dimIDStatic the dim ID static - * @param phase the phase - * @param size the size - * @param distancefromcenter the distancefromcenter - * @param relativetime the relativetime - * @param customStationIcon the custom station icon - * @param bodyIcon the body icon - * @return the satellite - */ - public Satellite buildSpaceStation (Planet parent, String color, Class provider, int dimID, int dimIDStatic, float phase, float size, float distancefromcenter, float relativetime, boolean customStationIcon, @Nullable String bodyIcon) { - Satellite body = new Satellite("spacestation." + parent.getUnlocalizedName().replace("planet.", "")); - body.setParentBody(parent); - body.setRelativeOrbitTime(relativetime); - body.setPhaseShift(phase); - body.setRelativeSize(size); - if (customStationIcon) { - body.setBodyIcon(new ResourceLocation(getModid(), "textures/celestialbodies/spacestations/" + bodyIcon - + ".png")); - } - else { - body.setBodyIcon(new ResourceLocation("galacticraftcore:textures/gui/celestialbodies/space_station.png")); - } - if (provider != null) { - body.setTierRequired(parent.getTierRequirement()); - body.setDimensionInfo(dimID, dimIDStatic, provider); - body.setBiomeInfo(new Biome[] { BiomeOrbit.space }); - } - return body; - } - - public Moon buildMoon (Planet parent, String name, int dimID, float size, float distancefromcenter, float relativetime) { - Moon body = (new Moon(name)).setParentPlanet(parent); - body.setRingColorRGB(0.8F, 0.0F, 0.0F); - body.setRelativeSize(size); - body.setRelativeDistanceFromCenter(new CelestialBody.ScalableDistance(distancefromcenter, distancefromcenter)); - body.setRelativeOrbitTime(relativetime); - body.setBodyIcon(new ResourceLocation(getModid(), "textures/celestialbodies/moons/space_station.png")); - GalaxyRegistry.registerMoon(body); - return body; - } - - /** - * Builds unreachable planet. - * - * @param planetName the planet name - * @param solarSystem the solar system - * @param randomPhase the random phase - * @param au the au - * @return the planet - */ - public ExoPlanet buildSpecialUnreachable (String planetName, SolarSystem solarSystem, float randomPhase, float au) { - ExoPlanet unreachable = (ExoPlanet) new ExoPlanet(planetName).setParentSolarSystem(solarSystem); - unreachable.setDistanceFromCenter(au); - unreachable.setPhaseShift(randomPhase); - unreachable.setRelativeSize(1.0F); - GalaxyRegistry.registerPlanet(unreachable); - return unreachable; - } - - /** - * Builds unreachable planet. - * - * @param planetName the planet name - * @param solarSystem the solar system - * @param randomPhase the random phase - * @param au the au - * @return the planet - */ - public ExoPlanet buildUnreachablePlanet (String planetName, SolarSystem solarSystem, float randomPhase) { - ExoPlanet unreachable = (ExoPlanet) new ExoPlanet(planetName).setParentSolarSystem(solarSystem); - unreachable.setBodyIcon(Assets.getCelestialTexture(planetName)); - unreachable.setPhaseShift(randomPhase); - unreachable.setRelativeSize(1.0F); - unreachable.setRingColorRGB(0.8F, 0.0F, 0.0F); - GalaxyRegistry.registerPlanet(unreachable); - return unreachable; - } - - /** - * Register solar system. - * - * @param solarSystem the solar system - */ - public void registerSolarSystem (SolarSystem solarSystem) { - GalaxyRegistry.registerSolarSystem(solarSystem); - } - - /** - * Register planet. - * - * @param planet the planet - */ - public void registerPlanet (Planet planet) { - GalaxyRegistry.registerPlanet(planet); - } - - /** - * Register moon. - * - * @param moon the moon - */ - public void registerMoon (Moon moon) { - GalaxyRegistry.registerMoon(moon); - } - - public void register (Object val) { - if (val instanceof SolarSystem) { - GalaxyRegistry.registerSolarSystem((SolarSystem) val); - } - if (val instanceof Planet) { - GalaxyRegistry.registerPlanet((Planet) val); - } - if (val instanceof Moon) { - GalaxyRegistry.registerMoon((Moon) val); - } - } - - /** - * Register teleport type. - * - * @param clazz the clazz - * @param type the type - */ - public void registerTeleportType (Class clazz, ITeleportType type) { - GalacticraftRegistry.registerTeleportType(clazz, type); - } - - /** - * Register rocket gui. - * - * @param clazz the clazz - * @param resource the resource - */ - public void registerRocketGui (Class clazz, String resource) { - GalacticraftRegistry.registerRocketGui(clazz, new ResourceLocation(getModid() + ":textures/gui/rocket/" - + resource + ".png")); - } -} diff --git a/src/main/java/net/romvoid95/api/space/PlanetConstants.java b/src/main/java/net/romvoid95/api/space/PlanetConstants.java index 6249aaa..de8b317 100644 --- a/src/main/java/net/romvoid95/api/space/PlanetConstants.java +++ b/src/main/java/net/romvoid95/api/space/PlanetConstants.java @@ -8,27 +8,56 @@ @UtilityClass public final class PlanetConstants { - // KEPLER 1649 AU - public static final float KEPLER_B = 0.4F; - public static final float KEPLER_C = 0.8F; - - // TRAPPIST 1 AU - public static final float TRAPPIST_B = 0.3F; - public static final float TRAPPIST_C = 0.4F; - public static final float TRAPPIST_D = 0.6F; - public static final float TRAPPIST_E = 0.8F; - public static final float TRAPPIST_F = 1.0F; - public static final float TRAPPIST_G = 1.2F; - public static final float TRAPPIST_H = 1.6F; - - // WOLF 1061 AU - public static final float WOLF_B = 0.3F; - public static final float WOLF_C = 0.6F; - public static final float WOLF_D = 2.5F; - - // YZ CETI AU - public static final float CETI_B = 0.3F; - public static final float CETI_C = 0.4F; - public static final float CETI_D = 0.590F; + @UtilityClass + public static final class AU { + // KEPLER 1649 + public static final float KEPLER_B_AU = 0.4F; + public static final float KEPLER_C_AU = 0.8F; + + // TRAPPIST 1 + public static final float TRAPPIST_B_AU = 0.3F; + public static final float TRAPPIST_C_AU = 0.4F; + public static final float TRAPPIST_D_AU = 0.6F; + public static final float TRAPPIST_E_AU = 0.8F; + public static final float TRAPPIST_F_AU = 1.0F; + public static final float TRAPPIST_G_AU = 1.2F; + public static final float TRAPPIST_H_AU = 1.6F; + + // WOLF 1061 + public static final float WOLF_B_AU = 0.3F; + public static final float WOLF_C_AU = 0.6F; + public static final float WOLF_D_AU = 2.5F; + + // YZ CETI + public static final float CETI_B_AU = 0.3F; + public static final float CETI_C_AU = 0.4F; + public static final float CETI_D_AU = 0.590F; + } + + @UtilityClass + public static final class Orbit { + // KEPLER 1649 + public static final float KEPLER_B_ORBIT = 0.4F; + public static final float KEPLER_C_ORBIT = 0.8F; + + // TRAPPIST 1 AU + public static final float TRAPPIST_B_ORBIT = 0.3F; + public static final float TRAPPIST_C_ORBIT = 0.4F; + public static final float TRAPPIST_D_ORBIT = 0.6F; + public static final float TRAPPIST_E_ORBIT = 0.8F; + public static final float TRAPPIST_F_ORBIT = 1.0F; + public static final float TRAPPIST_G_ORBIT = 1.2F; + public static final float TRAPPIST_H_ORBIT = 1.6F; + + // WOLF 1061 AU + public static final float WOLF_B_ORBIT = 0.3F; + public static final float WOLF_C_ORBIT = 0.6F; + public static final float WOLF_D_ORBIT = 2.5F; + + // YZ CETI AU + public static final float CETI_B_ORBIT = 0.3F; + public static final float CETI_C_ORBIT = 0.4F; + public static final float CETI_D_ORBIT = 0.590F; + } } diff --git a/src/main/java/net/romvoid95/api/space/Universe.java b/src/main/java/net/romvoid95/api/space/Universe.java index 8d4443a..e8dac72 100644 --- a/src/main/java/net/romvoid95/api/space/Universe.java +++ b/src/main/java/net/romvoid95/api/space/Universe.java @@ -10,7 +10,6 @@ import micdoodle8.mods.galacticraft.api.galaxies.Planet; import micdoodle8.mods.galacticraft.api.galaxies.Satellite; import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem; -import micdoodle8.mods.galacticraft.api.galaxies.Star; import micdoodle8.mods.galacticraft.api.vector.Vector3; import micdoodle8.mods.galacticraft.api.world.AtmosphereInfo; import micdoodle8.mods.galacticraft.api.world.EnumAtmosphericGas; @@ -19,6 +18,7 @@ import net.minecraft.world.WorldProvider; import net.minecraft.world.biome.Biome; import net.romvoid95.api.space.prefab.ExoStar; +import net.romvoid95.api.space.prefab.ExoSystem; import net.romvoid95.client.Assets; import net.romvoid95.core.ExoInfo; @@ -52,8 +52,8 @@ public static ExoStar buildExoStar (String starName, int temp, double mass, doub * @param exoStar the exo star * @return the solar system */ - public static SolarSystem buildSolarSystem (String name, Vector3 pos, ExoStar exoStar) { - SolarSystem body = new SolarSystem(name, "milky_way"); + public static ExoSystem buildSolarSystem (String name, Vector3 pos, ExoStar exoStar) { + ExoSystem body = new ExoSystem(name, "milky_way"); body.setMapPosition(new Vector3(pos)); exoStar.setParentSolarSystem(body); body.setMainStar(exoStar); @@ -61,28 +61,7 @@ public static SolarSystem buildSolarSystem (String name, Vector3 pos, ExoStar ex return body; } - /** - * builds solar system. - * - * @param name the name - * @param galaxy the galaxy - * @param pos the pos - * @param starname the starname - * @param size the size - * @return the solar system - */ - public static SolarSystem buildSolarSystem (String name, String galaxy, Vector3 pos, String starname) { - SolarSystem body = new SolarSystem(name, galaxy); - body.setMapPosition(new Vector3(pos)); - Star main = new Star(starname); - main.setParentSolarSystem(body); - main.setBodyIcon(Assets.getCelestialTexture(starname)); - - body.setMainStar(main); - return body; - } - - public static ExoPlanet createPlanet (String name, SolarSystem solar, float phaseShift, float distance, float orbitTime, int tier) { + public static ExoPlanet planet (String name, SolarSystem solar, float phaseShift, float distance, float orbitTime, int tier) { ExoPlanet planet = (ExoPlanet) new ExoPlanet(name).setParentSolarSystem(solar); planet.setPhaseShift(phaseShift); planet.setRelativeDistanceFromCenter(new ScalableDistance(distance, distance)); @@ -95,6 +74,27 @@ public static ExoPlanet createPlanet (String name, SolarSystem solar, float phas return planet; } + /** + * Builds unreachable planet. + * + * @param planetName the planet name + * @param solarSystem the solar system + * @param randomPhase the random phase + * @param au the au + * @return the planet + */ + public static ExoPlanet unreachable (String planetName, SolarSystem solarSystem, float randomPhase, float distance, float orbitTime) { + ExoPlanet unreachable = (ExoPlanet) new ExoPlanet(planetName).setParentSolarSystem(solarSystem); + unreachable.setBodyIcon(Assets.getCelestialTexture(planetName)); + unreachable.setRelativeDistanceFromCenter(new ScalableDistance(distance, distance)); + unreachable.setRelativeOrbitTime(orbitTime); + unreachable.setPhaseShift(randomPhase); + unreachable.setRelativeSize(1.0F); + unreachable.setRingColorRGB(0.8F, 0.0F, 0.0F); + GalaxyRegistry.registerPlanet(unreachable); + return unreachable; + } + public static Moon createMoon (String name, Planet planet, float phaseShift, float distance, float orbitTime, float size, int tier, int id, Class provider) { Moon moon = new Moon(name).setParentPlanet(planet); moon.setDimensionInfo(id, provider); diff --git a/src/main/java/net/romvoid95/api/space/interfaces/IExoSystem.java b/src/main/java/net/romvoid95/api/space/interfaces/IExoSystem.java new file mode 100644 index 0000000..25bed3a --- /dev/null +++ b/src/main/java/net/romvoid95/api/space/interfaces/IExoSystem.java @@ -0,0 +1,9 @@ +package net.romvoid95.api.space.interfaces; + +public interface IExoSystem { + + public float getHabitableZoneStart (); + + public float getHabitableZoneEnd (); + +} diff --git a/src/main/java/net/romvoid95/api/space/interfaces/package-info.java b/src/main/java/net/romvoid95/api/space/interfaces/package-info.java deleted file mode 100644 index eac5efb..0000000 --- a/src/main/java/net/romvoid95/api/space/interfaces/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package net.romvoid95.api.space.interfaces; \ No newline at end of file diff --git a/src/main/java/net/romvoid95/api/space/objects/ExoStar.java b/src/main/java/net/romvoid95/api/space/objects/ExoStar.java deleted file mode 100644 index 8065551..0000000 --- a/src/main/java/net/romvoid95/api/space/objects/ExoStar.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.romvoid95.api.space.objects; - -import asmodeuscore.api.space.ICelestialRegistry; -import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem; -import micdoodle8.mods.galacticraft.api.galaxies.Star; - -public class ExoStar extends Star implements ICelestialRegistry { - - protected SolarSystem parentSolarSystem = null; - - public ExoStar(String starName) { - super(starName); - } - - @Override - public SolarSystem getParentSolarSystem () { - return this.parentSolarSystem; - } - - @Override - public int getID () { - return this.parentSolarSystem.getID(); - } - - @Override - public String getUnlocalizedNamePrefix () { - return "exostar"; - } - - @Override - public ExoStar setParentSolarSystem (SolarSystem galaxy) { - this.parentSolarSystem = galaxy; - return this; - } - - @Override - public boolean canRegistry () { - return true; - } -} diff --git a/src/main/java/net/romvoid95/api/space/prefab/ExoSystem.java b/src/main/java/net/romvoid95/api/space/prefab/ExoSystem.java new file mode 100644 index 0000000..17a3e00 --- /dev/null +++ b/src/main/java/net/romvoid95/api/space/prefab/ExoSystem.java @@ -0,0 +1,35 @@ +package net.romvoid95.api.space.prefab; + +import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem; +import net.romvoid95.api.space.interfaces.IExoSystem; + +public class ExoSystem extends SolarSystem implements IExoSystem { + + private float habitableZoneStart; + private float habitableZoneEnd; + + public ExoSystem(String solarSystem, String parentGalaxy) { + super(solarSystem, parentGalaxy); + } + + public ExoSystem setHabitableZoneStart (float start) { + this.habitableZoneStart = start; + return this; + } + + public ExoSystem setHabitableZoneEnd (float end) { + this.habitableZoneEnd = end; + return this; + } + + @Override + public float getHabitableZoneStart () { + return this.habitableZoneStart; + } + + @Override + public float getHabitableZoneEnd () { + return this.habitableZoneEnd; + } + +} diff --git a/src/main/java/net/romvoid95/api/space/stellarmathmatics/Vec3.java b/src/main/java/net/romvoid95/api/space/stellarmathmatics/Vec3.java new file mode 100644 index 0000000..eeb6df0 --- /dev/null +++ b/src/main/java/net/romvoid95/api/space/stellarmathmatics/Vec3.java @@ -0,0 +1,5 @@ +package net.romvoid95.api.space.stellarmathmatics; + +public class Vec3 { + +} diff --git a/src/main/java/net/romvoid95/api/world/ExoWorldProvider.java b/src/main/java/net/romvoid95/api/world/ExoWorldProvider.java index 5864ac0..231d4cd 100644 --- a/src/main/java/net/romvoid95/api/world/ExoWorldProvider.java +++ b/src/main/java/net/romvoid95/api/world/ExoWorldProvider.java @@ -1,35 +1,20 @@ package net.romvoid95.api.world; -import java.util.List; - import asmodeuscore.core.astronomy.dimension.world.worldengine.WE_WorldProviderSpace; -import net.minecraft.block.Block; import net.minecraft.util.ResourceLocation; -public abstract class ExoWorldProvider extends WE_WorldProviderSpace { +public abstract class ExoWorldProvider extends WE_WorldProviderSpace implements IExoProvider { @Override public int getDungeonSpacing () { + // TODO Auto-generated method stub return 0; } @Override public ResourceLocation getDungeonChestType () { - return null; - } - - @Override - public List getSurfaceBlocks () { + // TODO Auto-generated method stub return null; } } - -// @SideOnly(Side.CLIENT) -// public float getCloudHeight () { -// return 196.0F; -// } - -// @SideOnly(Side.CLIENT) -// public Vec3d getCloudColor (float partialTicks) { -// return new Vec3d(1.0D, 1.0D, 1.0D); diff --git a/src/main/java/net/romvoid95/api/world/IExoProvider.java b/src/main/java/net/romvoid95/api/world/IExoProvider.java new file mode 100644 index 0000000..691a172 --- /dev/null +++ b/src/main/java/net/romvoid95/api/world/IExoProvider.java @@ -0,0 +1,31 @@ +package net.romvoid95.api.world; + +import java.util.List; + +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import net.minecraft.block.Block; +import net.minecraft.util.ResourceLocation; + +public interface IExoProvider { + + public default Vector3 getFogColor () { + return new Vector3(); + } + + public default Vector3 getSkyColor () { + return new Vector3(); + } + + public default int getDungeonSpacing () { + return 0; + } + + public default ResourceLocation getDungeonChestType () { + return null; + } + + public default List getSurfaceBlocks () { + return null; + } + +} diff --git a/src/main/java/net/romvoid95/api/world/CloudProvider.java b/src/main/java/net/romvoid95/api/world/weather/CloudProvider.java similarity index 99% rename from src/main/java/net/romvoid95/api/world/CloudProvider.java rename to src/main/java/net/romvoid95/api/world/weather/CloudProvider.java index d23cee3..9e09ff6 100644 --- a/src/main/java/net/romvoid95/api/world/CloudProvider.java +++ b/src/main/java/net/romvoid95/api/world/weather/CloudProvider.java @@ -1,4 +1,4 @@ -package net.romvoid95.api.world; +package net.romvoid95.api.world.weather; import org.lwjgl.opengl.GL11; @@ -17,6 +17,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.romvoid95.api.world.ExoWorldProvider; import net.romvoid95.common.CommonUtil; @EventBusSubscriber diff --git a/src/main/java/net/romvoid95/api/world/IClimateProvider.java b/src/main/java/net/romvoid95/api/world/weather/IClimateProvider.java similarity index 75% rename from src/main/java/net/romvoid95/api/world/IClimateProvider.java rename to src/main/java/net/romvoid95/api/world/weather/IClimateProvider.java index 675affe..e29eebe 100644 --- a/src/main/java/net/romvoid95/api/world/IClimateProvider.java +++ b/src/main/java/net/romvoid95/api/world/weather/IClimateProvider.java @@ -1,4 +1,4 @@ -package net.romvoid95.api.world; +package net.romvoid95.api.world.weather; public interface IClimateProvider { diff --git a/src/main/java/net/romvoid95/api/world/ICloudProvider.java b/src/main/java/net/romvoid95/api/world/weather/ICloudProvider.java similarity index 96% rename from src/main/java/net/romvoid95/api/world/ICloudProvider.java rename to src/main/java/net/romvoid95/api/world/weather/ICloudProvider.java index 02e0aa7..b6aff31 100644 --- a/src/main/java/net/romvoid95/api/world/ICloudProvider.java +++ b/src/main/java/net/romvoid95/api/world/weather/ICloudProvider.java @@ -1,4 +1,4 @@ -package net.romvoid95.api.world; +package net.romvoid95.api.world.weather; import net.minecraft.client.Minecraft; import net.minecraft.world.World; diff --git a/src/main/java/net/romvoid95/api/world/IStormProvider.java b/src/main/java/net/romvoid95/api/world/weather/IStormProvider.java similarity index 89% rename from src/main/java/net/romvoid95/api/world/IStormProvider.java rename to src/main/java/net/romvoid95/api/world/weather/IStormProvider.java index 87bb090..3ca2556 100644 --- a/src/main/java/net/romvoid95/api/world/IStormProvider.java +++ b/src/main/java/net/romvoid95/api/world/weather/IStormProvider.java @@ -1,8 +1,9 @@ -package net.romvoid95.api.world; +package net.romvoid95.api.world.weather; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.init.SoundEvents; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import net.minecraft.world.WorldProvider; @@ -40,8 +41,7 @@ public interface IStormProvider { public Texture getStormTexture (World world, Biome biome); public default void spawnParticleOnGround (World world, double pX, double pY, double pZ) { - //if (useGroundParticle()) - //world.spawnParticle(EnumParticleTypes.WATER_SPLASH, pX, pY, pZ, 0.0D, 0.0D, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.DRIP_LAVA, pX, pY, pZ, 0.0D, 0.0D, 0.0D, new int[0]); } public default void playStormSound (World world, double x, double y, double z) { diff --git a/src/main/java/net/romvoid95/api/world/weather/Lightning.java b/src/main/java/net/romvoid95/api/world/weather/Lightning.java new file mode 100644 index 0000000..be3655e --- /dev/null +++ b/src/main/java/net/romvoid95/api/world/weather/Lightning.java @@ -0,0 +1,116 @@ +package net.romvoid95.api.world.weather; + +import java.util.Random; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; + +public class Lightning { + public static void renderBolt (long boltVertex, double x, double y, double z) { + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder worldrenderer = tessellator.getBuffer(); + GlStateManager.disableTexture2D(); + //GlStateManager.enableLighting(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + double[] adouble = new double[8]; + double[] adouble1 = new double[8]; + double d0 = 0.0D; + double d1 = 0.0D; + Random random = new Random(boltVertex); + + for (int i = 7; i >= 0; --i) { + adouble[i] = d0; + adouble1[i] = d1; + d0 += (double) (random.nextInt(11) - 5); + d1 += (double) (random.nextInt(11) - 5); + } + + for (int k1 = 0; k1 < 4; ++k1) { + Random random1 = new Random(boltVertex); + + for (int j = 0; j < 3; ++j) { + int k = 7; + int l = 0; + + if (j > 0) { + k = 7 - j; + } + + if (j > 0) { + l = k - 2; + } + + double d2 = adouble[k] - d0; + double d3 = adouble1[k] - d1; + + for (int i1 = k; i1 >= l; --i1) { + double d4 = d2; + double d5 = d3; + + if (j == 0) { + d2 += (double) (random1.nextInt(11) - 5); + d3 += (double) (random1.nextInt(11) - 5); + } + else { + d2 += (double) (random1.nextInt(31) - 15); + d3 += (double) (random1.nextInt(31) - 15); + } + + worldrenderer.begin(5, DefaultVertexFormats.POSITION_COLOR); + double d6 = 0.1D + (double) k1 * 0.2D; + + if (j == 0) { + d6 *= (double) i1 * 0.1D + 1.0D; + } + + double d7 = 0.1D + (double) k1 * 0.2D; + + if (j == 0) { + d7 *= (double) (i1 - 1) * 0.1D + 1.0D; + } + + for (int j1 = 0; j1 < 5; ++j1) { + double d8 = x + 0.5D - d6; + double d9 = z + 0.5D - d6; + + if (j1 == 1 || j1 == 2) { + d8 += d6 * 2.0D; + } + + if (j1 == 2 || j1 == 3) { + d9 += d6 * 2.0D; + } + + double d10 = x + 0.5D - d7; + double d11 = z + 0.5D - d7; + + if (j1 == 1 || j1 == 2) { + d10 += d7 * 2.0D; + } + + if (j1 == 2 || j1 == 3) { + d11 += d7 * 2.0D; + } + + worldrenderer.pos(d10 + d2, y + (double) (i1 * 16), d11 + d3).color(1.0F, 0.0F, 0.0F, 0.6F) + .endVertex(); + worldrenderer.pos(d8 + d4, y + (double) ((i1 + 1) * 16), d9 + d5).color(1.0F, 0.0F, 0.0F, 0.6F) + .endVertex(); + } + + tessellator.draw(); + } + } + } + + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.disableBlend(); + GlStateManager.enableTexture2D(); + //GlStateManager.disableLighting(); + } +} diff --git a/src/main/java/net/romvoid95/api/world/StormProvider.java b/src/main/java/net/romvoid95/api/world/weather/StormProvider.java similarity index 96% rename from src/main/java/net/romvoid95/api/world/StormProvider.java rename to src/main/java/net/romvoid95/api/world/weather/StormProvider.java index ed41a4f..eac12d7 100644 --- a/src/main/java/net/romvoid95/api/world/StormProvider.java +++ b/src/main/java/net/romvoid95/api/world/weather/StormProvider.java @@ -1,4 +1,4 @@ -package net.romvoid95.api.world; +package net.romvoid95.api.world.weather; import java.util.Random; @@ -168,8 +168,13 @@ else if (CommonUtil.getMinecraft().gameSettings.particleSetting == 2) { if (particleCount > 0 && storm.random.nextInt(3) < storm.rainSoundCounter++) { storm.rainSoundCounter = 0; - storm.playStormSound(world, x, y, z); - + if (y > (double) (blockpos.getY() + 1) && world.getPrecipitationHeight(blockpos) + .getY() > MathHelper.floor((float) blockpos.getY())) { + storm.playStormSound(world, x, y, z); + } + else { + storm.playStormSound(world, x, y, z); + } } } } @@ -233,15 +238,10 @@ public void renderStorm (float partialTicks, WorldClient world, Minecraft mc) { if (stormX == null || stormZ == null) { return; } - Entity entity = CommonUtil.getMinecraft().getRenderViewEntity(); - float height = world.provider.getCloudHeight(); - if (entity.lastTickPosY > height) { - return; - } OpenGL.pushMatrix(); - //OpenGL.enableLight(); - + OpenGL.enableLight(); + Entity entity = CommonUtil.getMinecraft().getRenderViewEntity(); int posX = MathHelper.floor(entity.posX); int posY = MathHelper.floor(entity.posY); int posZ = MathHelper.floor(entity.posZ); @@ -249,7 +249,7 @@ public void renderStorm (float partialTicks, WorldClient world, Minecraft mc) { GlStateManager.disableCull(); GlStateManager.glNormal3f(0.0F, 1.0F, 0.0F); GlStateManager.enableBlend(); - //OpenGL.blendClear(); + OpenGL.blendClear(); GlStateManager.enableColorMaterial(); GlStateManager .tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); @@ -354,7 +354,7 @@ public void renderStorm (float partialTicks, WorldClient world, Minecraft mc) { GlStateManager.enableCull(); GlStateManager.disableBlend(); GlStateManager.alphaFunc(516, 0.1F); - //OpenGL.disableLight(); + OpenGL.disableLight(); OpenGL.popMatrix(); } diff --git a/src/main/java/net/romvoid95/client/ExoClientProxy.java b/src/main/java/net/romvoid95/client/ExoClientProxy.java index 976deb9..2d8734b 100644 --- a/src/main/java/net/romvoid95/client/ExoClientProxy.java +++ b/src/main/java/net/romvoid95/client/ExoClientProxy.java @@ -39,7 +39,6 @@ import net.romvoid95.client.render.RocketRenderer; import net.romvoid95.common.ExoCommonProxy; import net.romvoid95.common.astronomy.trappist1.d.client.TickHandlerClientTrappistD; -import net.romvoid95.common.astronomy.trappist1.e.StormProviderTrappist1E; import net.romvoid95.common.entity.EntityTwoPlayerRocket; import net.romvoid95.common.utility.FluidUtility; import net.romvoid95.common.version.VersionChecker; @@ -49,6 +48,10 @@ public class ExoClientProxy extends ExoCommonProxy { + public static double playerPosX; + public static double playerPosY; + public static double playerPosZ; + @Override public void preInit (ExoRegistry registry, FMLPreInitializationEvent event) { super.preInit(registry, event); @@ -68,7 +71,6 @@ public void preInit (ExoRegistry registry, FMLPreInitializationEvent event) { public void init (ExoRegistry registry, FMLInitializationEvent event) { super.init(registry, event); register_event(new SkyProviders()); - register_event(new StormProviderTrappist1E()); register_event(new TickHandlerClientTrappistD()); VersionChecker.init(); registry.clientInit(event); diff --git a/src/main/java/net/romvoid95/client/event/ClientEventHandler.java b/src/main/java/net/romvoid95/client/event/ClientEventHandler.java index 2562bb2..27c083a 100644 --- a/src/main/java/net/romvoid95/client/event/ClientEventHandler.java +++ b/src/main/java/net/romvoid95/client/event/ClientEventHandler.java @@ -8,7 +8,6 @@ import com.google.common.collect.ImmutableList; import micdoodle8.mods.galacticraft.api.event.client.CelestialBodyRenderEvent; -import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem; import micdoodle8.mods.galacticraft.core.client.gui.screen.GuiCelestialSelection; import net.minecraft.client.gui.GuiMainMenu; import net.minecraft.client.gui.GuiScreen; @@ -25,14 +24,13 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.romvoid95.client.RGB; +import net.romvoid95.api.space.prefab.ExoSystem; import net.romvoid95.client.gui.screen.GuiBeta; import net.romvoid95.client.model.ModelUtil; import net.romvoid95.common.astronomy.trappist1.d.WorldProviderTrappist1D; import net.romvoid95.common.config.SConfigCore; import net.romvoid95.common.constants.ModelNames; import net.romvoid95.core.ExoInfo; -import net.romvoid95.core.initialization.ExoFluids; import net.romvoid95.core.initialization.SolarSystems; @Mod.EventBusSubscriber(modid = ExoInfo.MODID, value = Side.CLIENT) @@ -62,20 +60,27 @@ public void loadTextures (TextureStitchEvent.Pre event) { @SubscribeEvent public void onRingRender (CelestialBodyRenderEvent.CelestialRingRenderEvent.Pre renderEvent) { + ExoSystem system; + if (renderEvent.celestialBody.equals(SolarSystems.yzCeti.getMainStar())) { - this.RingRender(renderEvent, SolarSystems.yzCeti, 80F, 120F); + system = SolarSystems.yzCeti; + this.RingRender(renderEvent, system); } if (renderEvent.celestialBody.equals(SolarSystems.wolf1061.getMainStar())) { - this.RingRender(renderEvent, SolarSystems.wolf1061, 50F, 100F); + system = SolarSystems.wolf1061; + this.RingRender(renderEvent, system); } if (renderEvent.celestialBody.equals(SolarSystems.kepler1649.getMainStar())) { - this.RingRender(renderEvent, SolarSystems.kepler1649, 75F, 115F); + system = SolarSystems.kepler1649; + this.RingRender(renderEvent, system); } if (renderEvent.celestialBody.equals(SolarSystems.trappist1.getMainStar())) { - this.RingRender(renderEvent, SolarSystems.trappist1, 75F, 115F); + system = SolarSystems.trappist1; + this.RingRender(renderEvent, system); } } + @SideOnly(Side.CLIENT) @SubscribeEvent public void onGuiOpen (GuiOpenEvent event) { GuiScreen gui = event.getGui(); @@ -98,21 +103,8 @@ public void onRenderFogDensity (EntityViewRenderEvent.FogDensity event) { } } - @SideOnly(Side.CLIENT) - @SubscribeEvent() - public static void onRenderFogColor (EntityViewRenderEvent.FogColors event) { - RGB color = new RGB(ExoFluids.pressurizedMaterial.getMaterialMapColor().colorValue); - float blue = color.getBlue(); - float red = color.getRed(); - float green = color.getGreen(); - if (event.getEntity().isInsideOfMaterial(ExoFluids.pressurizedMaterial)) { - event.setRed(red); - event.setGreen(green); - event.setBlue(blue); - } - } + public void RingRender (CelestialBodyRenderEvent.CelestialRingRenderEvent.Pre renderEvent, ExoSystem solarSystem) { - public void RingRender (CelestialBodyRenderEvent.CelestialRingRenderEvent.Pre renderEvent, SolarSystem solarSystem, float start, float end) { Vector3f mapPos = solarSystem.getMapPosition().toVector3f(); float xX = mapPos.x; @@ -129,8 +121,8 @@ public void RingRender (CelestialBodyRenderEvent.CelestialRingRenderEvent.Pre re final float cos = (float) Math.cos(theta); final float sin = (float) Math.sin(theta); - float min = start; - float max = end; + float min = solarSystem.getHabitableZoneStart(); + float max = solarSystem.getHabitableZoneEnd(); float x = max; float y = 0; diff --git a/src/main/java/net/romvoid95/client/model/ModelUtil.java b/src/main/java/net/romvoid95/client/model/ModelUtil.java index befe90a..20979e6 100644 --- a/src/main/java/net/romvoid95/client/model/ModelUtil.java +++ b/src/main/java/net/romvoid95/client/model/ModelUtil.java @@ -20,6 +20,7 @@ import net.romvoid95.core.ExoplanetsMod; @UtilityClass +@SuppressWarnings("deprecation") public final class ModelUtil { static String defaultId = ExoInfo.MODID; @@ -107,6 +108,5 @@ else if (variants.length > 1 || !variants[0].equals("inventory")) { event.getModelRegistry().putObject(modelResourceLocation, newModel); } } - } } diff --git a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/SkyProviderTrappist1D.java b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/SkyProviderTrappist1D.java index 5ca45a5..580c934 100644 --- a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/SkyProviderTrappist1D.java +++ b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/SkyProviderTrappist1D.java @@ -67,4 +67,12 @@ protected float sunSize () { return 0; } + public boolean enableLargeSunAura () { + return false; + } + + public boolean enableRenderPlanet () { + return false; + } + } diff --git a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/WorldProviderTrappist1D.java b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/WorldProviderTrappist1D.java index 9f9da37..af08a70 100644 --- a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/WorldProviderTrappist1D.java +++ b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/WorldProviderTrappist1D.java @@ -6,6 +6,7 @@ import asmodeuscore.core.astronomy.dimension.world.worldengine.WE_ChunkProviderSpace; import asmodeuscore.core.utils.worldengine.WE_Biome; import asmodeuscore.core.utils.worldengine.WE_ChunkProvider; +import asmodeuscore.core.utils.worldengine.standardcustomgen.WE_CaveGen; import asmodeuscore.core.utils.worldengine.standardcustomgen.WE_TerrainGenerator; import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; import micdoodle8.mods.galacticraft.api.vector.Vector3; @@ -31,9 +32,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import net.romvoid95.api.space.utility.AstronomicalConstants; import net.romvoid95.api.world.ExoWorldProvider; -import net.romvoid95.api.world.IClimateProvider; -import net.romvoid95.api.world.ICloudProvider; -import net.romvoid95.api.world.IStormProvider; +import net.romvoid95.api.world.weather.IClimateProvider; +import net.romvoid95.api.world.weather.ICloudProvider; +import net.romvoid95.api.world.weather.IStormProvider; import net.romvoid95.common.astronomy.trappist1.d.biomes.BiomeOceananic; import net.romvoid95.common.astronomy.trappist1.d.biomes.Trap1D_Island; import net.romvoid95.common.astronomy.trappist1.d.client.CloudProviderTrappist1D; @@ -74,7 +75,7 @@ public float getFallDamageModifier () { @Override public double getHorizon () { - return 150; + return 1; } @Override @@ -84,7 +85,7 @@ public long getDayLength () { @Override public float getGravity () { - return 0.015f; + return 0.00015f; } @Override @@ -109,7 +110,7 @@ public List getSurfaceBlocks () { @SideOnly(Side.CLIENT) public float getCloudHeight () { - return 168.0F; + return 250.0F; } @SideOnly(Side.CLIENT) @@ -125,8 +126,7 @@ public void genSettings (WE_ChunkProvider cp) { cp.createChunkGen_InXZ_List.clear(); cp.createChunkGen_InXYZ_List.clear(); cp.decorateChunkGen_List.clear(); - - WE_Biome.setBiomeMap(cp, 1.2D, 6, 1400.0D, 1.1D); + ((WE_ChunkProviderSpace) cp).worldGenerators.clear(); WE_TerrainGenerator terrainGenerator = new WE_TerrainGenerator(); terrainGenerator.worldStoneBlock = States.TRAP1D_STONE_2; @@ -135,11 +135,17 @@ public void genSettings (WE_ChunkProvider cp) { terrainGenerator.worldSeaGenMaxY = 104; cp.createChunkGen_List.add(terrainGenerator); - ((WE_ChunkProviderSpace) cp).worldGenerators.clear(); + WE_CaveGen cg = new WE_CaveGen(); + cg.replaceBlocksList.clear(); + cg.addReplacingBlock(terrainGenerator.worldStoneBlock); + cg.lavaMaxY = 8; + cp.createChunkGen_List.add(cg); + cp.biomesList.clear(); + WE_Biome.addBiomeToGeneration(cp, new BiomeOceananic(-4D, 4D)); + WE_Biome.addBiomeToGeneration(cp, new Trap1D_Island(-1.0D, 1.0D)); - WE_Biome.addBiomeToGeneration(cp, new Trap1D_Island()); - WE_Biome.addBiomeToGeneration(cp, new BiomeOceananic()); + WE_Biome.setBiomeMap(cp, 1.2D, 6, 1400.0D, 1.1D); } @Override @@ -185,7 +191,7 @@ public boolean enableAdvancedThermalLevel () { @Override protected float getThermalValueMod () { - return 2.1F; + return 0.0F; } @Override @@ -229,6 +235,11 @@ public boolean hasSunset () { return false; } + @Override + public double getYCoordinateToTeleport () { + return 800.0D; + } + @Override public boolean shouldDisablePrecipitation () { return false; diff --git a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/biomes/BiomeOceananic.java b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/biomes/BiomeOceananic.java index 9afee28..69199a1 100644 --- a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/biomes/BiomeOceananic.java +++ b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/biomes/BiomeOceananic.java @@ -1,21 +1,24 @@ package net.romvoid95.common.astronomy.trappist1.d.biomes; +import java.util.Random; + import asmodeuscore.core.utils.worldengine.WE_Biome; import asmodeuscore.core.utils.worldengine.standardcustomgen.WE_BiomeLayer; import net.minecraft.init.Blocks; +import net.minecraft.world.World; import net.romvoid95.core.States; public class BiomeOceananic extends WE_Biome { - public BiomeOceananic() { + public BiomeOceananic(double min, double max) { super(new BiomeProperties("trappist1d_deepocean"), new int[] { 0x89AC76, 0x116644, 0x985cff }); - biomeMinValueOnMap = -0.4D; - biomeMaxValueOnMap = 0.0D; - biomePersistence = 2.4D; + biomeMinValueOnMap = min; + biomeMaxValueOnMap = max; + biomePersistence = 1.4D; biomeNumberOfOctaves = 4; - biomeScaleX = 480.0D; - biomeScaleY = 2.7D; + biomeScaleX = 280.0D; + biomeScaleY = 1.7D; biomeSurfaceHeight = 35; biomeInterpolateQuality = 65; biomeTemerature = 0.0F; @@ -24,10 +27,14 @@ public BiomeOceananic() { createChunkGen_InXZ_List.clear(); WE_BiomeLayer standardBiomeLayers = new WE_BiomeLayer(); - standardBiomeLayers.add(States.TRAP1D_OCEANFLOOR, 53, 0, 31, 0, true); + standardBiomeLayers.add(States.TRAP1D_OCEANFLOOR, 50, 0, 31, 0, true); standardBiomeLayers.add(States.TRAP1D_DIAMOND, 30, 0, 2, 0, true); standardBiomeLayers.add(Blocks.BEDROCK.getDefaultState(), 0, 2, 0, 0, true); createChunkGen_InXZ_List.add(standardBiomeLayers); } + @Override + public void decorateBiome (World world, Random rand, int x, int z) { + + } } diff --git a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/biomes/Trap1D_Island.java b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/biomes/Trap1D_Island.java index 31a8358..da72c94 100644 --- a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/biomes/Trap1D_Island.java +++ b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/biomes/Trap1D_Island.java @@ -21,34 +21,33 @@ import asmodeuscore.core.utils.worldengine.WE_Biome; import asmodeuscore.core.utils.worldengine.standardcustomgen.WE_BiomeLayer; -import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.romvoid95.core.States; -import net.romvoid95.core.initialization.ExoFluids; public class Trap1D_Island extends WE_Biome { - private IBlockState fluid = ExoFluids.PRESSURED_WATER.getDefaultState(); - - public Trap1D_Island() { + public Trap1D_Island(double min, double max) { super(new BiomeProperties("trappist1_d_island"), new int[] { 0x55BB44, 0x44FFAA, 0x00FF00 }); - biomeMinValueOnMap = 0.8D; - biomeMaxValueOnMap = 1.4D; - biomePersistence = 1.5D; + + biomeMinValueOnMap = min; + biomeMaxValueOnMap = max; + biomePersistence = 2.4D; biomeNumberOfOctaves = 4; biomeScaleX = 280.0D; biomeScaleY = 1.7D; - biomeSurfaceHeight = 107; - biomeInterpolateQuality = 16; + biomeSurfaceHeight = 114; + biomeInterpolateQuality = 35; //-// decorateChunkGen_List.clear(); createChunkGen_InXZ_List.clear(); WE_BiomeLayer standardBiomeLayers = new WE_BiomeLayer(); - standardBiomeLayers.add(States.TRAP1D_WETDIRT, States.TRAP1D_STONE_2, -256, 1, 2, 2, false); - standardBiomeLayers.add(States.TRAP1D_WETGRASS, States.TRAP1D_WETDIRT, -256, 0, 0, 0, false); + standardBiomeLayers.add(States.TRAP1D_WETDIRT, States.TRAP1D_STONE_2, -256, 0, -5, -1, true); + standardBiomeLayers.add(States.TRAP1D_WETGRASS, States.TRAP1D_WETDIRT, -256, 0, -256, 0, false); + standardBiomeLayers.add(States.TRAP1D_OCEANFLOOR, 50, 0, 31, 0, true); + standardBiomeLayers.add(States.TRAP1D_DIAMOND, 30, 0, 2, 0, true); standardBiomeLayers.add(Blocks.BEDROCK.getDefaultState(), 0, 2, 0, 0, true); createChunkGen_InXZ_List.add(standardBiomeLayers); } diff --git a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/CloudProviderTrappist1D.java b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/CloudProviderTrappist1D.java index 308e589..16ce774 100644 --- a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/CloudProviderTrappist1D.java +++ b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/CloudProviderTrappist1D.java @@ -5,8 +5,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldProvider; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.romvoid95.api.world.CloudProvider; -import net.romvoid95.api.world.IStormProvider; +import net.romvoid95.api.world.weather.CloudProvider; import net.romvoid95.client.gui.rendering.Texture; import net.romvoid95.common.astronomy.trappist1.d.WorldProviderTrappist1D; import net.romvoid95.core.ExoInfo; @@ -16,8 +15,6 @@ public class CloudProviderTrappist1D extends CloudProvider { private static final Texture CLOUDS = new Texture(ExoInfo.MODID, "textures/world/varda-clouds.png"); - private IStormProvider stormProvider; - @Override public float getMaxCloudSpeedDuringStorm () { return 32; diff --git a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/Lightning.java b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/Lightning.java index b0e2089..68808ce 100644 --- a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/Lightning.java +++ b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/Lightning.java @@ -13,8 +13,8 @@ public class Lightning { public static void renderBolt (long boltVertex, double x, double y, double z) { Tessellator tessellator = Tessellator.getInstance(); BufferBuilder worldrenderer = tessellator.getBuffer(); - // GlStateManager.disableTexture2D(); - // GlStateManager.disableLighting(); + GlStateManager.disableTexture2D(); + GlStateManager.disableLighting(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); double[] adouble = new double[8]; @@ -110,7 +110,7 @@ public static void renderBolt (long boltVertex, double x, double y, double z) { GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.disableBlend(); - // GlStateManager.enableTexture2D(); - // GlStateManager.enableLighting(); + GlStateManager.enableTexture2D(); + GlStateManager.enableLighting(); } } diff --git a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/StormProviderTrappist1D.java b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/StormProviderTrappist1D.java index 7b76b94..0477b9d 100644 --- a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/StormProviderTrappist1D.java +++ b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/StormProviderTrappist1D.java @@ -8,7 +8,7 @@ import net.minecraft.world.biome.Biome; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.romvoid95.api.world.ExoWorldProvider; -import net.romvoid95.api.world.StormProvider; +import net.romvoid95.api.world.weather.StormProvider; import net.romvoid95.client.gui.rendering.Texture; import net.romvoid95.common.astronomy.trappist1.d.WorldProviderTrappist1D; import net.romvoid95.common.utility.WorldUtils; @@ -89,6 +89,6 @@ public boolean isStormApplicableTo (WorldProvider provider) { @Override public boolean useGroundParticle () { - return true; + return false; } } diff --git a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/TickHandlerClientTrappistD.java b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/TickHandlerClientTrappistD.java index 88ba2ed..091eaae 100644 --- a/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/TickHandlerClientTrappistD.java +++ b/src/main/java/net/romvoid95/common/astronomy/trappist1/d/client/TickHandlerClientTrappistD.java @@ -6,41 +6,27 @@ import com.google.common.collect.Maps; import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; -import micdoodle8.mods.galacticraft.core.util.PlayerUtil; -import micdoodle8.mods.galacticraft.planets.venus.ConfigManagerVenus; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.romvoid95.api.world.weather.IClimateProvider; import net.romvoid95.common.ExoplanetSounds; -import net.romvoid95.common.astronomy.trappist1.d.WorldProviderTrappist1D; @SideOnly(Side.CLIENT) public class TickHandlerClientTrappistD { private Map lightning = Maps.newHashMap(); - @SubscribeEvent - public void onRenderTick (RenderTickEvent event) { - final Minecraft minecraft = FMLClientHandler.instance().getClient(); - final EntityPlayerSP player = minecraft.player; - final EntityPlayerSP playerBaseClient = PlayerUtil.getPlayerBaseClientFromPlayer(player, false); - - if (event.phase == Phase.END) {} - } - @SubscribeEvent public void renderLightning (ClientProxyCore.EventSpecialRender event) { final Minecraft minecraft = FMLClientHandler.instance().getClient(); final EntityPlayerSP player = minecraft.player; - if (player != null && !ConfigManagerVenus.disableAmbientLightning) { + if (player != null) { if (player.lastTickPosY < player.world.provider.getCloudHeight()) { Iterator> it = lightning.entrySet().iterator(); while (it.hasNext()) { @@ -54,18 +40,6 @@ public void renderLightning (ClientProxyCore.EventSpecialRender event) { } } - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void onClientTick (TickEvent.ClientTickEvent event) { - final Minecraft minecraft = FMLClientHandler.instance().getClient(); - - final WorldClient world = minecraft.world; - - if (world != null) { - - } - } - @SideOnly(Side.CLIENT) @SubscribeEvent public void onPlayerTick (TickEvent.PlayerTickEvent event) { @@ -73,34 +47,32 @@ public void onPlayerTick (TickEvent.PlayerTickEvent event) { final EntityPlayerSP player = minecraft.player; if (player == event.player) { - if (!ConfigManagerVenus.disableAmbientLightning) { - Iterator> it = lightning.entrySet().iterator(); - while (it.hasNext()) { - Map.Entry entry = it.next(); - int val = entry.getValue(); - if (val - 1 <= 0) { - it.remove(); - } - else { - entry.setValue(val - 1); - } + Iterator> it = lightning.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry entry = it.next(); + int val = entry.getValue(); + if (val - 1 <= 0) { + it.remove(); } - - if (player.getRNG().nextInt(300 + (int) (800F * minecraft.world.rainingStrength)) < 8 - && minecraft.world.provider instanceof WorldProviderTrappist1D) { - double freq = player.getRNG().nextDouble() * 25.0F; - double dist = 100.0F; - double dX = dist * Math.cos(freq); - double dZ = dist * Math.sin(freq); - double posX = player.posX + dX; - double posY = 95; - double posZ = player.posZ + dZ; - minecraft.world - .playSound(player, posX, posY, posZ, ExoplanetSounds.CUSTOM_THUNDER, SoundCategory.WEATHER, 350.0F - + player.getRNG().nextFloat() * 100F, 1.0F + player.getRNG().nextFloat() * 0.2F); - lightning.put(new BlockPos(posX, posY, posZ), 20); + else { + entry.setValue(val - 1); } } + + if (player.getRNG().nextInt(300 + (int) (800F * minecraft.world.rainingStrength)) < 8 + && minecraft.world.provider instanceof IClimateProvider) { + double freq = player.getRNG().nextDouble() * 25.0F; + double dist = 100.0F; + double dX = dist * Math.cos(freq); + double dZ = dist * Math.sin(freq); + double posX = player.posX + dX; + double posY = 95; + double posZ = player.posZ + dZ; + minecraft.world + .playSound(player, posX, posY, posZ, ExoplanetSounds.CUSTOM_THUNDER, SoundCategory.WEATHER, 350.0F + + player.getRNG().nextFloat() * 100F, 1.0F + player.getRNG().nextFloat() * 0.2F); + lightning.put(new BlockPos(posX, posY, posZ), 20); + } } } } diff --git a/src/main/java/net/romvoid95/common/astronomy/trappist1/e/StormProviderTrappist1E.java b/src/main/java/net/romvoid95/common/astronomy/trappist1/e/StormProviderTrappist1E.java index 8aa541f..de77853 100644 --- a/src/main/java/net/romvoid95/common/astronomy/trappist1/e/StormProviderTrappist1E.java +++ b/src/main/java/net/romvoid95/common/astronomy/trappist1/e/StormProviderTrappist1E.java @@ -7,7 +7,7 @@ import net.minecraft.world.WorldProvider; import net.minecraft.world.biome.Biome; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.romvoid95.api.world.StormProvider; +import net.romvoid95.api.world.weather.StormProvider; import net.romvoid95.client.gui.rendering.Texture; import net.romvoid95.common.utility.WorldUtils; import net.romvoid95.core.ExoInfo; diff --git a/src/main/java/net/romvoid95/common/astronomy/trappist1/e/WorldProviderTrappist1E.java b/src/main/java/net/romvoid95/common/astronomy/trappist1/e/WorldProviderTrappist1E.java index d33b617..68f4041 100644 --- a/src/main/java/net/romvoid95/common/astronomy/trappist1/e/WorldProviderTrappist1E.java +++ b/src/main/java/net/romvoid95/common/astronomy/trappist1/e/WorldProviderTrappist1E.java @@ -43,9 +43,9 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.romvoid95.api.space.utility.AstronomicalConstants; -import net.romvoid95.api.world.IClimateProvider; -import net.romvoid95.api.world.ICloudProvider; -import net.romvoid95.api.world.IStormProvider; +import net.romvoid95.api.world.weather.IClimateProvider; +import net.romvoid95.api.world.weather.ICloudProvider; +import net.romvoid95.api.world.weather.IStormProvider; import net.romvoid95.common.astronomy.trappist1.TrappistBlocks; import net.romvoid95.common.astronomy.trappist1.e.biomes.Trappist1_E_Dunes; import net.romvoid95.common.astronomy.trappist1.e.biomes.Trappist1_E_Mountains; diff --git a/src/main/java/net/romvoid95/common/integration/jei/ExoplanetsPlugin.java b/src/main/java/net/romvoid95/common/integration/jei/ExoplanetsPlugin.java index 597e8e8..582cc00 100644 --- a/src/main/java/net/romvoid95/common/integration/jei/ExoplanetsPlugin.java +++ b/src/main/java/net/romvoid95/common/integration/jei/ExoplanetsPlugin.java @@ -32,20 +32,11 @@ import net.romvoid95.common.integration.jei.alloyrefinery.AlloyRefineryRecipeWrapper; import net.romvoid95.core.initialization.ExoBlocks; -// TODO: Auto-generated Javadoc -/** - * The Class ExoplanetsPlugin. - */ @JEIPlugin public class ExoplanetsPlugin implements IModPlugin { - /** - * Register. - * - * @param reg the reg - */ @Override - public void register(IModRegistry reg) { + public void register (IModRegistry reg) { doItemBlacklist(reg.getJeiHelpers().getIngredientBlacklist()); @@ -67,23 +58,13 @@ public void register(IModRegistry reg) { } - /** - * Register categories. - * - * @param registry the registry - */ @Override - public void registerCategories(IRecipeCategoryRegistration registry) { + public void registerCategories (IRecipeCategoryRegistration registry) { IGuiHelper guiHelper = registry.getJeiHelpers().getGuiHelper(); registry.addRecipeCategories(new AlloyRefineryRecipeCategory(guiHelper)); } - /** - * Do item blacklist. - * - * @param list the list - */ - private void doItemBlacklist(IIngredientBlacklist list) { + private void doItemBlacklist (IIngredientBlacklist list) { list.addIngredientToBlacklist(new ItemStack(ExoBlocks.alarm_light)); list.addIngredientToBlacklist(new ItemStack(ExoBlocks.cellar_lamp)); diff --git a/src/main/java/net/romvoid95/core/initialization/ExoBlocks.java b/src/main/java/net/romvoid95/core/initialization/ExoBlocks.java index 9cd8a0f..4133689 100644 --- a/src/main/java/net/romvoid95/core/initialization/ExoBlocks.java +++ b/src/main/java/net/romvoid95/core/initialization/ExoBlocks.java @@ -168,7 +168,6 @@ public static void registerAll (ExoRegistry reg) { register(log_b, "log_b"); register(log_b_other, "log_b_other"); register(log_b_rough, "log_b_rough"); - } public static void register (Block block, String blockName) { diff --git a/src/main/java/net/romvoid95/core/initialization/ExoDimensions.java b/src/main/java/net/romvoid95/core/initialization/ExoDimensions.java index ef92470..1e6db44 100644 --- a/src/main/java/net/romvoid95/core/initialization/ExoDimensions.java +++ b/src/main/java/net/romvoid95/core/initialization/ExoDimensions.java @@ -1,15 +1,26 @@ package net.romvoid95.core.initialization; +import static net.romvoid95.common.config.SConfigDimensionID.*; + import micdoodle8.mods.galacticraft.core.util.WorldUtil; import net.minecraft.world.DimensionType; +import net.romvoid95.common.astronomy.trappist1.c.WorldProviderTrappist1C; +import net.romvoid95.common.astronomy.trappist1.d.WorldProviderTrappist1D; +import net.romvoid95.common.astronomy.trappist1.e.WorldProviderTrappist1E; +import net.romvoid95.common.astronomy.yzceti.b.WorldProviderYzCetiB; +import net.romvoid95.common.astronomy.yzceti.c.WorldProviderYzCetiC; +import net.romvoid95.common.astronomy.yzceti.d.WorldProviderYzCetiD; import net.romvoid95.common.config.SConfigDimensionID; public class ExoDimensions { public static DimensionType TRAPPIST_1B; - public static DimensionType TRAPPIST_1C; - public static DimensionType TRAPPIST_1D; - public static DimensionType TRAPPIST_1E; + public static DimensionType TRAPPIST_1C = DimensionType + .register("Trappist 1 C", "_exo", id_trap_c, WorldProviderTrappist1C.class, false); + public static DimensionType TRAPPIST_1D = DimensionType + .register("Trappist 1 D", "_exo", id_trap_d, WorldProviderTrappist1D.class, false); + public static DimensionType TRAPPIST_1E = DimensionType + .register("Trappist 1 E", "_exo", id_trap_e, WorldProviderTrappist1E.class, false); public static DimensionType TRAPPIST_1F; public static DimensionType TRAPPIST_1G; public static DimensionType TRAPPIST_1H; @@ -18,9 +29,12 @@ public class ExoDimensions { public static DimensionType WOLF1061_1C; public static DimensionType WOLF1061_1D; - public static DimensionType YZCETIB; - public static DimensionType YZCETIC; - public static DimensionType YZCETID; + public static DimensionType YZCETIB = DimensionType + .register("YzCeti B", "_exo", id_yz_b, WorldProviderYzCetiB.class, false); + public static DimensionType YZCETIC = DimensionType + .register("YzCeti C", "_exo", id_yz_c, WorldProviderYzCetiC.class, false); + public static DimensionType YZCETID = DimensionType + .register("YzCeti D", "_exo", id_yz_d, WorldProviderYzCetiD.class, false); public static DimensionType KEPLER1649_B; public static DimensionType KEPLER1649_C; diff --git a/src/main/java/net/romvoid95/core/initialization/Planets.java b/src/main/java/net/romvoid95/core/initialization/Planets.java index 1a294e0..edcbc8a 100644 --- a/src/main/java/net/romvoid95/core/initialization/Planets.java +++ b/src/main/java/net/romvoid95/core/initialization/Planets.java @@ -18,7 +18,8 @@ package net.romvoid95.core.initialization; import static micdoodle8.mods.galacticraft.api.world.EnumAtmosphericGas.*; -import static net.romvoid95.api.space.PlanetConstants.*; +import static net.romvoid95.api.space.PlanetConstants.AU.*; +import static net.romvoid95.api.space.PlanetConstants.Orbit.*; import static net.romvoid95.common.config.SConfigDimensionID.*; import static net.romvoid95.common.config.SConfigSystems.*; import static net.romvoid95.core.initialization.SolarSystems.*; @@ -29,7 +30,6 @@ import micdoodle8.mods.galacticraft.api.galaxies.Planet; import micdoodle8.mods.galacticraft.api.world.ITeleportType; import micdoodle8.mods.galacticraft.core.dimension.TeleportTypeMoon; -import net.romvoid95.api.space.AstroBuilder; import net.romvoid95.api.space.ExoPlanet; import net.romvoid95.api.space.Universe; import net.romvoid95.api.space.objects.RelayStation; @@ -67,8 +67,6 @@ public class Planets { public static RelayStation station; - static AstroBuilder builder = new AstroBuilder("exoplanets"); - public static void init () { Planets.initPlanets(); @@ -81,7 +79,7 @@ public static void initPlanets () { if (SolarSystems.buildyzCeti) { - yzcetib = Universe.createPlanet("yzcetib", yzCeti, 0.5F, CETI_B, CETI_B, yzceti_tier); + yzcetib = Universe.planet("yzcetib", yzCeti, 0.5F, CETI_B_AU, CETI_B_ORBIT, yzceti_tier); Universe.setBiomes(yzcetib, ExoplanetBiomes.CETIB_BASE, ExoplanetBiomes.CETIB_DIRTY); Universe.setExoPlanetData(yzcetib, 50.0f, 0.75f, 0.93f); Universe.setNormalOrbit(yzcetib); @@ -89,7 +87,7 @@ public static void initPlanets () { Universe.setSurfaceData(yzcetib, 0.50, 21500L, ClassBody.SELENA); Universe.setProvider(yzcetib, WorldProviderYzCetiB.class, id_yz_b); - yzcetic = Universe.createPlanet("yzcetic", yzCeti, 0.5F, CETI_C, CETI_C + 1, yzceti_tier); + yzcetic = Universe.planet("yzcetic", yzCeti, 0.5F, CETI_C_AU, CETI_C_ORBIT, yzceti_tier); Universe.setBiomes(yzcetic, ExoplanetBiomes.CETIC_BASE, ExoplanetBiomes.CETIC_UNKNWON); Universe.setExoPlanetData(yzcetic, 26.5f, 0.9f, 1.0f); Universe.setNormalOrbit(yzcetic); @@ -97,7 +95,7 @@ public static void initPlanets () { Universe.setSurfaceData(yzcetic, 0.65, 26500L, ClassBody.SELENA); Universe.setProvider(yzcetic, WorldProviderYzCetiC.class, id_yz_c); - yzcetid = Universe.createPlanet("yzcetid", yzCeti, 0.5F, CETI_D, CETI_D + 2, yzceti_tier); + yzcetid = Universe.planet("yzcetid", yzCeti, 0.5F, CETI_D_AU, CETI_D_ORBIT, yzceti_tier); Universe.setBiomes(yzcetid, YzCetiDBiomes.yz_ceti_d); Universe.setExoPlanetData(yzcetid, 5.0f, 1.14f, 1.05f); Universe.setNormalOrbit(yzcetib); @@ -109,7 +107,7 @@ public static void initPlanets () { if (SolarSystems.buildtrappist1) { - trappistc = Universe.createPlanet("trappist1c", trappist1, 0.5F, TRAPPIST_C, TRAPPIST_C + 1, trap_tier); + trappistc = Universe.planet("trappist1c", trappist1, 0.5F, TRAPPIST_C_AU, TRAPPIST_C_ORBIT, trap_tier); Universe.setBiomes(trappistc, ACBiome.ACSpace); Universe.setExoPlanetData(trappistc, 5.0f, 1.14f, 1.05f); Universe.setNormalOrbit(trappistc); @@ -117,8 +115,7 @@ public static void initPlanets () { Universe.setSurfaceData(trappistc, 0.75, 32500L, ClassBody.SELENA); Universe.setProvider(trappistc, WorldProviderTrappist1C.class, id_trap_c); - trappistd = Universe - .createPlanet("trappist1d", trappist1, 0.5F, TRAPPIST_D, (float) (TRAPPIST_D + 1.5), trap_tier); + trappistd = Universe.planet("trappist1d", trappist1, 0.5F, TRAPPIST_D_AU, TRAPPIST_D_ORBIT, trap_tier); Universe.setBiomes(trappistd, ACBiome.ACSpace); Universe.setExoPlanetData(trappistd, 5.0f, 1.14f, 1.05f); Universe.setNormalOrbit(trappistd); @@ -126,7 +123,7 @@ public static void initPlanets () { Universe.setSurfaceData(trappistd, 0.75, 32500L, ClassBody.OCEANIDE); Universe.setProvider(trappistd, WorldProviderTrappist1D.class, id_trap_d); - trappiste = Universe.createPlanet("trappist1e", trappist1, 0.5F, TRAPPIST_E, TRAPPIST_E + 2, trap_tier); + trappiste = Universe.planet("trappist1e", trappist1, 0.5F, TRAPPIST_E_AU, TRAPPIST_E_ORBIT, trap_tier); Universe.setBiomes(trappiste, ACBiome.ACSpace); Universe.setExoPlanetData(trappiste, 5.0f, 1.14f, 1.05f); Universe.setNormalOrbit(trappiste); @@ -136,17 +133,13 @@ public static void initPlanets () { if (!SConfigSystems.hideUnfinishedSystems) { - trappistb = builder.buildUnreachablePlanet("trappist1b", trappist1, 3.254752F); - builder.setData(trappistb, ClassBody.SELENA, TRAPPIST_B, 0.45F, TRAPPIST_B, 0, 24000L); + trappistb = Universe.unreachable("trappist1b", trappist1, 3.254752F, TRAPPIST_B_AU, TRAPPIST_B_ORBIT); - trappistf = builder.buildUnreachablePlanet("trappist1f", SolarSystems.trappist1, 0.6451158F); - builder.setData(trappistf, ClassBody.SELENA, TRAPPIST_F, 0.45F, TRAPPIST_F, 0, 24000L); + trappistf = Universe.unreachable("trappist1f", trappist1, 0.6451158F, TRAPPIST_F_AU, TRAPPIST_F_ORBIT); - trappistg = builder.buildUnreachablePlanet("trappist1g", SolarSystems.trappist1, 0.6451158F); - builder.setData(trappistg, ClassBody.SELENA, TRAPPIST_G, 0.45F, TRAPPIST_G, 0, 24000L); + trappistg = Universe.unreachable("trappist1g", trappist1, 0.6451158F, TRAPPIST_G_AU, TRAPPIST_G_ORBIT); - trappisth = builder.buildUnreachablePlanet("trappist1h", SolarSystems.trappist1, 0.896365F); - builder.setData(trappisth, ClassBody.SELENA, TRAPPIST_H, 0.45F, TRAPPIST_H, 0, 24000L); + trappisth = Universe.unreachable("trappist1h", trappist1, 0.896365F, TRAPPIST_H_AU, TRAPPIST_H_ORBIT); } } @@ -154,14 +147,11 @@ public static void initPlanets () { if (!SConfigSystems.hideUnfinishedSystems) { - wolf1061b = builder.buildUnreachablePlanet("wolf1061b", wolf1061, 2.9495497F); - builder.setData(wolf1061b, ClassBody.SELENA, WOLF_B, 0.45F, WOLF_B, 0, 24000L); + wolf1061b = Universe.unreachable("wolf1061b", wolf1061, 2.9495497F, WOLF_B_AU, WOLF_B_ORBIT); - wolf1061c = builder.buildUnreachablePlanet("wolf1061c", SolarSystems.wolf1061, 1.7264397F); - builder.setData(wolf1061c, ClassBody.SELENA, WOLF_C, 0.45F, WOLF_C, 0, 24000L); + wolf1061c = Universe.unreachable("wolf1061c", wolf1061, 1.7264397F, WOLF_C_AU, WOLF_C_ORBIT); - wolf1061d = builder.buildUnreachablePlanet("wolf1061d", SolarSystems.wolf1061, 7.132725F); - builder.setData(wolf1061d, ClassBody.SELENA, WOLF_D, 0.45F, WOLF_D, 0, 24000L); + wolf1061d = Universe.unreachable("wolf1061d", wolf1061, 7.132725F, WOLF_D_AU, WOLF_D_ORBIT); } } @@ -170,11 +160,9 @@ public static void initPlanets () { if (!SConfigSystems.hideUnfinishedSystems) { - kepler1649c = builder.buildUnreachablePlanet("kepler1649c", kepler1649, 1.932375F); - builder.setData(kepler1649c, ClassBody.SELENA, KEPLER_C, 0.55F, KEPLER_C, 0, 24000L); + kepler1649c = Universe.unreachable("kepler1649c", kepler1649, 1.932375F, KEPLER_C_AU, KEPLER_C_ORBIT); - kepler1649b = builder.buildUnreachablePlanet("kepler1649b", kepler1649, 1.932375F); - builder.setData(kepler1649b, ClassBody.SELENA, KEPLER_B, 0.55F, KEPLER_B, 0, 24000L); + kepler1649b = Universe.unreachable("kepler1649b", kepler1649, 1.932375F, KEPLER_B_AU, KEPLER_B_ORBIT); } } diff --git a/src/main/java/net/romvoid95/core/initialization/SolarSystems.java b/src/main/java/net/romvoid95/core/initialization/SolarSystems.java index 70e0dd0..a3d5589 100644 --- a/src/main/java/net/romvoid95/core/initialization/SolarSystems.java +++ b/src/main/java/net/romvoid95/core/initialization/SolarSystems.java @@ -22,34 +22,29 @@ import asmodeuscore.api.dimension.IAdvancedSpace.TypeBody; import asmodeuscore.core.astronomy.BodiesData; import asmodeuscore.core.astronomy.BodiesRegistry; -import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem; -import micdoodle8.mods.galacticraft.api.galaxies.Star; import micdoodle8.mods.galacticraft.api.vector.Vector3; -import net.romvoid95.api.space.AstroBuilder; import net.romvoid95.api.space.Universe; import net.romvoid95.api.space.prefab.ExoStar; +import net.romvoid95.api.space.prefab.ExoSystem; import net.romvoid95.common.config.SConfigSystems; -import net.romvoid95.core.ExoInfo; public class SolarSystems { - public static Star yzCetiStar; + public static ExoStar yzCetiStar; public static ExoStar wolf1061Star; public static ExoStar trappist1Star; public static ExoStar kepler1649star; - public static SolarSystem yzCeti; - public static SolarSystem wolf1061; - public static SolarSystem trappist1; - public static SolarSystem kepler1649; + public static ExoSystem yzCeti; + public static ExoSystem wolf1061; + public static ExoSystem trappist1; + public static ExoSystem kepler1649; public static boolean buildyzCeti; public static boolean buildwolf1061; public static boolean buildtrappist1; public static boolean buildkepler1649; - static AstroBuilder b = new AstroBuilder(ExoInfo.MODID); - public static void init () { registerSolarSystems(); } @@ -58,11 +53,13 @@ private static void registerSolarSystems () { BodiesData data; if (!SConfigSystems.disable_yzceti_system) { - yzCetiStar = b.buildExoStar("yzcetistar", 3058, 0.130D, 0.168D); - yzCeti = Universe.buildSolarSystem("yzceti", "milky_way", yzPos(), "yzcetistar"); - data = new BodiesData(TypeBody.STAR, ClassBody.DWARF).setStarColor(StarColor.RED); + yzCetiStar = Universe.buildExoStar("yzcetistar", 3058, 0.130D, 0.168D); + yzCeti = Universe.buildSolarSystem("yzceti", yzPos(), yzCetiStar); + yzCeti.setHabitableZoneStart(80.0F); + yzCeti.setHabitableZoneEnd(120.0F); + data = new BodiesData(TypeBody.STAR, ClassBody.DWARF).setStarColor(StarColor.RED); BodiesRegistry.registerBodyData(yzCeti.getMainStar(), data); - b.registerSolarSystem(yzCeti); + Universe.registerSolarSystem(yzCeti); buildyzCeti = true; } else { @@ -70,11 +67,13 @@ private static void registerSolarSystems () { } if (!SConfigSystems.disable_wolf_system) { - wolf1061Star = b.buildExoStar("wolf1061star", 3342, 0.294D, 0.307D); - wolf1061 = b.buildSolarSystem("wolf1061", wolfPos(), wolf1061Star); - data = new BodiesData(TypeBody.STAR, ClassBody.DWARF).setStarColor(StarColor.RED); + wolf1061Star = Universe.buildExoStar("wolf1061star", 3342, 0.294D, 0.307D); + wolf1061 = Universe.buildSolarSystem("wolf1061", wolfPos(), wolf1061Star); + wolf1061.setHabitableZoneStart(50.0F); + wolf1061.setHabitableZoneEnd(100.0F); + data = new BodiesData(TypeBody.STAR, ClassBody.DWARF).setStarColor(StarColor.RED); BodiesRegistry.registerBodyData(wolf1061.getMainStar(), data); - b.registerSolarSystem(wolf1061); + Universe.registerSolarSystem(wolf1061); buildwolf1061 = true; } else { @@ -82,11 +81,13 @@ private static void registerSolarSystems () { } if (!SConfigSystems.disable_trap_system) { - trappist1Star = b.buildExoStar("trappist1star", 2511, 0.089D, 0.121D); - trappist1 = b.buildSolarSystem("trappist1", trapPos(), trappist1Star); - data = new BodiesData(TypeBody.STAR, ClassBody.DWARF).setStarColor(StarColor.RED); + trappist1Star = Universe.buildExoStar("trappist1star", 2511, 0.089D, 0.121D); + trappist1 = Universe.buildSolarSystem("trappist1", trapPos(), trappist1Star); + trappist1.setHabitableZoneStart(75.0F); + trappist1.setHabitableZoneEnd(115.0F); + data = new BodiesData(TypeBody.STAR, ClassBody.DWARF).setStarColor(StarColor.RED); BodiesRegistry.registerBodyData(trappist1.getMainStar(), data); - b.registerSolarSystem(trappist1); + Universe.registerSolarSystem(trappist1); buildtrappist1 = true; } else { @@ -94,11 +95,13 @@ private static void registerSolarSystems () { } if (!SConfigSystems.disable_k1649_system) { - kepler1649star = b.buildExoStar("kepler1649star", 2150, 0.02D, 0.230D); - kepler1649 = b.buildSolarSystem("kepler1649", k1649Pos(), kepler1649star); - data = new BodiesData(TypeBody.STAR, ClassBody.DWARF).setStarColor(StarColor.RED); + kepler1649star = Universe.buildExoStar("kepler1649star", 2150, 0.02D, 0.230D); + kepler1649 = Universe.buildSolarSystem("kepler1649", k1649Pos(), kepler1649star); + kepler1649.setHabitableZoneStart(75.0F); + kepler1649.setHabitableZoneEnd(115.0F); + data = new BodiesData(TypeBody.STAR, ClassBody.DWARF).setStarColor(StarColor.RED); BodiesRegistry.registerBodyData(kepler1649.getMainStar(), data); - b.registerSolarSystem(kepler1649); + Universe.registerSolarSystem(kepler1649); buildkepler1649 = true; } else { diff --git a/src/main/resources/assets/exoplanets/models/block/kepler_surface2.json b/src/main/resources/assets/exoplanets/models/block/kepler_surface2.json index db2ab88..e9e4652 100644 --- a/src/main/resources/assets/exoplanets/models/block/kepler_surface2.json +++ b/src/main/resources/assets/exoplanets/models/block/kepler_surface2.json @@ -4,7 +4,6 @@ "particle": "exoplanets:blocks/terrain/trappist1/trap1e_stone", "bottom": "exoplanets:blocks/terrain/trappist1/trap1e_stone", "top": "exoplanets:blocks/terrain/trappist1/trap1e_stone", - "side": "exoplanets:blocks/terrain/trappist1/trap1e_stone", - "overlay": "exoplanets:blocks/ores/overlay_titanium" + "side": "exoplanets:blocks/terrain/trappist1/trap1e_stone" } } \ No newline at end of file diff --git a/src/main/resources/assets/exoplanets/models/item/meteor_ore.json b/src/main/resources/assets/exoplanets/models/item/meteor_ore.json deleted file mode 100644 index 0cd3f10..0000000 --- a/src/main/resources/assets/exoplanets/models/item/meteor_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "exoplanets:block/trappist1/meteor_ore", - "textures": { - "layer0": "exoplanets:blocks/terrain/trappist1/ore/meteor_ore" - } -} diff --git a/src/main/resources/assets/exoplanets/models/item/tungsten_ore.json b/src/main/resources/assets/exoplanets/models/item/tungsten_ore.json new file mode 100644 index 0000000..c546875 --- /dev/null +++ b/src/main/resources/assets/exoplanets/models/item/tungsten_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "exoplanets:block/ore/tungsten_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_aluminium.png b/src/main/resources/assets/exoplanets/textures/blocks/ores/aluminium_ore.png similarity index 100% rename from src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_aluminium.png rename to src/main/resources/assets/exoplanets/textures/blocks/ores/aluminium_ore.png diff --git a/src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_copper.png b/src/main/resources/assets/exoplanets/textures/blocks/ores/copper_ore.png similarity index 100% rename from src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_copper.png rename to src/main/resources/assets/exoplanets/textures/blocks/ores/copper_ore.png diff --git a/src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_lead.png b/src/main/resources/assets/exoplanets/textures/blocks/ores/lead_ore.png similarity index 100% rename from src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_lead.png rename to src/main/resources/assets/exoplanets/textures/blocks/ores/lead_ore.png diff --git a/src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_nickel.png b/src/main/resources/assets/exoplanets/textures/blocks/ores/nickel_ore.png similarity index 100% rename from src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_nickel.png rename to src/main/resources/assets/exoplanets/textures/blocks/ores/nickel_ore.png diff --git a/src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_platnium.png b/src/main/resources/assets/exoplanets/textures/blocks/ores/platinum_ore.png similarity index 100% rename from src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_platnium.png rename to src/main/resources/assets/exoplanets/textures/blocks/ores/platinum_ore.png diff --git a/src/main/resources/assets/exoplanets/textures/blocks/ores/silver_ore.png b/src/main/resources/assets/exoplanets/textures/blocks/ores/silver_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..b85a0fe32a19817785ca47721523ef56bb238784 GIT binary patch literal 2478 zcmb_eYitx%6dq!tg{BQr{DB%Ar!fWL?#!Ln&P=+ck1ce;Ew$9}NKLqN@11tS?#?nZ zWw$lPr172b2f>gSRHFP*P@wWiG!nzhhCoOR#7IzrKZqejQNtf1cxPV}Ezl4*nVp$? z&;8DKzI)C+^LB5~(uP@2%;Gq%A=RDiWB1w7RrfIafBMf`h}~x9yVnF9*LXC#W^7&9 z_$0^GwYmMP!`12ME$n4uh`3{``Vn=z=XlA2%GVIR}3jf`ef6iwdh^eGBG zzu)sR)s5<{Qs!kAH9voqnx@h`H35|Sp z6reb&0T3b*P;3Rt4kC)8nAP=34-ZEv5Unp)1Mx7!xJ?g9vaB190c4F5fE5)18%qu_ zA)?q&ZO7J76>Wv@vVugJ$*2)460tJa3TPrg5K#e=RRx$P)q&$sM>3?iCTlQC``ezY zDD5o1fbDotDXR`NSb560ty7bhO_{2c#sMK328yCez*H3tK&0!Y3F8XXaElmK6oV)i z>s_%F)j-6tWk4K<0E4{(lR6NfIC5+(+p0q0bg^_bE+Iq4z|fpHPz=>%Vrm*NHHZ~M zlb|Ze)5VJ0rbgq8k^&{h##ZA@P(uf%Bs(h6h@+}x5>_eNvUK9TH7?b%)$K-_k5trI zNjKDV;!EXgAsih`2?0m-NQqDxcBjh7>Fj-FePM_)(0kNr*?ZtQVFCHHeUN4Eea`{$ zZsY^B@!r(2uIX5bQ?}hY+cBbQQSMTJZER>Pj}#oI)zJS#U6w6bVvV7CZafI}iY#~t z#fmat*Nt@+GhdH zF`azY^lxq(Si^BM=A@GC{l=#Kn=dRo(l+O{%WqxU-TS5b`1yrhN5|&8Qvcz(=DlNQ z#_E=x-Fe{I^Xc(dC$0&}$I>77Z9kcK*(tQXv2E^^q4C`OPcH2oK6Cn)L;IH>mW$h7 ze`;?1)t1wZYqy@{+K$yVL3*`i^u{T%zT>$MmOue-_$j+`qOJQF%6zo_&Fk~H{0oP+ zT)8=XbKb8D1}^R^B>%cR`$RC&nr=^?iQPDb#`kV+pSb8O`k{HjfrI-n>&#ouU!Hm5 z+>W1Te%ds!_?tcH&5!PSaqauxF1gU#eXQ{AnydBuyJq1{-(O$a{D%|UeI&JKY1@uR zejMq}F022rVaB>04Z;jJ#ef3TJz{bpB?<-o%hC< Rk40Zpsji;n=N;?D{sCBfG-Ln( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_tin.png b/src/main/resources/assets/exoplanets/textures/blocks/ores/tin_ore.png similarity index 100% rename from src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_tin.png rename to src/main/resources/assets/exoplanets/textures/blocks/ores/tin_ore.png diff --git a/src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_titanium.png b/src/main/resources/assets/exoplanets/textures/blocks/ores/titanium_ore.png similarity index 100% rename from src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_titanium.png rename to src/main/resources/assets/exoplanets/textures/blocks/ores/titanium_ore.png diff --git a/src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_tungsten.png b/src/main/resources/assets/exoplanets/textures/blocks/ores/tungsten_ore.png similarity index 100% rename from src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_tungsten.png rename to src/main/resources/assets/exoplanets/textures/blocks/ores/tungsten_ore.png diff --git a/src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_zinc.png b/src/main/resources/assets/exoplanets/textures/blocks/ores/zinc_ore.png similarity index 100% rename from src/main/resources/assets/exoplanets/textures/blocks/ores/overlay_zinc.png rename to src/main/resources/assets/exoplanets/textures/blocks/ores/zinc_ore.png diff --git a/src/test/java/net/romvoid95/exoplanets/MathTests.java b/src/test/java/net/romvoid95/exoplanets/MathTests.java new file mode 100644 index 0000000..ed70117 --- /dev/null +++ b/src/test/java/net/romvoid95/exoplanets/MathTests.java @@ -0,0 +1,63 @@ +/** + * + */ +package net.romvoid95.exoplanets; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import net.romvoid95.api.math.Conversion; + +/** + * @author ROMVoid95 + * + */ +class MathTests { + + /** + * @throws java.lang.Exception + */ + @BeforeAll + static void setUpBeforeClass () throws Exception {} + + /** + * @throws java.lang.Exception + */ + @BeforeEach + void setUp () throws Exception {} + + /** + * Test method for {@link net.romvoid95.api.math.Conversion#toCelciusInt(double)}. + */ + @Test + final void testToCelciusInt () { + assertEquals(0, Conversion.toCelciusInt(32.0)); + } + + /** + * Test method for {@link net.romvoid95.api.math.Conversion#toCelciusDouble(double)}. + */ + @Test + final void testToCelciusDouble () { + assertEquals(0.0, Conversion.toCelciusDouble(32.0)); + } + + /** + * Test method for {@link net.romvoid95.api.math.Conversion#toFahrenheit(double)}. + */ + @Test + final void testToFahrenheitOne () { + assertEquals(32.0, Conversion.toFahrenheit(0.0)); + } + + /** + * Test method for {@link net.romvoid95.api.math.Conversion#toFahrenheit(int)}. + */ + @Test + final void testToFahrenheitTwo () { + assertEquals(32.0, Conversion.toFahrenheit(0)); + } +} diff --git a/test/net/romvoid95/exoplanets/MathTests.class b/test/net/romvoid95/exoplanets/MathTests.class new file mode 100644 index 0000000000000000000000000000000000000000..07c0819543316a20bf93eb8c1abab6fd550d9825 GIT binary patch literal 1310 zcmaiyUr!T36vfZ9g<`1%0TmSy5U>Sd{R1jN3D82)q)MWd_oa+<$abgh&LUsSCmSF9 z0DdUrnJsC76xd{UX6MfQ&bfE)-+#aV09e7hG!gK=GfV5FjJuD9<7%Ko1%rc7Oh0<)EyovhPGD9zXAw*008S@hhHCo?;zHQ6*u z`?PvTV6F=rB_o?SoT@1i7U?860i4fZt_m}Wbg=&)0m*Ai{-F(8oUvw zsQnWegv>UJNjwqAnhQFqe5p{*U>Z-;m=T!jo!M3x${@}@i&@N(!cuZ&=X>OOtZ84q zT(*}wdLfaLj#xVDF`q>N3%uiwcss^6pnl2fKeyy1iz=1Qp?2MRApN>jX3vjNFS2-P zQOu(o>nL}Zsz0<