diff --git a/src/main/java/ellpeck/thingycraft/OreGen.java b/src/main/java/ellpeck/thingycraft/OreGen.java index 227cb9b97..ea16bbd7f 100644 --- a/src/main/java/ellpeck/thingycraft/OreGen.java +++ b/src/main/java/ellpeck/thingycraft/OreGen.java @@ -15,11 +15,11 @@ public class OreGen implements IWorldGenerator { public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider){ switch (world.provider.dimensionId){ case -1: - generateNether(world, random, chunkX * 16, chunkZ * 16); + generateNether(world, random, chunkX*16, chunkZ*16); case 0: - generateSurface(world, random, chunkX * 16, chunkZ * 16); + generateSurface(world, random, chunkX*16, chunkZ*16); case 1: - generateEnd(world, random, chunkX * 16, chunkZ * 16); + generateEnd(world, random, chunkX*16, chunkZ*16); } } @@ -30,7 +30,7 @@ public class OreGen implements IWorldGenerator { private void generateSurface(World world, Random random, int x, int z){ for(int i = 0; i < Util.gemTypes.length; i++) { - this.addOreSpawn(InitBlocks.oreGem, i, Blocks.stone, world, random, x, z, 4 + random.nextInt(3), 12, 1, 70); + this.addOreSpawn(InitBlocks.oreGem, i, Blocks.stone, world, random, x, z, 4 + random.nextInt(3), 8, 1, 70); } } diff --git a/src/main/java/ellpeck/thingycraft/Util.java b/src/main/java/ellpeck/thingycraft/Util.java index e7e06d569..82e646248 100644 --- a/src/main/java/ellpeck/thingycraft/Util.java +++ b/src/main/java/ellpeck/thingycraft/Util.java @@ -6,7 +6,7 @@ import org.lwjgl.input.Keyboard; public class Util { - public static final String[] gemTypes = {"Malachite", "Agate", "MaliGarnet", "MawSitSit", "Melanite", "Moldavite", "Amazonite", "Amber", "Amethyst", "Nuummite", "Apatite", "Onyx", "Orthoclase", "Bloodstone", "Peridot", "ChromeDiopside"}; + public static final String[] gemTypes = {"Onyx", "AlmandineGarnet", "ChromeDiopside", "Jasper", "Sodalite", "Iolite", "Smithsonite", "Danburite", "Hematite", "Lepidolite", "Tourmaline", "Sphene", "ParaibaTourlamine", "Rhodochrosite", "Clinohumite", "Goshenite"}; public static boolean isShiftPressed(){ return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); diff --git a/src/main/resources/assets/thingycraft/lang/de_DE.lang b/src/main/resources/assets/thingycraft/lang/de_DE.lang deleted file mode 100644 index 6e5e6b590..000000000 --- a/src/main/resources/assets/thingycraft/lang/de_DE.lang +++ /dev/null @@ -1,51 +0,0 @@ -item.itemGemMalachite.name=Malachit -item.itemGemAgate.name=Achat -item.itemGemMaliGarnet.name=Mali-Granat -item.itemGemMawSitSit.name=Maw-Sit-Sit -item.itemGemMelanite.name=Melanit -item.itemGemMoldavite.name=Moldavit -item.itemGemAmazonite.name=Amazonit -item.itemGemAmber.name=Bernstein -item.itemGemAmethyst.name=Amethyst -item.itemGemNuummite.name=Nuummit -item.itemGemApatite.name=Apatit -item.itemGemOnyx.name=Onyx -item.itemGemOrthoclase.name=Alkalifeldspat -item.itemGemBloodstone.name=Roter Hämatit -item.itemGemPeridot.name=Peridot -item.itemGemChromeDiopside.name=Chromdiopsid - -tile.oreGemMalachite.name=Malachiterz -tile.oreGemAgate.name=Achaterz -tile.oreGemMaliGarnet.name=Mali-Granat-Erz -tile.oreGemMawSitSit.name=Maw-Sit-Sit-Erz -tile.oreGemMelanite.name=Melaniterz -tile.oreGemMoldavite.name=Moldaviterz -tile.oreGemAmazonite.name=Amazoniterz -tile.oreGemAmber.name=Bernsteinerz -tile.oreGemAmethyst.name=Amethysterz -tile.oreGemNuummite.name=Nuummiterz -tile.oreGemApatite.name=Apatiterz -tile.oreGemOnyx.name=Onyxerz -tile.oreGemOrthoclase.name=Alkalifeldspaterz -tile.oreGemBloodstone.name=Roter Hämatit-Erz -tile.oreGemPeridot.name=Peridoterz -tile.oreGemChromeDiopside.name=Chromdiopsiderz - -tooltip.gemIsOre.desc=Erzform, muss für Edelsteinform abgebaut werden -tooltip.gemMalachite.desc=Weicher Stein, kann sehr gut poliert werden -tooltip.gemAgate.desc=Form des Quartz, existiert in verschiedenen Formen und Farben -tooltip.gemMaliGarnet.desc=Gemisch aus glossularen und andraditen Granaten -tooltip.gemMawSitSit.desc=Ungewöhnlicher Edelstein, nach Stadt in Barma benannt -tooltip.gemMelanite.desc=Manchmal auch Titanian-Andradit genannt -tooltip.gemMoldavite.desc=Tektit, entsteht nach Meteroiteneinschlag -tooltip.gemAmazonite.desc=Wurde nach einem Fluss benannt, an dem es aber nicht gefunden wurde -tooltip.gemAmber.desc=Gehärtetes Pinienharz, vor 50 Millionen Jahren entstanden -tooltip.gemAmethyst.desc=Wertvoller Edelstein aus der Quartzgruppe -tooltip.gemNuummite.desc=Metamorphischer Stein mit atemberaubenden Farben -tooltip.gemApatite.desc=Hat viele verschiedene Farben und Formen -tooltip.gemOnyx.desc=Schwarze Form des Chalcedony, Form des Quartz -tooltip.gemOrthoclase.desc=Transparenter, gelber Feldspat aus Madagaskar -tooltip.gemBloodstone.desc=Auch bekannt als Heliotrop, hat Punkte aus Eisenoxid -tooltip.gemPeridot.desc=Idiochromatischer Edelstein aus der Forsterit-Fayalit-Mineralserie -tooltip.gemChromeDiopside.desc=Mit Chrom gefärbt, hat Ähnlichkeit zu Chromtourlamin \ No newline at end of file diff --git a/src/main/resources/assets/thingycraft/lang/en_US.lang b/src/main/resources/assets/thingycraft/lang/en_US.lang index 3389a4853..290096f18 100644 --- a/src/main/resources/assets/thingycraft/lang/en_US.lang +++ b/src/main/resources/assets/thingycraft/lang/en_US.lang @@ -1,51 +1,53 @@ -item.itemGemMalachite.name=Malachite -item.itemGemAgate.name=Agate -item.itemGemMaliGarnet.name=Mali Garnet -item.itemGemMawSitSit.name=Maw-Sit-Sit -item.itemGemMelanite.name=Melanite -item.itemGemMoldavite.name=Moldavite -item.itemGemAmazonite.name=Amazonite -item.itemGemAmber.name=Amber -item.itemGemAmethyst.name=Amethyst -item.itemGemNuummite.name=Nuummite -item.itemGemApatite.name=Apatite -item.itemGemOnyx.name=Onyx -item.itemGemOrthoclase.name=Orthoclase -item.itemGemBloodstone.name=Bloodstone -item.itemGemPeridot.name=Peridot -item.itemGemChromeDiopside.name=Chrome Diopside - -tile.oreGemMalachite.name=Malachite Ore -tile.oreGemAgate.name=Agate Ore -tile.oreGemMaliGarnet.name=Mali Garnet Ore -tile.oreGemMawSitSit.name=Maw-Sit-Sit Ore -tile.oreGemMelanite.name=Melanite Ore -tile.oreGemMoldavite.name=Moldavite Ore -tile.oreGemAmazonite.name=Amazonite Ore -tile.oreGemAmber.name=Amber Ore -tile.oreGemAmethyst.name=Amethyst Ore -tile.oreGemNuummite.name=Nuummite Ore -tile.oreGemApatite.name=Apatite Ore tile.oreGemOnyx.name=Onyx Ore -tile.oreGemOrthoclase.name=Orthoclase Ore -tile.oreGemBloodstone.name=Bloodstone Ore -tile.oreGemPeridot.name=Peridot Ore +tile.oreGemAlmandineGarnet.name=Almandine Garnet Ore tile.oreGemChromeDiopside.name=Chrome Diopside Ore +tile.oreGemJasper.name=Jasper Ore +tile.oreGemSodalite.name=Sodalite Ore +tile.oreGemIolite.name=Iolite Ore +tile.oreGemSmithsonite.name=Smithsonite Ore +tile.oreGemDanburite.name=Danburite Ore +tile.oreGemHematite.name=Hematite Ore +tile.oreGemLepidolite.name=Lepidolite Ore +tile.oreGemTourmaline.name=Tourmaline Ore +tile.oreGemSphene.name=Sphene Ore +tile.oreGemParaibaTourlamine.name=Paraiba Tourlamine Ore +tile.oreGemRhodochrosite.name=Rhodochrosite Ore +tile.oreGemClinohumite.name=Clinohumite Ore +tile.oreGemGoshenite.name=Goshenite Ore -tooltip.gemIsOre.desc=Ore Form, needs to get broken down into Gems -tooltip.gemMalachite.desc=Not a hard stone, takes an excellent polish -tooltip.gemAgate.desc=Form of Quartz, forms in a variety of colors and textures -tooltip.gemMaliGarnet.desc=Mixture of glossular and andradite garnets -tooltip.gemMawSitSit.desc=Unusual Gem, Named after Village in Burma -tooltip.gemMelanite.desc=Sometimes known as titanian andradite -tooltip.gemMoldavite.desc=Tektite, formed after meteorite impact -tooltip.gemAmazonite.desc=Named after a river where it hasn't been found -tooltip.gemAmber.desc=Hardened Resin of pine trees, formed 50mio years ago -tooltip.gemAmethyst.desc=Precious Gem within the quartz group -tooltip.gemNuummite.desc=Metamorphic rock with an iridescent play of color -tooltip.gemApatite.desc=Has many different colors and forms -tooltip.gemOnyx.desc=Black form of chalcedony, which is a form of quartz -tooltip.gemOrthoclase.desc=Transparent yellow feldspar found in Madagascar -tooltip.gemBloodstone.desc=Also known as Heliotrope, has spots of Iron Oxide -tooltip.gemPeridot.desc=Idiochromatic gem from the forsterite-fayalite mineral series -tooltip.gemChromeDiopside.desc=Colored by chromium, has similarities to chrome tourmaline \ No newline at end of file +item.itemGemOnyx.name=Onyx +item.itemGemAlmandineGarnet.name=Almandine Garnet +item.itemGemChromeDiopside.name=Chrome Diopside +item.itemGemJasper.name=Jasper +item.itemGemSodalite.name=Sodalite +item.itemGemIolite.name=Iolite +item.itemGemSmithsonite.name=Smithsonite +item.itemGemDanburite.name=Danburite +item.itemGemHematite.name=Hematite +item.itemGemLepidolite.name=Lepidolite +item.itemGemTourmaline.name=Tourmaline +item.itemGemSphene.name=Sphene +item.itemGemParaibaTourlamine.name=Paraiba Tourlamine +item.itemGemRhodochrosite.name=Rhodochrosite +item.itemGemClinohumite.name=Clinohumite +item.itemGemGoshenite.name=Goshenite + +tooltip.shiftForInfo.desc= +tooltip.gemIsOre.desc=Ore Form, needs to get broken down to use. + +tooltip.gemOnyx.desc=Black form of chalcedony, a form of quartz +tooltip.gemAlmandineGarnet.desc=Popular for its excellent hardness and brilliance +tooltip.gemChromeDiopside.desc=Colored by chromium, has similarities to chrome tourmaline +tooltip.gemJasper.desc=In a gem group by itself because of its grainy structure +tooltip.gemSodalite.desc=Gets its name from its sodium content, contains white veins of calcite +tooltip.gemIolite.desc=Is seen as three different color shades +tooltip.gemSmithsonite.desc=Discovered by the British mineralogist James Smithson +tooltip.gemDanburite.desc=First discovered in 1839, quite hard +tooltip.gemHematite.desc=When highly polished it can sometimes look like silver, remarkably dense +tooltip.gemLepidolite.desc=One of the major sources of the rare alkali metals rubidium and caesium +tooltip.gemTourmaline.desc=One of the most versatile of gems, found in every color +tooltip.gemSphene.desc=Of high luster, unique color shades and an intense fire +tooltip.gemParaibaTourlamine.desc=First found in Brazil in 1989, similar material has since been found in Africa. +tooltip.gemRhodochrosite.desc=Usually found in an aggregate form with alternating light +tooltip.gemClinohumite.desc=Rare gemstone, only three sources of gem-quality material are known +tooltip.gemGoshenite.desc=Named after the small town of Goshen in Western Massachusetts \ No newline at end of file diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemAgate.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemAgate.png deleted file mode 100644 index 8abdf76ce..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemAgate.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemAmazonite.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemAmazonite.png deleted file mode 100644 index ac527eb54..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemAmazonite.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemAmber.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemAmber.png deleted file mode 100644 index d66949de7..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemAmber.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemAmethyst.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemAmethyst.png deleted file mode 100644 index 44a29ab0f..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemAmethyst.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemApatite.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemApatite.png deleted file mode 100644 index 7efb0d3cc..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemApatite.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemBloodstone.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemBloodstone.png deleted file mode 100644 index a1ec06f0d..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemBloodstone.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemChromeDiopside.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemChromeDiopside.png index dcae788db..f7f0c5672 100644 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemChromeDiopside.png and b/src/main/resources/assets/thingycraft/textures/blocks/oreGemChromeDiopside.png differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemMalachite.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemMalachite.png deleted file mode 100644 index 04fe9c805..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemMalachite.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemMaliGarnet.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemMaliGarnet.png deleted file mode 100644 index 6a11d78d5..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemMaliGarnet.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemMawSitSit.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemMawSitSit.png deleted file mode 100644 index 34fc42b05..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemMawSitSit.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemMelanite.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemMelanite.png deleted file mode 100644 index 35a1f8348..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemMelanite.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemMoldavite.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemMoldavite.png deleted file mode 100644 index 17a4f1752..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemMoldavite.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemNuummite.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemNuummite.png deleted file mode 100644 index 3ea8f2c25..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemNuummite.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemOnyx.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemOnyx.png index b5f93fd1c..f5b5fdd50 100644 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemOnyx.png and b/src/main/resources/assets/thingycraft/textures/blocks/oreGemOnyx.png differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemOrthoclase.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemOrthoclase.png deleted file mode 100644 index 913a73c05..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemOrthoclase.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemPeridot.png b/src/main/resources/assets/thingycraft/textures/blocks/oreGemPeridot.png deleted file mode 100644 index 76a5bad99..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/blocks/oreGemPeridot.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemAgate.png b/src/main/resources/assets/thingycraft/textures/items/itemGemAgate.png deleted file mode 100644 index 470590e96..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemAgate.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemAmazonite.png b/src/main/resources/assets/thingycraft/textures/items/itemGemAmazonite.png deleted file mode 100644 index 60ca8df92..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemAmazonite.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemAmber.png b/src/main/resources/assets/thingycraft/textures/items/itemGemAmber.png deleted file mode 100644 index 2d4b3dc30..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemAmber.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemAmethyst.png b/src/main/resources/assets/thingycraft/textures/items/itemGemAmethyst.png deleted file mode 100644 index a13c8fcea..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemAmethyst.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemApatite.png b/src/main/resources/assets/thingycraft/textures/items/itemGemApatite.png deleted file mode 100644 index 7efa66f7b..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemApatite.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemBloodstone.png b/src/main/resources/assets/thingycraft/textures/items/itemGemBloodstone.png deleted file mode 100644 index da842b75e..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemBloodstone.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemChromeDiopside.png b/src/main/resources/assets/thingycraft/textures/items/itemGemChromeDiopside.png index 08d4f3763..eb16eabea 100644 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemChromeDiopside.png and b/src/main/resources/assets/thingycraft/textures/items/itemGemChromeDiopside.png differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemMalachite.png b/src/main/resources/assets/thingycraft/textures/items/itemGemMalachite.png deleted file mode 100644 index b4fecbc3f..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemMalachite.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemMaliGarnet.png b/src/main/resources/assets/thingycraft/textures/items/itemGemMaliGarnet.png deleted file mode 100644 index b2a99e466..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemMaliGarnet.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemMawSitSit.png b/src/main/resources/assets/thingycraft/textures/items/itemGemMawSitSit.png deleted file mode 100644 index cc0eb60e8..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemMawSitSit.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemMelanite.png b/src/main/resources/assets/thingycraft/textures/items/itemGemMelanite.png deleted file mode 100644 index f764ea734..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemMelanite.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemMoldavite.png b/src/main/resources/assets/thingycraft/textures/items/itemGemMoldavite.png deleted file mode 100644 index 6ce8526ef..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemMoldavite.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemNuummite.png b/src/main/resources/assets/thingycraft/textures/items/itemGemNuummite.png deleted file mode 100644 index 4de5141b2..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemNuummite.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemOnyx.png b/src/main/resources/assets/thingycraft/textures/items/itemGemOnyx.png index 923008878..73921bdac 100644 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemOnyx.png and b/src/main/resources/assets/thingycraft/textures/items/itemGemOnyx.png differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemOrthoclase.png b/src/main/resources/assets/thingycraft/textures/items/itemGemOrthoclase.png deleted file mode 100644 index b33f3d4c0..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemOrthoclase.png and /dev/null differ diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemPeridot.png b/src/main/resources/assets/thingycraft/textures/items/itemGemPeridot.png deleted file mode 100644 index ae392ea52..000000000 Binary files a/src/main/resources/assets/thingycraft/textures/items/itemGemPeridot.png and /dev/null differ