From a4ff9f0887736c3104a83d503e86e7e84b0badef Mon Sep 17 00:00:00 2001 From: SuperCoder7979 Date: Wed, 22 Jul 2020 19:01:25 -0400 Subject: [PATCH 01/16] start work on mars --- .../astromine/common/world/MarsBiome.java | 20 ++++ .../world/generation/MarsBiomeSource.java | 33 ++++++ .../world/generation/MarsChunkGenerator.java | 102 ++++++++++++++++++ .../mixin/ServerChunkManagerMixin.java | 5 + .../astromine/registry/AstromineBiomes.java | 5 + .../astromine/registry/AstromineBlocks.java | 1 + .../registry/AstromineChunkGenerators.java | 2 + .../astromine/registry/AstromineConfig.java | 3 + .../registry/AstromineDimensions.java | 2 + .../registry/AstromineGravities.java | 1 + .../astromine/blockstates/mars_soil.json | 9 ++ .../astromine/models/block/mars_soil.json | 6 ++ .../astromine/models/item/mars_soil.json | 3 + .../astromine/textures/block/mars_soil.png | Bin 0 -> 648 bytes .../minecraft/dimension/astromine/mars.json | 11 ++ .../dimension_type/astromine/mars.json | 15 +++ 16 files changed, 218 insertions(+) create mode 100644 src/main/java/com/github/chainmailstudios/astromine/common/world/MarsBiome.java create mode 100644 src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java create mode 100644 src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsChunkGenerator.java create mode 100644 src/main/resources/assets/astromine/blockstates/mars_soil.json create mode 100644 src/main/resources/assets/astromine/models/block/mars_soil.json create mode 100644 src/main/resources/assets/astromine/models/item/mars_soil.json create mode 100644 src/main/resources/assets/astromine/textures/block/mars_soil.png create mode 100644 src/main/resources/data/minecraft/dimension/astromine/mars.json create mode 100644 src/main/resources/data/minecraft/dimension_type/astromine/mars.json diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/MarsBiome.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/MarsBiome.java new file mode 100644 index 000000000..9ad3a341e --- /dev/null +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/MarsBiome.java @@ -0,0 +1,20 @@ +package com.github.chainmailstudios.astromine.common.world; + +import net.minecraft.sound.BiomeMoodSound; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.BiomeEffects; +import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder; + +public class MarsBiome extends Biome { + public MarsBiome() { + super(new Settings().configureSurfaceBuilder(SurfaceBuilder.NOPE, SurfaceBuilder.STONE_CONFIG) + .precipitation(Precipitation.NONE) + .category(Category.NONE) + .depth(0.1f) + .scale(0.1f) + .temperature(0.5F) + .downfall(0.5F) + .effects(new BiomeEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).moodSound(BiomeMoodSound.CAVE).build()) + .parent(null)); + } +} diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java new file mode 100644 index 000000000..c0dacee13 --- /dev/null +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java @@ -0,0 +1,33 @@ +package com.github.chainmailstudios.astromine.common.world.generation; + +import com.github.chainmailstudios.astromine.registry.AstromineBiomes; +import com.google.common.collect.ImmutableList; +import com.mojang.serialization.Codec; + +import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.source.BiomeSource; + +public class MarsBiomeSource extends BiomeSource { + public static Codec CODEC = Codec.LONG.fieldOf("seed").xmap(MarsBiomeSource::new, (source) -> source.seed).stable().codec(); + private final long seed; + + public MarsBiomeSource(long seed) { + super(ImmutableList.of()); + this.seed = seed; + } + + @Override + protected Codec method_28442() { + return CODEC; + } + + @Override + public BiomeSource withSeed(long seed) { + return new MarsBiomeSource(seed); + } + + @Override + public Biome getBiomeForNoiseGen(int biomeX, int biomeY, int biomeZ) { + return AstromineBiomes.MARS; + } +} diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsChunkGenerator.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsChunkGenerator.java new file mode 100644 index 000000000..06dc32197 --- /dev/null +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsChunkGenerator.java @@ -0,0 +1,102 @@ +package com.github.chainmailstudios.astromine.common.world.generation; + +import java.util.Arrays; +import java.util.Random; + +import com.github.chainmailstudios.astromine.common.miscellaneous.BiomeGenCache; +import com.github.chainmailstudios.astromine.common.noise.OctaveNoiseSampler; +import com.github.chainmailstudios.astromine.common.noise.OpenSimplexNoise; +import com.github.chainmailstudios.astromine.registry.AstromineBlocks; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; + +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.BlockView; +import net.minecraft.world.ChunkRegion; +import net.minecraft.world.Heightmap; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.source.BiomeSource; +import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.gen.StructureAccessor; +import net.minecraft.world.gen.chunk.ChunkGenerator; +import net.minecraft.world.gen.chunk.StructuresConfig; +import net.minecraft.world.gen.chunk.VerticalBlockSample; + +public class MarsChunkGenerator extends ChunkGenerator { + public static Codec CODEC = RecordCodecBuilder.create(instance -> instance.group(BiomeSource.field_24713.fieldOf("biome_source").forGetter(gen -> gen.biomeSource), Codec.LONG.fieldOf("seed").forGetter(gen -> gen.seed)) + .apply(instance, MarsChunkGenerator::new)); + + private final BiomeSource biomeSource; + private final long seed; + private final OctaveNoiseSampler lowerInterpolatedNoise; + private final OctaveNoiseSampler upperInterpolatedNoise; + private final OctaveNoiseSampler interpolationNoise; + public MarsChunkGenerator(BiomeSource biomeSource, long seed) { + super(biomeSource, new StructuresConfig(false)); + this.biomeSource = biomeSource; + this.seed = seed; + Random random = new Random(seed); + lowerInterpolatedNoise = new OctaveNoiseSampler<>(OpenSimplexNoise.class, random, 5, 140.43, 45, 10); + upperInterpolatedNoise = new OctaveNoiseSampler<>(OpenSimplexNoise.class, random, 5, 140.43, 45, 10); + interpolationNoise = new OctaveNoiseSampler<>(OpenSimplexNoise.class, random, 3, 80.32, 3, 3); + } + + @Override + protected Codec method_28506() { + return CODEC; + } + + @Override + public ChunkGenerator withSeed(long seed) { + return new MarsChunkGenerator(new MoonBiomeSource(seed), seed); + } + + @Override + public void buildSurface(ChunkRegion region, Chunk chunk) { + // Unused. + } + + @Override + public void populateNoise(WorldAccess world, StructureAccessor accessor, Chunk chunk) { + int x1 = chunk.getPos().getStartX(); + int z1 = chunk.getPos().getStartZ(); + + int x2 = chunk.getPos().getEndX(); + int z2 = chunk.getPos().getEndZ(); + + for (int x = x1; x <= x2; ++x) { + for (int z = z1; z <= z2; ++z) { + // Noise calculation + double noise = interpolationNoise.sample(x, z); + if (noise >= 1) { + noise = upperInterpolatedNoise.sample(x, z); + } else if (noise <= -1) { + noise = lowerInterpolatedNoise.sample(x, z); + } else { + noise = MathHelper.clampedLerp(lowerInterpolatedNoise.sample(x, z), upperInterpolatedNoise.sample(x, z), noise); + } + + int height = 100 + (int) noise; + for (int y = 0; y <= height; ++y) { + chunk.setBlockState(new BlockPos(x, y, z), AstromineBlocks.MARS_SOIL.getDefaultState(), false); + } + } + } + } + + @Override + public int getHeight(int x, int z, Heightmap.Type heightmapType) { + return 0; + } + + @Override + public BlockView getColumnSample(int x, int z) { + BlockState[] states = new BlockState[256]; + Arrays.fill(states, Blocks.AIR.getDefaultState()); + return new VerticalBlockSample(states); + } +} diff --git a/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerChunkManagerMixin.java b/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerChunkManagerMixin.java index 01102f63f..e25200a41 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerChunkManagerMixin.java +++ b/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerChunkManagerMixin.java @@ -5,6 +5,8 @@ import com.github.chainmailstudios.astromine.common.world.generation.EarthSpaceBiomeSource; import com.github.chainmailstudios.astromine.common.world.generation.EarthSpaceChunkGenerator; +import com.github.chainmailstudios.astromine.common.world.generation.MarsBiomeSource; +import com.github.chainmailstudios.astromine.common.world.generation.MarsChunkGenerator; import com.github.chainmailstudios.astromine.common.world.generation.MoonBiomeSource; import com.github.chainmailstudios.astromine.common.world.generation.MoonChunkGenerator; import com.mojang.datafixers.DataFixer; @@ -38,5 +40,8 @@ private void handleConstructor(ServerWorld world, LevelStorage.Session session, if (chunkGenerator instanceof MoonChunkGenerator) { this.chunkGenerator = new MoonChunkGenerator(new MoonBiomeSource(world.getSeed()), world.getSeed()); } + if (chunkGenerator instanceof MarsChunkGenerator) { + this.chunkGenerator = new MarsChunkGenerator(new MarsBiomeSource(world.getSeed()), world.getSeed()); + } } } diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java index 7d7abb191..6b216abf8 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java @@ -2,8 +2,10 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.world.EarthSpaceBiome; +import com.github.chainmailstudios.astromine.common.world.MarsBiome; import com.github.chainmailstudios.astromine.common.world.MoonBiome; import com.github.chainmailstudios.astromine.common.world.generation.EarthSpaceBiomeSource; +import com.github.chainmailstudios.astromine.common.world.generation.MarsBiomeSource; import com.github.chainmailstudios.astromine.common.world.generation.MoonBiomeSource; import net.minecraft.util.registry.Registry; @@ -14,16 +16,19 @@ public class AstromineBiomes { public static Biome MOON_FLATS; public static Biome MOON_HILLS; public static Biome MOON_LOWLANDS; + public static Biome MARS; public static void initialize() { // Biome Sources Registry.register(Registry.BIOME_SOURCE, AstromineCommon.identifier("earth_space"), EarthSpaceBiomeSource.CODEC); Registry.register(Registry.BIOME_SOURCE, AstromineCommon.identifier("moon"), MoonBiomeSource.CODEC); + Registry.register(Registry.BIOME_SOURCE, AstromineCommon.identifier("mars"), MarsBiomeSource.CODEC); // Biomes ASTEROID_BELT = Registry.register(Registry.BIOME, AstromineCommon.identifier("asteroid_belt"), new EarthSpaceBiome()); MOON_FLATS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_flats"), new MoonBiome(100, 20)); MOON_HILLS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_hills"), new MoonBiome(105, 30)); MOON_LOWLANDS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_lowlands"), new MoonBiome(93, 9)); + MARS = Registry.register(Registry.BIOME, AstromineCommon.identifier("mars"), new MarsBiome()); } } diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBlocks.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBlocks.java index 08ae922b7..fe764705f 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBlocks.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBlocks.java @@ -114,6 +114,7 @@ public class AstromineBlocks { public static final Block METEOR_STONE = register("meteor_stone", new Block(FabricBlockSettings.of(Material.STONE, MaterialColor.BLACK).requiresTool().breakByTool(FabricToolTags.PICKAXES, 3).strength(30, 1500)), AstromineItems.getBasicSettings().fireproof()); public static final Block ASTEROID_STONE = register("asteroid_stone", new Block(FabricBlockSettings.of(Material.STONE, MaterialColor.GRAY).requiresTool().breakByTool(FabricToolTags.PICKAXES, 3).strength(50, 1500)), AstromineItems.getBasicSettings().fireproof()); public static final Block MOON_STONE = register("moon_stone", new Block(FabricBlockSettings.of(Material.STONE, MaterialColor.GRAY).requiresTool().breakByTool(FabricToolTags.PICKAXES, 0).strength(1, 3)), AstromineItems.getBasicSettings()); + public static final Block MARS_SOIL = register("mars_soil", new Block(FabricBlockSettings.of(Material.SOIL, MaterialColor.GRAY).requiresTool().breakByTool(FabricToolTags.PICKAXES, 0).strength(0.5f, 0.75f)), AstromineItems.getBasicSettings()); public static final Block BLAZING_ASTEROID_STONE = register("blazing_asteroid_stone", new MagmaBlock(FabricBlockSettings.of(Material.STONE, MaterialColor.GRAY).requiresTool().breakByTool(FabricToolTags.PICKAXES, 3).strength(50, 1500).lightLevel((state) -> 3).ticksRandomly().allowsSpawning((state, world, pos, entityType) -> entityType.isFireImmune()).postProcess((state, world, pos) -> true).emissiveLighting((state, world, pos) -> true)), AstromineItems.getBasicSettings().fireproof()); public static final Block METEOR_STONE_SLAB = register("meteor_stone_slab", new SlabBlock(FabricBlockSettings.copyOf(METEOR_STONE)), AstromineItems.getBasicSettings().fireproof()); diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineChunkGenerators.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineChunkGenerators.java index a10c6cf2b..16d28b47b 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineChunkGenerators.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineChunkGenerators.java @@ -2,6 +2,7 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.world.generation.EarthSpaceChunkGenerator; +import com.github.chainmailstudios.astromine.common.world.generation.MarsChunkGenerator; import com.github.chainmailstudios.astromine.common.world.generation.MoonChunkGenerator; import net.minecraft.util.registry.Registry; @@ -10,5 +11,6 @@ public class AstromineChunkGenerators { public static void initialize() { Registry.register(Registry.CHUNK_GENERATOR, AstromineCommon.identifier("earth_space"), EarthSpaceChunkGenerator.CODEC); Registry.register(Registry.CHUNK_GENERATOR, AstromineCommon.identifier("moon"), MoonChunkGenerator.CODEC); + Registry.register(Registry.CHUNK_GENERATOR, AstromineCommon.identifier("mars"), MarsChunkGenerator.CODEC); } } diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java index 8ae89f5cf..d14c2b6ce 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java @@ -31,6 +31,9 @@ public class AstromineConfig implements ConfigData { @Comment("Gravity level in Moon") public double moonGravity = 0.03d; + @Comment("Gravity level in Mars") + public double marsGravity = 0.045d; + @Comment("Whether generation of Copper Ore in the Overworld is enabled.") public boolean overworldCopperOre = true; diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineDimensions.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineDimensions.java index 308a0f208..862234d5d 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineDimensions.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineDimensions.java @@ -19,6 +19,8 @@ public class AstromineDimensions { public static final RegistryKey MOON_OPTIONS = register(Registry.DIMENSION_OPTIONS, AstromineCommon.identifier("moon")); public static final RegistryKey MOON_REGISTRY_KEY = register(Registry.DIMENSION_TYPE_KEY, AstromineCommon.identifier("moon")); + public static final RegistryKey MARS_REGISTRY_KEY = register(Registry.DIMENSION_TYPE_KEY, AstromineCommon.identifier("mars")); + public static RegistryKey register(RegistryKey> registry, Identifier identifier) { RegistryKey key = RegistryKey.of(registry, identifier); KEYS.add(key); diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineGravities.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineGravities.java index a3c69fa1b..82977d47b 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineGravities.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineGravities.java @@ -6,5 +6,6 @@ public class AstromineGravities { public static void initialize() { GravityRegistry.INSTANCE.register(AstromineDimensions.EARTH_SPACE_REGISTRY_KEY, AstromineConfig.get().spaceGravity); GravityRegistry.INSTANCE.register(AstromineDimensions.MOON_REGISTRY_KEY, AstromineConfig.get().moonGravity); + GravityRegistry.INSTANCE.register(AstromineDimensions.MARS_REGISTRY_KEY, AstromineConfig.get().marsGravity); } } diff --git a/src/main/resources/assets/astromine/blockstates/mars_soil.json b/src/main/resources/assets/astromine/blockstates/mars_soil.json new file mode 100644 index 000000000..55b14ad46 --- /dev/null +++ b/src/main/resources/assets/astromine/blockstates/mars_soil.json @@ -0,0 +1,9 @@ +{ + "variants": { + "": [ + { + "model": "astromine:block/mars_soil" + } + ] + } +} diff --git a/src/main/resources/assets/astromine/models/block/mars_soil.json b/src/main/resources/assets/astromine/models/block/mars_soil.json new file mode 100644 index 000000000..d45122626 --- /dev/null +++ b/src/main/resources/assets/astromine/models/block/mars_soil.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "astromine:block/mars_soil" + } +} diff --git a/src/main/resources/assets/astromine/models/item/mars_soil.json b/src/main/resources/assets/astromine/models/item/mars_soil.json new file mode 100644 index 000000000..ca2a763d9 --- /dev/null +++ b/src/main/resources/assets/astromine/models/item/mars_soil.json @@ -0,0 +1,3 @@ +{ + "parent": "astromine:block/mars_soil" +} diff --git a/src/main/resources/assets/astromine/textures/block/mars_soil.png b/src/main/resources/assets/astromine/textures/block/mars_soil.png new file mode 100644 index 0000000000000000000000000000000000000000..093358deb0c943c77cb194ae3470a765c3d035ba GIT binary patch literal 648 zcmV;30(bq1P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0v$<2K~y+TEmB!- z+%OCkDT%T?o@BC2k@P%0O)uH2^ruKOS!S~>Yh~%6G9VDL^!OISub)4hb1i43z*xhL zODT;TC^d$FMvu-S;*+M9ixl{#%AYVMR$6O7EuST8w9!O!X9L-LUT@b@s=%~{_YI!9 z%@ujh`F&baX^NGsq3@qvzc++{=;U|(CS@hQ<64K-Z<}H)3gKg;3>z2v;pam*Hy^S=UghY@BMqr zpIl>3>u&`eS*?_)5&@m>gddf>61Ubes1nnIc74hK+8}=S8#z&kL?rK*u>7yY#2bgJ zql#x~#Bf~Fb)HMiXv}fRQwU^SOOBTR`N>Hm_rJvwHPoKwvJHTyj8lU#H@}Xf59YCWsPNozi}GC zyiY-Z9{a9J*sXC)NuxQ(yfx61`-)sdDY+#1LTf!rRV9SgxAXNH8j3$RqzCV1G)gTY zgsRju&k)vmFd_s|9FJ*1Pj0{M5%p9R^*+QXeuB2=xQ^QMZY#SuS(rtw&_>BZ1H6s1 zg?1UQFJb<38c(s_kda^o{=CRVb+|4sr%4#1j8Us)>+~VdhY}x%z76h<(17Z?PO`i2 i-7=564j(-Yo6SE8kz7^L&K-vU0000 Date: Wed, 22 Jul 2020 22:21:57 -0300 Subject: [PATCH 02/16] Mattock and Mining Tool recipes. --- .../astromine/registry/AstromineConfig.java | 8 ++++---- .../data/astromine/recipes/asterite_mattock.json | 16 ++++++++++++++++ .../astromine/recipes/asterite_mining_tool.json | 16 ++++++++++++++++ .../data/astromine/recipes/bronze_mattock.json | 1 + .../astromine/recipes/bronze_mining_tool.json | 1 + .../data/astromine/recipes/copper_mattock.json | 1 + .../astromine/recipes/copper_mining_tool.json | 1 + .../data/astromine/recipes/diamond_mattock.json | 16 ++++++++++++++++ .../astromine/recipes/diamond_mining_tool.json | 16 ++++++++++++++++ .../data/astromine/recipes/galaxium_mattock.json | 16 ++++++++++++++++ .../astromine/recipes/galaxium_mining_tool.json | 16 ++++++++++++++++ .../data/astromine/recipes/golden_mattock.json | 16 ++++++++++++++++ .../astromine/recipes/golden_mining_tool.json | 16 ++++++++++++++++ .../data/astromine/recipes/iron_mattock.json | 16 ++++++++++++++++ .../data/astromine/recipes/iron_mining_tool.json | 16 ++++++++++++++++ .../data/astromine/recipes/metite_mattock.json | 16 ++++++++++++++++ .../astromine/recipes/metite_mining_tool.json | 16 ++++++++++++++++ .../astromine/recipes/netherite_mattock.json | 16 ++++++++++++++++ .../astromine/recipes/netherite_mining_tool.json | 16 ++++++++++++++++ .../data/astromine/recipes/steel_mattock.json | 1 + .../astromine/recipes/steel_mining_tool.json | 1 + .../data/astromine/recipes/stellum_mattock.json | 16 ++++++++++++++++ .../astromine/recipes/stellum_mining_tool.json | 16 ++++++++++++++++ .../data/astromine/recipes/stone_mattock.json | 16 ++++++++++++++++ .../astromine/recipes/stone_mining_tool.json | 16 ++++++++++++++++ .../data/astromine/recipes/tin_mattock.json | 1 + .../data/astromine/recipes/tin_mining_tool.json | 1 + .../data/astromine/recipes/univite_mattock.json | 16 ++++++++++++++++ .../astromine/recipes/univite_mining_tool.json | 16 ++++++++++++++++ .../data/astromine/recipes/wooden_mattock.json | 16 ++++++++++++++++ .../astromine/recipes/wooden_mining_tool.json | 16 ++++++++++++++++ 31 files changed, 364 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/data/astromine/recipes/asterite_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/asterite_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/bronze_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/bronze_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/copper_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/copper_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/diamond_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/diamond_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/galaxium_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/galaxium_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/golden_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/golden_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/iron_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/iron_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/metite_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/metite_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/netherite_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/netherite_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/steel_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/steel_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/stellum_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/stellum_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/stone_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/stone_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/tin_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/tin_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/univite_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/univite_mining_tool.json create mode 100644 src/main/resources/data/astromine/recipes/wooden_mattock.json create mode 100644 src/main/resources/data/astromine/recipes/wooden_mining_tool.json diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java index ec5f9994c..83f6adc9f 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java @@ -487,16 +487,16 @@ public class AstromineConfig implements ConfigData { @Comment("Energy for the Fluid Extractor actions.") public double fluidExtractorEnergyConsumed = 1024D; - @Comment("Delay for the Block Placer actions (smaller is faster).") + @Comment("Delay for the Block Placer actions.") public long blockPlacerTimeConsumed = 40L; - @Comment("Delay for the Block Breaker actions (smaller is faster).") + @Comment("Delay for the Block Breaker actions.") public long blockBreakerTimeConsumed = 40L; - @Comment("Delay for the Fluid Inserter actions (smaller is faster).") + @Comment("Delay for the Fluid Inserter actions.") public long fluidInserterTimeConsumed = 40L; - @Comment("Delay for the Fluid Extractor actions (smaller is faster).") + @Comment("Delay for the Fluid Extractor actions.") public long fluidExtractorTimeConsumed = 40L; public static AstromineConfig get() { diff --git a/src/main/resources/data/astromine/recipes/asterite_mattock.json b/src/main/resources/data/astromine/recipes/asterite_mattock.json new file mode 100644 index 000000000..02b7b5398 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/asterite_mattock.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "astromine:asterite_axe" }, + "1": { "item": "astromine:asterite_hoe" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:asterite_mattock", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/asterite_mining_tool.json b/src/main/resources/data/astromine/recipes/asterite_mining_tool.json new file mode 100644 index 000000000..1a70aaf2b --- /dev/null +++ b/src/main/resources/data/astromine/recipes/asterite_mining_tool.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "astromine:asterite_pickaxe" }, + "1": { "item": "astromine:asterite_shovel" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:asterite_mining_tool", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/bronze_mattock.json b/src/main/resources/data/astromine/recipes/bronze_mattock.json new file mode 100644 index 000000000..0c873f179 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/bronze_mattock.json @@ -0,0 +1 @@ +{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:bronze_axe"},"1":{"item":"astromine:bronze_hoe"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:bronze_mattock","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/bronze_mining_tool.json b/src/main/resources/data/astromine/recipes/bronze_mining_tool.json new file mode 100644 index 000000000..1a32651f8 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/bronze_mining_tool.json @@ -0,0 +1 @@ +{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:bronze_pickaxe"},"1":{"item":"astromine:bronze_shovel"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:bronze_mining_tool","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/copper_mattock.json b/src/main/resources/data/astromine/recipes/copper_mattock.json new file mode 100644 index 000000000..fab6760aa --- /dev/null +++ b/src/main/resources/data/astromine/recipes/copper_mattock.json @@ -0,0 +1 @@ +{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:copper_axe"},"1":{"item":"astromine:copper_hoe"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:copper_mattock","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/copper_mining_tool.json b/src/main/resources/data/astromine/recipes/copper_mining_tool.json new file mode 100644 index 000000000..aa48f5e69 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/copper_mining_tool.json @@ -0,0 +1 @@ +{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:copper_pickaxe"},"1":{"item":"astromine:copper_shovel"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:copper_mining_tool","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/diamond_mattock.json b/src/main/resources/data/astromine/recipes/diamond_mattock.json new file mode 100644 index 000000000..5186feba2 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/diamond_mattock.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "minecraft:diamond_axe" }, + "1": { "item": "minecraft:diamond_hoe" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:diamond_mattock", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/diamond_mining_tool.json b/src/main/resources/data/astromine/recipes/diamond_mining_tool.json new file mode 100644 index 000000000..9f5703f23 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/diamond_mining_tool.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "minecraft:diamond_pickaxe" }, + "1": { "item": "minecraft:diamond_shovel" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:diamond_mining_tool", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/galaxium_mattock.json b/src/main/resources/data/astromine/recipes/galaxium_mattock.json new file mode 100644 index 000000000..dbb4c42de --- /dev/null +++ b/src/main/resources/data/astromine/recipes/galaxium_mattock.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "astromine:galaxium_axe" }, + "1": { "item": "astromine:galaxium_hoe" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:galaxium_mattock", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/galaxium_mining_tool.json b/src/main/resources/data/astromine/recipes/galaxium_mining_tool.json new file mode 100644 index 000000000..a4afe88bc --- /dev/null +++ b/src/main/resources/data/astromine/recipes/galaxium_mining_tool.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "astromine:galaxium_pickaxe" }, + "1": { "item": "astromine:galaxium_shovel" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:galaxium_mining_tool", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/golden_mattock.json b/src/main/resources/data/astromine/recipes/golden_mattock.json new file mode 100644 index 000000000..a09473905 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/golden_mattock.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "minecraft:golden_axe" }, + "1": { "item": "minecraft:golden_hoe" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:goldn_mattock", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/golden_mining_tool.json b/src/main/resources/data/astromine/recipes/golden_mining_tool.json new file mode 100644 index 000000000..b85cab34f --- /dev/null +++ b/src/main/resources/data/astromine/recipes/golden_mining_tool.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "minecraft:golden_pickaxe" }, + "1": { "item": "minecraft:golden_shovel" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:golden_mining_tool", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/iron_mattock.json b/src/main/resources/data/astromine/recipes/iron_mattock.json new file mode 100644 index 000000000..a1a73006e --- /dev/null +++ b/src/main/resources/data/astromine/recipes/iron_mattock.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "minecraft:iron_axe" }, + "1": { "item": "minecraft:iron_hoe" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:iron_mattock", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/iron_mining_tool.json b/src/main/resources/data/astromine/recipes/iron_mining_tool.json new file mode 100644 index 000000000..8b65315e2 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/iron_mining_tool.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "minecraft:iron_pickaxe" }, + "1": { "item": "minecraft:iron_shovel" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:iron_mining_tool", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/metite_mattock.json b/src/main/resources/data/astromine/recipes/metite_mattock.json new file mode 100644 index 000000000..d7e9110c1 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/metite_mattock.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "astromine:metite_axe" }, + "1": { "item": "astromine:metite_hoe" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:metite_mattock", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/metite_mining_tool.json b/src/main/resources/data/astromine/recipes/metite_mining_tool.json new file mode 100644 index 000000000..47aae1b05 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/metite_mining_tool.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "astromine:metite_pickaxe" }, + "1": { "item": "astromine:metite_shovel" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:metite_mining_tool", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/netherite_mattock.json b/src/main/resources/data/astromine/recipes/netherite_mattock.json new file mode 100644 index 000000000..22a03c607 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/netherite_mattock.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "minecraft:netherite_axe" }, + "1": { "item": "minecraft:netherite_hoe" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:goldn_mattock", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/netherite_mining_tool.json b/src/main/resources/data/astromine/recipes/netherite_mining_tool.json new file mode 100644 index 000000000..8f7c050fd --- /dev/null +++ b/src/main/resources/data/astromine/recipes/netherite_mining_tool.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "minecraft:netherite_pickaxe" }, + "1": { "item": "minecraft:netherite_shovel" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:netherite_mining_tool", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/steel_mattock.json b/src/main/resources/data/astromine/recipes/steel_mattock.json new file mode 100644 index 000000000..64ad99a88 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/steel_mattock.json @@ -0,0 +1 @@ +{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:steel_axe"},"1":{"item":"astromine:steel_hoe"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:steel_mattock","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/steel_mining_tool.json b/src/main/resources/data/astromine/recipes/steel_mining_tool.json new file mode 100644 index 000000000..c6cc2af6a --- /dev/null +++ b/src/main/resources/data/astromine/recipes/steel_mining_tool.json @@ -0,0 +1 @@ +{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:steel_pickaxe"},"1":{"item":"astromine:steel_shovel"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:steel_mining_tool","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/stellum_mattock.json b/src/main/resources/data/astromine/recipes/stellum_mattock.json new file mode 100644 index 000000000..6d03a6130 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/stellum_mattock.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "astromine:stellum_axe" }, + "1": { "item": "astromine:stellum_hoe" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:stellum_mattock", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/stellum_mining_tool.json b/src/main/resources/data/astromine/recipes/stellum_mining_tool.json new file mode 100644 index 000000000..678f195e1 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/stellum_mining_tool.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "astromine:stellum_pickaxe" }, + "1": { "item": "astromine:stellum_shovel" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:stellum_mining_tool", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/stone_mattock.json b/src/main/resources/data/astromine/recipes/stone_mattock.json new file mode 100644 index 000000000..add16c56c --- /dev/null +++ b/src/main/resources/data/astromine/recipes/stone_mattock.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "minecraft:stone_axe" }, + "1": { "item": "minecraft:stone_hoe" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:stone_mattock", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/stone_mining_tool.json b/src/main/resources/data/astromine/recipes/stone_mining_tool.json new file mode 100644 index 000000000..8be803d23 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/stone_mining_tool.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "minecraft:stone_pickaxe" }, + "1": { "item": "minecraft:stone_shovel" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:stone_mining_tool", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/tin_mattock.json b/src/main/resources/data/astromine/recipes/tin_mattock.json new file mode 100644 index 000000000..5727b1b5b --- /dev/null +++ b/src/main/resources/data/astromine/recipes/tin_mattock.json @@ -0,0 +1 @@ +{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:tin_axe"},"1":{"item":"astromine:tin_hoe"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:tin_mattock","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/tin_mining_tool.json b/src/main/resources/data/astromine/recipes/tin_mining_tool.json new file mode 100644 index 000000000..b8ad38601 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/tin_mining_tool.json @@ -0,0 +1 @@ +{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:tin_pickaxe"},"1":{"item":"astromine:tin_shovel"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:tin_mining_tool","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/univite_mattock.json b/src/main/resources/data/astromine/recipes/univite_mattock.json new file mode 100644 index 000000000..02660802a --- /dev/null +++ b/src/main/resources/data/astromine/recipes/univite_mattock.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "astromine:univite_axe" }, + "1": { "item": "astromine:univite_hoe" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:univite_mattock", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/univite_mining_tool.json b/src/main/resources/data/astromine/recipes/univite_mining_tool.json new file mode 100644 index 000000000..375ffd020 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/univite_mining_tool.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "astromine:univite_pickaxe" }, + "1": { "item": "astromine:univite_shovel" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:univite_mining_tool", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/wooden_mattock.json b/src/main/resources/data/astromine/recipes/wooden_mattock.json new file mode 100644 index 000000000..d70814596 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/wooden_mattock.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "minecraft:wooden_axe" }, + "1": { "item": "minecraft:wooden_hoe" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:wooden_mattock", "count": 1 } +} diff --git a/src/main/resources/data/astromine/recipes/wooden_mining_tool.json b/src/main/resources/data/astromine/recipes/wooden_mining_tool.json new file mode 100644 index 000000000..54686d484 --- /dev/null +++ b/src/main/resources/data/astromine/recipes/wooden_mining_tool.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": ["012", "345", "678"], + "key": { + "0": { "item": "minecraft:wooden_pickaxe" }, + "1": { "item": "minecraft:wooden_shovel" }, + "2": { "item": "minecraft:air" }, + "3": { "item": "minecraft:air" }, + "4": { "item": "minecraft:air" }, + "5": { "item": "minecraft:air" }, + "6": { "item": "minecraft:air" }, + "7": { "item": "minecraft:air" }, + "8": { "item": "minecraft:air" } + }, + "result": { "item": "astromine:wooden_mining_tool", "count": 1 } +} From 0c0642b4ca36da0df7c1ad35beeb28cfe21795a7 Mon Sep 17 00:00:00 2001 From: vini2003 Date: Thu, 23 Jul 2020 11:04:18 -0300 Subject: [PATCH 03/16] ah yes --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index f81301945..7adbe9f5b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,13 +11,13 @@ api_version = 0.15.1+build.380-1.16.1 # Mod mod_name = astromine -mod_version = 1.3.0 +mod_version = 1.3.4 mod_group = com.github.chainmailstudios version_meta = fabric-1.16.1 # Dependencies cardinal_components_version = 2.4.2 -spinnery_version = 3.1.12+fabric-1.16.x +spinnery_version = 3.1.13+fabric-1.16.x shapes_version = 2.0.0+build.10 patchouli_version = 1.16-37.21-FABRIC lba_version = 0.7.1-pre.4 From 673fd19cb71f597e2b22c44e1c159f8bb165ca86 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 24 Jul 2020 00:27:52 +1000 Subject: [PATCH 04/16] silver and rose gold textures nothing but epic hue shift textures for the moment, just needed to commit real quick to do something --- .../textures/block/asteroid_silver_ore.png | Bin 0 -> 649 bytes .../astromine/textures/block/rose_gold_block.png | Bin 0 -> 285 bytes .../astromine/textures/block/silver_block.png | Bin 0 -> 285 bytes .../astromine/textures/block/silver_ore.png | Bin 0 -> 291 bytes .../textures/item/armor/rose_gold_boots.png | Bin 0 -> 283 bytes .../textures/item/armor/rose_gold_chestplate.png | Bin 0 -> 358 bytes .../textures/item/armor/rose_gold_helmet.png | Bin 0 -> 306 bytes .../textures/item/armor/rose_gold_leggings.png | Bin 0 -> 288 bytes .../textures/item/armor/silver_boots.png | Bin 0 -> 286 bytes .../textures/item/armor/silver_chestplate.png | Bin 0 -> 357 bytes .../textures/item/armor/silver_helmet.png | Bin 0 -> 308 bytes .../textures/item/armor/silver_leggings.png | Bin 0 -> 289 bytes .../textures/item/asteroid_silver_cluster.png | Bin 0 -> 445 bytes .../astromine/textures/item/copper_boots.png | Bin 285 -> 0 bytes .../textures/item/copper_chestplate.png | Bin 361 -> 0 bytes .../astromine/textures/item/copper_helmet.png | Bin 308 -> 0 bytes .../astromine/textures/item/copper_leggings.png | Bin 294 -> 0 bytes .../astromine/textures/item/rose_gold_dust.png | Bin 0 -> 339 bytes .../astromine/textures/item/rose_gold_gear.png | Bin 0 -> 385 bytes .../astromine/textures/item/rose_gold_ingot.png | Bin 0 -> 384 bytes .../astromine/textures/item/rose_gold_nugget.png | Bin 0 -> 240 bytes .../astromine/textures/item/rose_gold_plates.png | Bin 0 -> 379 bytes .../astromine/textures/item/silver_dust.png | Bin 0 -> 338 bytes .../astromine/textures/item/silver_gear.png | Bin 0 -> 385 bytes .../astromine/textures/item/silver_ingot.png | Bin 0 -> 391 bytes .../astromine/textures/item/silver_nugget.png | Bin 0 -> 240 bytes .../astromine/textures/item/silver_plates.png | Bin 0 -> 379 bytes .../astromine/textures/item/silver_wire.png | Bin 0 -> 367 bytes .../assets/astromine/textures/item/tin_boots.png | Bin 285 -> 0 bytes .../astromine/textures/item/tin_chestplate.png | Bin 364 -> 0 bytes .../astromine/textures/item/tin_leggings.png | Bin 293 -> 0 bytes .../textures/item/tool/rose_gold_axe.png | Bin 0 -> 312 bytes .../textures/item/tool/rose_gold_hoe.png | Bin 0 -> 294 bytes .../textures/item/tool/rose_gold_mattock.png | Bin 0 -> 414 bytes .../textures/item/tool/rose_gold_mining_tool.png | Bin 0 -> 341 bytes .../textures/item/tool/rose_gold_pickaxe.png | Bin 0 -> 331 bytes .../textures/item/tool/rose_gold_shovel.png | Bin 0 -> 284 bytes .../textures/item/tool/rose_gold_sword.png | Bin 0 -> 354 bytes .../astromine/textures/item/tool/silver_axe.png | Bin 0 -> 312 bytes .../astromine/textures/item/tool/silver_hoe.png | Bin 0 -> 294 bytes .../textures/item/tool/silver_mattock.png | Bin 0 -> 416 bytes .../textures/item/tool/silver_mining_tool.png | Bin 0 -> 341 bytes .../textures/item/tool/silver_pickaxe.png | Bin 0 -> 331 bytes .../textures/item/tool/silver_shovel.png | Bin 0 -> 284 bytes .../textures/item/tool/silver_sword.png | Bin 0 -> 352 bytes .../textures/models/armor/rose_gold_layer_1.png | Bin 0 -> 1109 bytes .../textures/models/armor/rose_gold_layer_2.png | Bin 0 -> 582 bytes .../textures/models/armor/silver_layer_1.png | Bin 0 -> 1099 bytes .../textures/models/armor/silver_layer_2.png | Bin 0 -> 572 bytes 49 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/astromine/textures/block/asteroid_silver_ore.png create mode 100644 src/main/resources/assets/astromine/textures/block/rose_gold_block.png create mode 100644 src/main/resources/assets/astromine/textures/block/silver_block.png create mode 100644 src/main/resources/assets/astromine/textures/block/silver_ore.png create mode 100644 src/main/resources/assets/astromine/textures/item/armor/rose_gold_boots.png create mode 100644 src/main/resources/assets/astromine/textures/item/armor/rose_gold_chestplate.png create mode 100644 src/main/resources/assets/astromine/textures/item/armor/rose_gold_helmet.png create mode 100644 src/main/resources/assets/astromine/textures/item/armor/rose_gold_leggings.png create mode 100644 src/main/resources/assets/astromine/textures/item/armor/silver_boots.png create mode 100644 src/main/resources/assets/astromine/textures/item/armor/silver_chestplate.png create mode 100644 src/main/resources/assets/astromine/textures/item/armor/silver_helmet.png create mode 100644 src/main/resources/assets/astromine/textures/item/armor/silver_leggings.png create mode 100644 src/main/resources/assets/astromine/textures/item/asteroid_silver_cluster.png delete mode 100644 src/main/resources/assets/astromine/textures/item/copper_boots.png delete mode 100644 src/main/resources/assets/astromine/textures/item/copper_chestplate.png delete mode 100644 src/main/resources/assets/astromine/textures/item/copper_helmet.png delete mode 100644 src/main/resources/assets/astromine/textures/item/copper_leggings.png create mode 100644 src/main/resources/assets/astromine/textures/item/rose_gold_dust.png create mode 100644 src/main/resources/assets/astromine/textures/item/rose_gold_gear.png create mode 100644 src/main/resources/assets/astromine/textures/item/rose_gold_ingot.png create mode 100644 src/main/resources/assets/astromine/textures/item/rose_gold_nugget.png create mode 100644 src/main/resources/assets/astromine/textures/item/rose_gold_plates.png create mode 100644 src/main/resources/assets/astromine/textures/item/silver_dust.png create mode 100644 src/main/resources/assets/astromine/textures/item/silver_gear.png create mode 100644 src/main/resources/assets/astromine/textures/item/silver_ingot.png create mode 100644 src/main/resources/assets/astromine/textures/item/silver_nugget.png create mode 100644 src/main/resources/assets/astromine/textures/item/silver_plates.png create mode 100644 src/main/resources/assets/astromine/textures/item/silver_wire.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tin_boots.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tin_chestplate.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tin_leggings.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_axe.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_hoe.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_mattock.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_mining_tool.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_pickaxe.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_shovel.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_sword.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_axe.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_hoe.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_mattock.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_mining_tool.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_pickaxe.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_shovel.png create mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_sword.png create mode 100644 src/main/resources/assets/minecraft/textures/models/armor/rose_gold_layer_1.png create mode 100644 src/main/resources/assets/minecraft/textures/models/armor/rose_gold_layer_2.png create mode 100644 src/main/resources/assets/minecraft/textures/models/armor/silver_layer_1.png create mode 100644 src/main/resources/assets/minecraft/textures/models/armor/silver_layer_2.png diff --git a/src/main/resources/assets/astromine/textures/block/asteroid_silver_ore.png b/src/main/resources/assets/astromine/textures/block/asteroid_silver_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..519645e98ad7012ef17f49c788369dc5741bde6a GIT binary patch literal 649 zcmV;40(Sk0P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz0v<_3K~y+TT~fhr z+CUWCwG9Of1qvjjO)5m1&~m7h=D;P26y+fBxF9uxNQtbt z2|`hEC1@1tfU%A3?U=2ssC!t=?!I|5@4cmsM#Hx4QmK?oCg*d@FdkE>q#)2tCJk(w z^L#!h%kgfvXWI@Tg#OU=e!u^<)e=R~vMfOm03=CtT`!eNr_;}MeMl+EzpEb9YUOg7 zo}8Y(EEIsi1{1qJ9$zoP&u-WE{nxv@z{f{N*xQ{B{irBFl_g=XR>L0Bu!D&w+~e|F zr}NA(XtUWw8Z0=0AI6yHdAZHakPLAioo8&Za3tHdZf^RHV@DzpLYVIdgdI_6Ep@QC zRL*C3K@VuXUWZFw5FWUnFP}b3k`#+YE0wnaiIB-;f;J2W1A5kOhoQV&PDXvecjxC| z!Yw?5u<>ChARzAk_Lfr0YZx*1v{2-FsxM{|azdc8oWKyK(5N)@AQj{ z)zu<&*4JM_b~x0L9yMs1=DIFiNQmP(z`<$}GVJwGjAfaq5>nA<6v~Ba6)~81@HHS; zAOxiU<_$gv$jEzuWAHUrC`G1tJdQKE^m}O?WF!LMzbG_96-7a#RaJvyeC*k5wzgJe jEMUSIA~1olM|SPJa^m>?>(_yjxPbJo8xMhUoCO|{#S9F5 zhd`K7RKu$QC|Ks{;us=vS@!Hj-opw!Ee~I_on%|PW}o>HW`<+TE`~f8n11&MsIQ;@ z<^ICgCUcb^hPRj$J8eJUCS{mXzCw_%b&ETP=)*Mmlx?x?Hi}v?x;Y#CqFRO0o`o^V z7rfXf@Nw_K)t7~XDi>~ftt_*l>Y#NJ>$RsFAMkHDprE*#_wPB7lRaJiT-G@yGywpz Ca$h_E literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/block/silver_block.png b/src/main/resources/assets/astromine/textures/block/silver_block.png new file mode 100644 index 0000000000000000000000000000000000000000..26eb3334921b0d2d3c1b0ee1c18330ec2a8fc3ac GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF%ZcOE%%{K}Q<_wNHGae;N*R||l0oCO|{#S9F5 zhd`K7RKu$QC|Ks{;us=vS@!Hj-opw!Ee~I_on%|PW}o>HW`<+TE`~f8n11&MsIQ;@ z<^ICgCUcb^hPRj$J8eJUCS{mXzCw_%b&ETP=)*Mmlx?x?Hi}v?x;Y#CqFRO0o`o^V z7rfXf@Nw_K)t7~XDi>~ftt_*l>Y#NJ>$RsFAMkHDprE*#_wPB7lRaJiT-G@yGywpo C`Ck$M literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/block/silver_ore.png b/src/main/resources/assets/astromine/textures/block/silver_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..b88ab405c8f9e1d6a3fcd785e05c67f8771ebb58 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFt%^+TnZQo)zm&PIGJ1)sl-eXXv;*eYo;|h{E&Q&Al#NwY*0Q>mzZX#zPM7{4@f787Z+@HuacMs=NMTRy;g$7?m zGedy`1`N}kVi;C)+tpWarwXzaFgq|V%}ro?n#eR`VVK!Bo)e6mW(<+W9uIGCpP|Rl z+4!V_wIz_JaW{hs=jEEuzeHDPu-H_7V$o~MW3*Y=Aad})y3^Y?sEK_sY4E-~fr*EQ ZVf)pz!2CJ$*8|`{NV2l6& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/armor/rose_gold_chestplate.png b/src/main/resources/assets/astromine/textures/item/armor/rose_gold_chestplate.png new file mode 100644 index 0000000000000000000000000000000000000000..a085fd0811abcfc2945bb07c73ad6f65bb8aa8b8 GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@VBRnV~B-+vP8iF4y8#pbN@A0dL-QYR-0fc zabRg1=c%-enKqLTn%hisynTR2tBG^N%0}sePbUQ1s?GD8ZWeK!(lBefp8E^_5SSHEhkd^St zv8F=d5QAQ?0z;9V)d2$rmJgCmd#XE!jka5XZvF)A>0hm|y}o5|JC$jIPrSa-=P`i|OAuW7816yQi=?V^(IrlftP5k^WmuI)$eW#0ud6phzSQdHx$`r>49~q6G^B*2R zKR;ooef@vK6I`7JfBt@2_we27?Y#+(3JFb@3K%y3e0`jsN8YZMX|w$OJ)Fy2MW!Aw zF-mB>q`|PHFs@#G%JBmqo}3hBix1ad!3_3@5|Eu3D9873TiTKv4p z^pHt&!-fq8Q(74!co{N({duS>^O!k;x1llFov+F8#LFEFZHxx$%_dEMxDF}QKW2)E zZFrX>DJiMJE&SjslOe-lhMY#WuKJk9&a15X_mjeVd}WR@Oz>Tj!N$lV-ryt?z2dQu ee8zzT3=FIPCAn>!E&K%N0R~T3KbLh*2~7YCIA!Mm literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/armor/silver_boots.png b/src/main/resources/assets/astromine/textures/item/armor/silver_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..33e486e78fa05aac1967c210be1301c6befe0638 GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaI>e2V~B-+vc#_jL9fG&!8w=eH6|zCe^i-J znUfU3=<)Dv`uTt73o{_v(J|qzbYXFgq}&rY+!on#eR`;Wx7|o)e6mW(<+W9uIGC&p()x z!XU(al9T(xA_=B)#t7w*&r@HUFI*(>;mJwi9TK}(KeR9fu`qA{_WsbUhzpk)^h%w% c3=9|;ex;^6az_^H0iDm_>FVdQ&MBb@0JlV8?f?J) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/armor/silver_chestplate.png b/src/main/resources/assets/astromine/textures/item/armor/silver_chestplate.png new file mode 100644 index 0000000000000000000000000000000000000000..d24d752005cdb6907cab78bd1ad3547f484810f1 GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@Rz5HV~B-+vP8iF4y8Fslm9hWdL-O`RGDBY zabRg1=c%+AH*X#ikbZJHA#DM#=s}hnR}S!66n#=Te75@gft*xUOA%?uoCy+}q$Cm= zFKGycx&0DgyCN_lEs-&f=d1#Q`GaeB*?A5fI+W0A_Uu`L;S9$UQuphAocZwWZL|iz zR7X}{Uc&4WldF<7v2z`K3=X6zpID@QJ>TiZ?{dRMEhZ-xoZ91KAU!)xAYyx}dW7KDV!rm$a+>!H{;p=8uGrc4tRJ zX37DkrGX3{$9 zG~i+QDW0Ys$si(})t4vnl0l`-w?@RkfPtY#)%zI#AzdG!rx-k4{an^LB{Ts5g%N94 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/armor/silver_leggings.png b/src/main/resources/assets/astromine/textures/item/armor/silver_leggings.png new file mode 100644 index 0000000000000000000000000000000000000000..b9f10df1365e070eb6cfef06ad118411ebdfa81a GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaGR%#V~B-+vP8iFj-?L|XqvsWpVG-V&!+NF zLH2(=5nBzJ3D0gQ#Is2k7aROPadL9PuV;I!6MkL0%gz(N?!Jp*3#Zp&h6%@Zo}S)p zddQ@?VZ#Q4DXk04}GvnkVGu0sm-kC`H3 z8{XweN=j;Q3qSbEWXN!sA*Ye8t3IZ&^DcM(eW%D346`k|7!ziDT;O4n&|_$|*cNbH e)$T$=BO}9}uq4Nn%c3A}F?hQAxvXPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T?+cxi^5x^Py;J4X~%l=&~_#9=!jO+k^9u9miVgLpNLCAOUA2WSi$1i^?vS>^ty2+H%E=V3BP(p>>TQiWs|GxigJNPX7= ngAr0E@gYE!3cLLlo)pnPG>Ei9b+D|600000NkvXXu0mjfwYIo% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/copper_boots.png b/src/main/resources/assets/astromine/textures/item/copper_boots.png deleted file mode 100644 index 755c563bf013eb9e0df17b8f3d00759c29a5d3c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!A+hnjv*HQ$r8UB1icO)v?+b}KS0g-(%JP1 zl{rZfj2;jF^MC(eZ*TLso=IFeMp&;3o{adWJBQw7-ym>n2Jqr{k>CNj-fc(t>Q=L93C8AGJ8$HUjr>ksCn zFbFZ9^pu#nNP?-H(L-oi<+Y3I0f8JAUw%l(@Z4ppaAMSKYGl3tFWFb;MJB`aU5cy{ a5)AeG(`2&xs_KERXYh3Ob6Mw<&;$TTwOyhB diff --git a/src/main/resources/assets/astromine/textures/item/copper_chestplate.png b/src/main/resources/assets/astromine/textures/item/copper_chestplate.png deleted file mode 100644 index 425b0aa583c4996775cae9c8c65abb493e9a0dc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!GE4Ejv*HQ$r1$zIFz2PEdI~_d4j{Gv+ENq zB@V1+Q~CM-@ZbOU`Op9OUzzu-KBud2Wg^pQri1;bttJ26vEom=y=%qd8yrc^MzvqEmmBxX4_uzDHC#BJ<#4Dl6NGr{@#Tt_wyF-gXW&ewiCx|7*< zeS4g9Wq`O$)t}zPYZuiMIK@nzHv~H}ED^jLHbH7a)C4&J2I&nCZr8gBuz4O}Fniv_ z;KA!-+riJzEOB6|AdAB}cXkQ31_nFl3yf`yH*y#mV;*U&)NSnkSU+nkkA>L=#t4Q( zfB2a+fNJ!dH)OIg@-RCvq;O2>WV&D)%xGZ1z#!{BgF$naU_US<7(8A5T-G@yGywqj CTz=93 diff --git a/src/main/resources/assets/astromine/textures/item/copper_helmet.png b/src/main/resources/assets/astromine/textures/item/copper_helmet.png deleted file mode 100644 index f6704b35c5e95d5b16ab99bfa7519ae8f242e386..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!IPdYjv*HQ$r8UB1icnFRKB|Nf1!`agp$wN zZB;ys6Vjr^OW8P;gI92{#KdjvO}utdorinhU-yfLd6phzSQe?K)Z2JkvGL*k`|ElB z-`mG<`tSd*jgFINw?2H|eV$jm&e)`hwXuQI>oDV)XY$j_jsEN`l{-^c_|9a8Sg0`T zb%7 diff --git a/src/main/resources/assets/astromine/textures/item/copper_leggings.png b/src/main/resources/assets/astromine/textures/item/copper_leggings.png deleted file mode 100644 index 4626a8830ca6bcb9dfef059dafde99a76dafa218..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!QGxNjv*HQ$r1$zIF>$4m}m99UPG8!rs_{` z;=%3zHL3zE6wXd8u9CDUxqI-B{Pgmsm-gGwHNQNqz0L59)i0K#0%{t)Ob$}}*SuxO zZpmb03^WbY;AY$)#c=7%qdS=v$Jl{P=Cz;CHyfUKxr3pN(LlY~r0EaWA%*(KOcAjS z?{cgo^)$GJAADspWH`)_)5z9UAJf=*m34jo-nLBvjAn%*%noJ~7fG@N1SK(vD|;EW iEwzYw)XZpLz`)>tAhwbDdSw{U8w{SVelF{r5}E)#d}Ubx diff --git a/src/main/resources/assets/astromine/textures/item/rose_gold_dust.png b/src/main/resources/assets/astromine/textures/item/rose_gold_dust.png new file mode 100644 index 0000000000000000000000000000000000000000..fec96f24a1852936197de7ed97901db5d5e94049 GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@P(&~V~B-+@}K|z?U_{@IK3wGW@H~|Yvume zY%rx;^nnS(vcM28u5-uOHb^mCVz`u%m(2X^{_e`j3k|h-S1U@e9Wc?>)HJ-ayS)G5 z*UjlX6HlJx*~4^*r}E)JiM9nU%09+C2Y4)Z*4sBv+GTY^mH*wnq#0X^bd^Im53w55 zH<>gtoOt%M_<7S$gR{^2`gjf6{kOZdmAmHpP-UDh1hiB^ZeB&N71O3e4>FVdQ&MBb@08P4k>;M1& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/rose_gold_gear.png b/src/main/resources/assets/astromine/textures/item/rose_gold_gear.png new file mode 100644 index 0000000000000000000000000000000000000000..d5e9e6504e0ba22daed38c7f6391e3840830a58d GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engP5m_V~B-+@}K|z?U_{@IK3wG2Jm=%EBeQO zC_vBAj$?yE=7yA@M9Vq6iwZy9{d(p9`#mL-1&_3~GkOHX2DdvpM)o>-#?F0s@9gY^ zLWzb>+a1;251)P2=FwnNu`-oEF^vm^Eiljo}`)KDUU51}DiB;S&Y|Y?&=TrCS_}Hq1C6 z$*sUp%&Xzx$S}8GhFd~YaLJF8lhqS=HcQUz=L`76bV5`?D$PpKj$?s@1K)zYG$mOB b0|o}sHHX|j#}u3f1{;H?tDnm{r-UW|oq>!c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/rose_gold_ingot.png b/src/main/resources/assets/astromine/textures/item/rose_gold_ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..36639c34ee03e9fc79347b3e8dd07336df8d81d6 GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engQ%yAV~B-+@}K|z?U_{@IK3wGc9<#LJpI$2 z!+B>x!*%WxQd@Y>9QbmTd%483yxXTao-r`CF}|2J<;qn_m!(S%{JDO9p5dL{mBL2_ zHZZoBEZpq>?moYHi{Z)3FYAL6En|dSni=evr%ai0;Lof(C2V2>%qfd@E>?~Z5NF72 z%FJ1>l^zffmR#}a3Fi?8fdgqAo0diHjpfO|zmIiuYisL46OIGC42%;LC!RbRAh$|Q zg5hQl&jGfYe;=kbhBG9++FSiy;@g_|=3r%yw;Pq&55Ac@J-bV1vRfQxc-C5No^SN#&ZfS^=SycVX=UVSFtOiJ&3)=HUxsw=h6%@?)(A+j gc~&mqO-Nv1aQI`?Rr4!#4$wgip00i_>zopr0M7(a+5i9m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/rose_gold_plates.png b/src/main/resources/assets/astromine/textures/item/rose_gold_plates.png new file mode 100644 index 0000000000000000000000000000000000000000..46679d17995c5919a3ed903741fa264f1602faeb GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engMg=tV~B-+@}K|z?U_{@IK3XTo{T&9-%;X} zE31O|gF~M4{Qf)sxHO!v#%ro2s7&6%|7Kk_SOq@6|@q(GbVFQlYZW0ch%o7w7q+Us-^oE&zOOSe2 zV!+N3aEKx0_jCUIhqD|QmP`zHkjQzkceeS%Pa1Izna9{B>}{5*2vGF!VsSlrm3#St zu8F1smw1>o5*dm)&3Y9Y)=9Di@Gvk&Oi^lQHS0BKNMztRki)HJ-qoK^Gf zm#K46ic0ea27Tv(GPyQIjf)(Yd6*5HzszH=3$S$a0OxZMR z6VnZ~3EU2BhjQ2(x69iZ@2UMQc9dJfQ}UV3gkVQTb|!;fg@!efECtV4zX-Tr=U{fW dGd46}U})-X5LT{Ts}J-tgQu&X%Q~loCII|OaW?<} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/silver_gear.png b/src/main/resources/assets/astromine/textures/item/silver_gear.png new file mode 100644 index 0000000000000000000000000000000000000000..451044fe1ee9186bd57d8803092f7ca26c95be67 GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engP5m_V~B-+@}K|z?U_{@IK3wG2JjU0dH>@- z6rks5$Fad7b3;mHmCzjCMTH-)&b{;h{+;cU1&_3~GkOHL2hVl%jcjy`_3V83Y;Sc! zp+rOH-Ce&M9-jI-n@599!P>iFx^&KomE7SAl>`#f7VuvC^YC-{3J&JO_gsr5AI5d? zeoCDnB+9yZ{@%K?8}d&38A!7^eCm7lEWym9?&Ger31&A~4W2hMoG24uu#~*%Fk`yI zItIoW<`485EP0m{etuV*&}wivVOCA-T!TGqeQpsA4Nj6N!Y2#_*fLvwO1C%`ZJ2RD zl3RhHm{-HWkzsDX47Y@);F2FFC#xs$Y?hqa&lm8C>4d0)RGO8d9mfI*2fhV)X-cvN c1`G^quO6Cxu;#WBFxVJ8UHx3vIVCg!05vp?ng9R* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/silver_ingot.png b/src/main/resources/assets/astromine/textures/item/silver_ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..63f463995a7455fd59847abed218b8f1ec4f0cb5 GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engN&z(V~B-+@}K|z?U_{@IK3wGc9h;;X3yTsWUuV4t`n59WMDzZ`Ns!XAF#Oj4x(gnL0&ciHqyOKk4h^jqmI!=RYd2 zfw9G8;pXr2Z8*(aE^3;+tgoyRiV<>YX0T(P(jeC0P*usRBH*ZYNaP`tg0I=LX9>IZ zES;P9?$c8q|9Liv35}o~Sc=q+Q zd7?ZqJ8^fUpV7 z(oCP&HZdAJKV;I#;GsOF(}Vp)TSHD_`op9fr3w5Id@K`86`7~Buz2$?xWLL7Giw5) io0p1czzk_g35E%;=EQ&K?X3U?9)qW=pUXO@geCwWm5%=a literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/silver_nugget.png b/src/main/resources/assets/astromine/textures/item/silver_nugget.png new file mode 100644 index 0000000000000000000000000000000000000000..f824648070b4997a96d1e4b62838abe86c425fba GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enu+`JWF~q_@`Op9V_ROjcoL-Z8HOv^+i_dvH z>EWbm@w2HdMu7}|;teLp*?t;LS*~t4Lo&m7h4s$lt(>bF70xR71}$2|b3Sf=TUQdh zMeKrgOIT7LvRfQxc-A`m`#Zxmw>M3G_-xVvOXXXF}NM<4j3tnS~GsTmm9c5dcpiEnzdPIHJc zFo`fHNS(es`M{s__3_P_DGhlXcNiw5)ksY|xUpDVl26X^SV8f9Ker8xul(NqZ?3r` zd1dO91zsDNXSfM4WU^f>5O3g_IB{a4f$@c71{|~9Bpf)ICnzdNJ(Ei5{bm-HAoZ-o zfSn`Y5JSrE+x+t%&T?Q_5*X1Sp7Y>r_4fy#G~yaEkFibI+bmNNpy=Vn;(Br=clg1s ziKYUVc$hR28Hzd0dKDVhNwNg+Ffc|;QEF#3>osUdWZ*cE#5~_k;y@O|$A(5mhK|d3 VP93eBF&P+O44$rjF6*2UngAc8iG=_F literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/silver_wire.png b/src/main/resources/assets/astromine/textures/item/silver_wire.png new file mode 100644 index 0000000000000000000000000000000000000000..8875e3a70ea881c2bc033cfa4c7ef6d685d44e38 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en1B<7NV~B-+vP4_L^NGs;7y2w>P@dA(eC1Z# zf5mrt31;&f7-on)c*b^FeqUYchAS5xFE$@)ylGc_)5}1frKPp?pvj4V2^E=PR$Yn( zY#zow$=R8LH@5l9+co@D*pT*IZik{mrLU{&hByPp%X8#J&nc+uo(;HrmtDw>QNc2& zZ9{`fVjb&6g|n}h`MQ0S68Xbk$-acm#lGs7h|UQXC5J{9Ar?!?XXzyjLi%1^?bY0A znm5z}PN=uG8=Q&W$@a!Y!l9pa#&w5t?K?%@U0JZ^&VPgYLkDhe&tIs+!Elt}1nUBW zhDzb1>lK_G{EklLOVD%RQx;)PV0fY`(EE-_rqOyqLn9+Y$kieX!Pa~pU?4Ggy85}S Ib4q9e04sWeW&i*H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/tin_boots.png b/src/main/resources/assets/astromine/textures/item/tin_boots.png deleted file mode 100644 index 8dcc619a79d3e47fa31042292e1d3f384eed745f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!A+hnjv*HQ$r8UB1icP7#=Bgp*O;7mxhplH zGAAj5(c|IU>hJ&N@2vQ^e`2p}jIdszKtj`{f)5`*r)zMFHXO0vQ_ufYk)e%Ip}|+t z%uwKf0mF2s7>3o{?`*4BQU%!xm>n3WPM^s3G?8h>Ldi@`o)e6mW(<+W9uGHPUw<$s zg+YkT07nuyxcPX+; aNHFZboW*MwX&el6J%gvKpUXO@geCw@b6*4i diff --git a/src/main/resources/assets/astromine/textures/item/tin_chestplate.png b/src/main/resources/assets/astromine/textures/item/tin_chestplate.png deleted file mode 100644 index 3b7379cac380b727f82f01d76269d249d8ecbe1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4UC>Hjv*HQ$r1$zIF$Y5*``D>cDV z;=s~2)>COOaxSVdh~Z(K2G^i*i@Y-s48&fe9lVCKOS$;)#f zwm~Ox$$I`&!vQnKv?kc zf_Enrci2@Z9AePxRbVKxvpQhF!16(|iO+!NKpHp41EJ#v3?d#1M_)*&wetlq39>ja zz7&7K-xrj^z+L-FVdQ&MBb@ E05Cy(vj6}9 diff --git a/src/main/resources/assets/astromine/textures/item/tin_leggings.png b/src/main/resources/assets/astromine/textures/item/tin_leggings.png deleted file mode 100644 index eae81c5636536af6423f34b2290a632a865c4855..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Cjs%jv*HQ$r1$zIF>#@DN$RHuXpwt@otG}G97w8KHPgg&ebxsLQ0P?PCo&W#< diff --git a/src/main/resources/assets/astromine/textures/item/tool/rose_gold_axe.png b/src/main/resources/assets/astromine/textures/item/tool/rose_gold_axe.png new file mode 100644 index 0000000000000000000000000000000000000000..aa4bc77182478c8dedc842236ad418cf40519068 GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@T{kcV~B-+@&ay;PbI(j4+ZFDGA#LcbMEbg zp0fgK8oiwohgTe~DWM4f D4t8^v literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/tool/rose_gold_hoe.png b/src/main/resources/assets/astromine/textures/item/tool/rose_gold_hoe.png new file mode 100644 index 0000000000000000000000000000000000000000..c14c24b74d38c5696c1d538f56c6391aa55b9314 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaJQ$6V~B-+@&XY9r_419CojLWpK{V5|F_+q zEJFs5&zr5c|ChhHRk&v&uQOYPZ|UVw=Im2C>rw=!PD+|_{r<@hf8M6DRdV{ZNzRsQ z{3`TRXM&@Gv%`aHANkt$9{*?jW>*dOn(3T6UJMN)=Vyhnm9@@FWepKw>L_YlKJ!KW zgw5~oK4mgQMn;a#Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz0W(QNK~y+TV`M-A z|NsAovM>Q7BZ^WuV1m+kL6W!Y|3ohr?52Zk#fL!}kL=nB#@GyD1S!G=KsF~Alrmg6 zcaGu7imQt65h3x6(F;I~%VTK&}AM%$)DR&IZ}s-ZX_lL{gGr{)Ddo^S19} z!f5~~+CXw%=3@Ur&Yr*h3B&b=Ul>7#W)@e1<+iL^@}CK$5E}*okYVK~zc##AU=82A*c3V4FeChG|9yFiWrkkmd|Ox&In++;IPaoQ#Zu>Hq)$07*qo IM6N<$f=*hbYybcN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/tool/rose_gold_mining_tool.png b/src/main/resources/assets/astromine/textures/item/tool/rose_gold_mining_tool.png new file mode 100644 index 0000000000000000000000000000000000000000..50012e539ad233e2b3837a908c1aaaf30708f78f GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBuf-vKbiP>*~g0DPX978PplT!{bPO_Q%&v_=#=WXu~ujJEa z$gC@SZYHrl-r&FerouKR8H@0c?| z;zU}B;U0!19FfK+Zb}v1Nnmzh6HMjcXfP>Xwz}E0`G-R9iFF60*%Z!x5}L#FdAoh$ zj*l<2uWf0#%rGG>qG4gS*wjf)n+hZxPNb=-s%mg^JA5}bYmjNsSavw)*t49b28r1p jnI^bxGM&sXA;BPet35aP^|lD0uNgdD{an^LB{Ts5RyKkQ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/tool/rose_gold_pickaxe.png b/src/main/resources/assets/astromine/textures/item/tool/rose_gold_pickaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..f15ef7ce9626ecc77d3481307f92c620e32b6dd6 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@PVg`V~B-+vP8iFj-`eUla^nu*AV7=mV3W_ z;XGEa#S9akO*?5U`R?xS;~#$AG~O^{#T1c_U;qESO=YX(^lOuxE!W6<_;r)I|2&6E z9-f&;rzZTm_K~mc=k56hcPhS!E{|Jt;Ihw`{}W@a|F4fX_`iSlI;lI=J^@nt44G_} z)~c!;XV$--dxpWdWdWnYS-v(W9(KJwtk%_4`PMcu4h-uV4Q7A*DY=~Sg_(2fK?W)1 zgodjOPG;JgnvRhX3?9YlyMER4TITh%urQz4*pOs(CN1Zj8b`-QNucp6(Z)X;8W|a4 XZ>F&uxQ2WM`jx@c)z4*}Q$iB}RFitP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/tool/rose_gold_shovel.png b/src/main/resources/assets/astromine/textures/item/tool/rose_gold_shovel.png new file mode 100644 index 0000000000000000000000000000000000000000..14ff2eb25038c576346d42b1cb919741230d3897 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaHFS-V~B-+vP8iFj-{PUp7Z?vJARq0?k`am zyU%q}+=gfA<$28?f3bf4zx(B?M&4wm(?SdiXLTp18{OGm-v98)L}i|5W@Z7BN<0qN z{`|UW%oeDrxq^rDz-1qiH*b`8mo@EWD7Fh^ShCYN_V4~S8S~Uxjx{;63f)*eHt%6k zKitTjFPUfa%PVTi!rMLk2{U|Foh@Kh=vBCNFrXvx-#2v^YiU*439BTT8~*t8>|ePKD&qcmVS0>El+Qylp+~IrT zyoOp6&xGIrw$1nV)t(lZH_7ip8V~0LMTPY>fB!T-JULmNWp1w!+q|?z|8GXTH@LH> zj`hs+i4zkQL{bZw9cIb$v`X;BRB&$-O|j+>Hfj+Rd!;bjaaO*~udYWaGty$>7a!9IOD5)=eZtJf#&E(eb1GNCtT3R*7(8A5T-G@y GGywqQXL!m0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/tool/silver_hoe.png b/src/main/resources/assets/astromine/textures/item/tool/silver_hoe.png new file mode 100644 index 0000000000000000000000000000000000000000..259fbe21bf2f687d539b5b8cfbd26da22fcc04af GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaJQ$6V~B-+@&XY9r_416G|gVxPdT|E|D(;G zEJFs5&u`Pu|9fv!#L_d7*O{%tH?+8fIeXQa(GnYQN;4 zys4dUdZ1>;TNlO&&(4*6{m&&7vxHsg%rn{L_Y7<*KK52bJ2p%>YtV2tWY-NIW{qW+ lucq-ZT=LkK_KA_1nSrAzD!(ZI0|(F>44$rjF6*2UngE@CZN&fp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/tool/silver_mattock.png b/src/main/resources/assets/astromine/textures/item/tool/silver_mattock.png new file mode 100644 index 0000000000000000000000000000000000000000..84a3d50d695173c5c0e6972975c399f884b31c08 GIT binary patch literal 416 zcmV;R0bl-!P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz0X0cPK~y+TV`M-A z|NsAovM>Q7BZ^WuV1m+kfop8if0vjMLKjHL(x|2IxGYE*w$S{I*~g0DPX978PplT!{b&Pkg5&v_=#Z?W@-SMq5y zWbXU>MpEK@{QiITn-X6%aC#kP^!Rw@oS4DydwZ)Btjtb`A9X#!aF{`&A+xRV(-)Nu ziu2MI{Wt#e!tz;hZAY4s;U~?+z#K3%^GAHG?pFCIrc24sX=1) jN2UpGn@lJ3OGq%Nsdl`3AmqFT=xYW~S3j3^P6CS6k zIFHq9F~fvsGw15^e1CU0x#HU|(+D505D}NZ>HBxibc}17oOo=Rd&1!lyB?gJtR5i8 z?3@~>HluFq;-BK&v%=MxkEf4;u{|N3Vy*uKjNPdUczFw61W zx&9*d&+6va4G-`rW-xecZeA#GxRE>m;JLi{CbDvR3Jup8W}N-;r{^+5$?S!P5*T^~ z4Gv^6D9)ZbWy%5_9fl=4jbs1rZ<8^1b82FI65(Jdn`Ug5F3fV|Mvr)d$)vS2YYrS> aVA%5_)p=XZH))_>89ZJ6T-G@yGywqLG=RbY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/tool/silver_shovel.png b/src/main/resources/assets/astromine/textures/item/tool/silver_shovel.png new file mode 100644 index 0000000000000000000000000000000000000000..daf5bf7f5e8dec95ad645fac12fe7c392ed7520e GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaHFS-V~B-+vP8iFj-{PUej7diJARq0?k|z| z_P*<+xDC&4pP$$G@z2-S|5sb?YUE93IxWPYaMsv5TH@W^-Ny@_Jn>|cE-qfdBgm$Z zUH9#mY4em78X;{g4>Hxb%D$abc0Ul;U^!od;nJO%>;A<%_supst6*n#)?zW!lE}EG z$qx^-Zs#$Vt5wxKbs_f{yMd3|)wCT<6Wj#eCTJWnsQ)dzXm0N$K98$Cj1F~b$L@!) b@bEAwolT#{r#f>x(D4kOu6{1-oD!MIHqC!lZcL z=Aq@1ssgMPI}grs$PtL0H}A-X|4%&G+>49b?%Yyqi~e2yu)l1=vMaaPHux$?JLWjm z9h2()W){X{Jbi5nM`5{QhH)Fq2~mahH9!7LeRy)RI?LSNM@;_47yoC;e>aHPStopE z`oxKe3L>cm%nq|;d0Hj-Vk)?|iKbX{2phEsioH^p?Kmsn=2zFFlo@F;ag4heo;Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T&d0{H?8f{0d15Cr`Kf`y%6tr!g!k{}j7 zV$@VZAm(9+BoS@YxWB{vmy>a4XX0eDyTLzP=AL`cow?_E&z-s;0rzfPo12`Nv3~Qq z273aHoxgQ6@g3ESR0`OA_?Y!q{`zLm*{NxJetbI^oV#?jrWKG2pNSai=?Ol6_+)K% zd@3BReIzOXSI6>eTGt0(N5=|nxhNsE2MF!Ewpy!iX)5G_T1F}bDCRxtn;PdO#acz8 z0wg3BCk(8g7alAJ4@h+i@QgbOYyKFF6A-$Xi^nO#uLH%_f+%mL6=(|JoF~)!SSQPm zjE~wTkDfgp{P;35FY|K}3{Os*Fl{ZZ79s*6@^i)N;MLQ|M*BK~V^qA=P)FntP#YV5 z{oWdaZrHN1U`+&h{-obFj^J+whJx=oa~$J=mo-|?yLhM8gNb(oHg1Z`^Hd8g32I{i z!La`K+(vAyD>@qhKk45YiEf@QhbH35L(I1J9_Y?EfDj z60OjC_s*P>7cqROv#X+(Q_cd5;Yo?5urGnD1$$0)1bYwek1e(qf@B5clNL(g23QTi z>baTGV6eA89La`61(2<&*eHZJ>#G6O9aNzxBP%k;bKG4bdcOPE1q;m(tuk3z>$504-=nW0FJ=TJGO;XaejDML!(ceOSt1*oyG%LbMnjy%LAe{FX5FV z(jc<}_^4f^!iy3#7a<8n<1!^g`N8joRuc*((ddu8=nH4_o6N^NrL`17{4*vRUX|Ve z8XhUQ6f!G-kNCP@ALV9=l@W%UB+$I)mk|CY$~;Feyv&PVG^Y|{qIFD*2Jom~3X2i~ zR^sLx8vwE}jg89Mn)m!PtSNpP0{K&iT{=A{U^t*3!p9WYjmABc~J;57R1mK&A>NK!u0h}H&0Gsl>x0hZM7F(4}< zsFcB2F@Bo(_)`QQP3y`H3xW3LMoT(Wdu)h*d~8B7t-HKjSp0D@s&`^Zz`GDQ&Ye{= zNa5^({!(0-?T-*ih?<|W7vSC;OFm}(y!a_e<2I?>A}ob4{{r&>xn|S?9?>zasq`Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T$q7&30q{H55mmZb9S@;nKPF)9*@W4@pwEQkH_Qjc>W!!dK<8_v0kGs-#(g5Z>L#Y zU2BL*66t#Tjfv@5Gc_}5laO>85`gHJyP_!^oYt=-o5%{-+ub*X@oV|cR`m%xk*vLR29y_1uvi(*kt&s!??8x@mA2xp3 z^ksMF`hxgYCXEQh2n1G375k%)U$!flBqRYl1>6yq$ouP?NWpGGl7O88Y_w?$%-KrjU~;s{1Og58SXnvy{*_sDK#>^7(szgW7qExQ6dr)!@H`B?E0EWhFp zk1v7*DH%W6O0ZgxAHqI}dz-Zh&>w@_hwzJrZQ$t4>GAyNB(S0F^~qE#Uk57JPdo=M zo}+kh?;$?!Z;_@SzP-FsxW&{!9iUEAYC|)2wDqhtVCru|nFR7QuW=BB;Bg{92#JPgPc2qnGix*?w0pEZ^ UEl_PHApigX07*qoM6N<$g4wqG;s5{u literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..2eee5d62d0c80dafe0e201ffe4ed3eb61333e804 GIT binary patch literal 1099 zcmV-R1ho5!P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T$SK~!i%?U_Gl z6hRcmH;0W;k%S1w1i?ln78=ARrcsC@3Kl7>EQEAcT3BhNm4#Mzf`xSo3lS8o;#pWE zA_*oILP$)|kRa;Wi1B{U{f_6ld%JOSxxL^A!_Av{vpetq%wAiNf}8gquC9DrvVO<5 zF8c)NARrObR$P&~N>(l`Z!Bx$?z+CuiOUH!fdnX$6$R-&8!Cm=4}AeXzD1 zDqu4pRROpuldq%LA>9ObSrUd+e+#z$e94MXCZM zBo-$O0K$XK-~pMc0KZA4u;t5Ol7P^0E}o- zFANO@^Go0V$oy6bKFyji-Mu{)A_5_@z5Pe;-hQ|rN-*^f4E>#ICPfh9q03?LYmfBfQ! z(O4KO;i^4dTWyTKw;a5zky3aT&jeC1V|oWbVO~Ma!e2R{UQFJ4FlxNlFAXR1T)lnQ zczm4q9XM>ltBL@;rabYg=^@bYm!n`Qfe=y&MR>-Wo&>|+h6B$iQuhCk5UEzU|LFOu zk{2;Na{gpfEvK9X*29xhkHY>4ToeqSI2sHbIhJ_XS_@JYK+-}9+yILJtiG^P3SQ1k zh9miqssOSzCpHd3)cPWTa|fqTl#v&?<2mUr5v}h&cEMWs;q?^+)T4brEk~q!Ko)S; zAM78jy_op)0#E`E?LQb&@%-?xhDM(_mvAHJP8$zk&DrB;EDwm*yo6Vd$b#Go;H4aO zby0%mA|#<`T&9F5Kj`lGX+ohS8vXLS#c(#TnCECMg%JOYiH284ZvYLC6kHFv6~IgU zxnD2kW{H&%hMOeNyyuq?{wB&ir59f2#V?ww#F%K6Y0&^4_3L3>LVzkkV*@}Irm<03 zTl1cuhBd`cLm*#uNWR=aB@nbv$RtEhi$4o;CqZ0XmmO|{Y!b`Ifoj6M=LbGNcx=S? zf;I%8BkM@Zo{sjTV+f4p(7dNTu(%Wux0hZL~F(4}mg+S-7-+y*++G9g}<6{$wY2D@J!s1VgQ9Tn&0u!hzaFRRg%pirc2l^XvWwtLu zBq7fH9D4!oO*vMKku+(O$}Pf12=gy650Gm{E#MIy)0$>~(#nS*_yvhJKHuYY RdvyQ+002ovPDHLkV1n>j>s|l= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_2.png new file mode 100644 index 0000000000000000000000000000000000000000..cb816f2292cb42cfc7c366ab74ca4559d6e3f4c4 GIT binary patch literal 572 zcmV-C0>k}@P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T=oSt<@d%Ht1 zSt37Zf3UStb+u~ECn4($B>>T__NQw!9|l*lO=1PqFYB)JG8qZTY0iU6p1BWN2h@kS zeR{Y*)@y{XfLx*A7RrnM0s`sF2Ktqi^+-H+X>Q5)$DO=J5+txxnDIYs{IcoGo-Y-n z_;DtW2*d~kc6x9AM<2iJP%ufz0)7gFBP@~6oo=GwFdw}GQGr^oBNo5+Uu-jsU{rdH@Do&y)pQ9OkA5TEw9 z$jA>rI63R{-N2Ml#q4ZuyZiQ|_iL@7f>beU%d3Bir{dC1K;lvOKOhJ(S`)AtL4<^2 z03R`m7l==aSGA?d$O+I(>gBQ7Q4qlh^GzXfp`f^(6i>p^#kns5lts1&Js=?f0000< KMNUMnLSTX<1@#L6 literal 0 HcmV?d00001 From 607c0deea4c5dc65ddd655dc6a81d7dfea13b60c Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 24 Jul 2020 00:37:11 +1000 Subject: [PATCH 05/16] Revert "Mattock and Mining Tool recipes." This reverts commit 013ca50a348315531a9ea6cb49258ba75227d4f3. --- .../astromine/registry/AstromineConfig.java | 8 ++++---- .../data/astromine/recipes/asterite_mattock.json | 16 ---------------- .../astromine/recipes/asterite_mining_tool.json | 16 ---------------- .../data/astromine/recipes/bronze_mattock.json | 1 - .../astromine/recipes/bronze_mining_tool.json | 1 - .../data/astromine/recipes/copper_mattock.json | 1 - .../astromine/recipes/copper_mining_tool.json | 1 - .../data/astromine/recipes/diamond_mattock.json | 16 ---------------- .../astromine/recipes/diamond_mining_tool.json | 16 ---------------- .../data/astromine/recipes/galaxium_mattock.json | 16 ---------------- .../astromine/recipes/galaxium_mining_tool.json | 16 ---------------- .../data/astromine/recipes/golden_mattock.json | 16 ---------------- .../astromine/recipes/golden_mining_tool.json | 16 ---------------- .../data/astromine/recipes/iron_mattock.json | 16 ---------------- .../data/astromine/recipes/iron_mining_tool.json | 16 ---------------- .../data/astromine/recipes/metite_mattock.json | 16 ---------------- .../astromine/recipes/metite_mining_tool.json | 16 ---------------- .../astromine/recipes/netherite_mattock.json | 16 ---------------- .../astromine/recipes/netherite_mining_tool.json | 16 ---------------- .../data/astromine/recipes/steel_mattock.json | 1 - .../astromine/recipes/steel_mining_tool.json | 1 - .../data/astromine/recipes/stellum_mattock.json | 16 ---------------- .../astromine/recipes/stellum_mining_tool.json | 16 ---------------- .../data/astromine/recipes/stone_mattock.json | 16 ---------------- .../astromine/recipes/stone_mining_tool.json | 16 ---------------- .../data/astromine/recipes/tin_mattock.json | 1 - .../data/astromine/recipes/tin_mining_tool.json | 1 - .../data/astromine/recipes/univite_mattock.json | 16 ---------------- .../astromine/recipes/univite_mining_tool.json | 16 ---------------- .../data/astromine/recipes/wooden_mattock.json | 16 ---------------- .../astromine/recipes/wooden_mining_tool.json | 16 ---------------- 31 files changed, 4 insertions(+), 364 deletions(-) delete mode 100644 src/main/resources/data/astromine/recipes/asterite_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/asterite_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/bronze_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/bronze_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/copper_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/copper_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/diamond_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/diamond_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/galaxium_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/galaxium_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/golden_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/golden_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/iron_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/iron_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/metite_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/metite_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/netherite_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/netherite_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/steel_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/steel_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/stellum_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/stellum_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/stone_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/stone_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/tin_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/tin_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/univite_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/univite_mining_tool.json delete mode 100644 src/main/resources/data/astromine/recipes/wooden_mattock.json delete mode 100644 src/main/resources/data/astromine/recipes/wooden_mining_tool.json diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java index 4b2fa5178..11e91b00c 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java @@ -510,16 +510,16 @@ public class AstromineConfig implements ConfigData { @Comment("Energy for the Fluid Extractor actions.") public double fluidExtractorEnergyConsumed = 1024D; - @Comment("Delay for the Block Placer actions.") + @Comment("Delay for the Block Placer actions (smaller is faster).") public long blockPlacerTimeConsumed = 40L; - @Comment("Delay for the Block Breaker actions.") + @Comment("Delay for the Block Breaker actions (smaller is faster).") public long blockBreakerTimeConsumed = 40L; - @Comment("Delay for the Fluid Inserter actions.") + @Comment("Delay for the Fluid Inserter actions (smaller is faster).") public long fluidInserterTimeConsumed = 40L; - @Comment("Delay for the Fluid Extractor actions.") + @Comment("Delay for the Fluid Extractor actions (smaller is faster).") public long fluidExtractorTimeConsumed = 40L; public static AstromineConfig get() { diff --git a/src/main/resources/data/astromine/recipes/asterite_mattock.json b/src/main/resources/data/astromine/recipes/asterite_mattock.json deleted file mode 100644 index 02b7b5398..000000000 --- a/src/main/resources/data/astromine/recipes/asterite_mattock.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "astromine:asterite_axe" }, - "1": { "item": "astromine:asterite_hoe" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:asterite_mattock", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/asterite_mining_tool.json b/src/main/resources/data/astromine/recipes/asterite_mining_tool.json deleted file mode 100644 index 1a70aaf2b..000000000 --- a/src/main/resources/data/astromine/recipes/asterite_mining_tool.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "astromine:asterite_pickaxe" }, - "1": { "item": "astromine:asterite_shovel" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:asterite_mining_tool", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/bronze_mattock.json b/src/main/resources/data/astromine/recipes/bronze_mattock.json deleted file mode 100644 index 0c873f179..000000000 --- a/src/main/resources/data/astromine/recipes/bronze_mattock.json +++ /dev/null @@ -1 +0,0 @@ -{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:bronze_axe"},"1":{"item":"astromine:bronze_hoe"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:bronze_mattock","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/bronze_mining_tool.json b/src/main/resources/data/astromine/recipes/bronze_mining_tool.json deleted file mode 100644 index 1a32651f8..000000000 --- a/src/main/resources/data/astromine/recipes/bronze_mining_tool.json +++ /dev/null @@ -1 +0,0 @@ -{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:bronze_pickaxe"},"1":{"item":"astromine:bronze_shovel"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:bronze_mining_tool","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/copper_mattock.json b/src/main/resources/data/astromine/recipes/copper_mattock.json deleted file mode 100644 index fab6760aa..000000000 --- a/src/main/resources/data/astromine/recipes/copper_mattock.json +++ /dev/null @@ -1 +0,0 @@ -{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:copper_axe"},"1":{"item":"astromine:copper_hoe"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:copper_mattock","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/copper_mining_tool.json b/src/main/resources/data/astromine/recipes/copper_mining_tool.json deleted file mode 100644 index aa48f5e69..000000000 --- a/src/main/resources/data/astromine/recipes/copper_mining_tool.json +++ /dev/null @@ -1 +0,0 @@ -{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:copper_pickaxe"},"1":{"item":"astromine:copper_shovel"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:copper_mining_tool","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/diamond_mattock.json b/src/main/resources/data/astromine/recipes/diamond_mattock.json deleted file mode 100644 index 5186feba2..000000000 --- a/src/main/resources/data/astromine/recipes/diamond_mattock.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "minecraft:diamond_axe" }, - "1": { "item": "minecraft:diamond_hoe" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:diamond_mattock", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/diamond_mining_tool.json b/src/main/resources/data/astromine/recipes/diamond_mining_tool.json deleted file mode 100644 index 9f5703f23..000000000 --- a/src/main/resources/data/astromine/recipes/diamond_mining_tool.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "minecraft:diamond_pickaxe" }, - "1": { "item": "minecraft:diamond_shovel" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:diamond_mining_tool", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/galaxium_mattock.json b/src/main/resources/data/astromine/recipes/galaxium_mattock.json deleted file mode 100644 index dbb4c42de..000000000 --- a/src/main/resources/data/astromine/recipes/galaxium_mattock.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "astromine:galaxium_axe" }, - "1": { "item": "astromine:galaxium_hoe" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:galaxium_mattock", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/galaxium_mining_tool.json b/src/main/resources/data/astromine/recipes/galaxium_mining_tool.json deleted file mode 100644 index a4afe88bc..000000000 --- a/src/main/resources/data/astromine/recipes/galaxium_mining_tool.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "astromine:galaxium_pickaxe" }, - "1": { "item": "astromine:galaxium_shovel" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:galaxium_mining_tool", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/golden_mattock.json b/src/main/resources/data/astromine/recipes/golden_mattock.json deleted file mode 100644 index a09473905..000000000 --- a/src/main/resources/data/astromine/recipes/golden_mattock.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "minecraft:golden_axe" }, - "1": { "item": "minecraft:golden_hoe" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:goldn_mattock", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/golden_mining_tool.json b/src/main/resources/data/astromine/recipes/golden_mining_tool.json deleted file mode 100644 index b85cab34f..000000000 --- a/src/main/resources/data/astromine/recipes/golden_mining_tool.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "minecraft:golden_pickaxe" }, - "1": { "item": "minecraft:golden_shovel" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:golden_mining_tool", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/iron_mattock.json b/src/main/resources/data/astromine/recipes/iron_mattock.json deleted file mode 100644 index a1a73006e..000000000 --- a/src/main/resources/data/astromine/recipes/iron_mattock.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "minecraft:iron_axe" }, - "1": { "item": "minecraft:iron_hoe" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:iron_mattock", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/iron_mining_tool.json b/src/main/resources/data/astromine/recipes/iron_mining_tool.json deleted file mode 100644 index 8b65315e2..000000000 --- a/src/main/resources/data/astromine/recipes/iron_mining_tool.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "minecraft:iron_pickaxe" }, - "1": { "item": "minecraft:iron_shovel" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:iron_mining_tool", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/metite_mattock.json b/src/main/resources/data/astromine/recipes/metite_mattock.json deleted file mode 100644 index d7e9110c1..000000000 --- a/src/main/resources/data/astromine/recipes/metite_mattock.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "astromine:metite_axe" }, - "1": { "item": "astromine:metite_hoe" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:metite_mattock", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/metite_mining_tool.json b/src/main/resources/data/astromine/recipes/metite_mining_tool.json deleted file mode 100644 index 47aae1b05..000000000 --- a/src/main/resources/data/astromine/recipes/metite_mining_tool.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "astromine:metite_pickaxe" }, - "1": { "item": "astromine:metite_shovel" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:metite_mining_tool", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/netherite_mattock.json b/src/main/resources/data/astromine/recipes/netherite_mattock.json deleted file mode 100644 index 22a03c607..000000000 --- a/src/main/resources/data/astromine/recipes/netherite_mattock.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "minecraft:netherite_axe" }, - "1": { "item": "minecraft:netherite_hoe" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:goldn_mattock", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/netherite_mining_tool.json b/src/main/resources/data/astromine/recipes/netherite_mining_tool.json deleted file mode 100644 index 8f7c050fd..000000000 --- a/src/main/resources/data/astromine/recipes/netherite_mining_tool.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "minecraft:netherite_pickaxe" }, - "1": { "item": "minecraft:netherite_shovel" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:netherite_mining_tool", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/steel_mattock.json b/src/main/resources/data/astromine/recipes/steel_mattock.json deleted file mode 100644 index 64ad99a88..000000000 --- a/src/main/resources/data/astromine/recipes/steel_mattock.json +++ /dev/null @@ -1 +0,0 @@ -{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:steel_axe"},"1":{"item":"astromine:steel_hoe"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:steel_mattock","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/steel_mining_tool.json b/src/main/resources/data/astromine/recipes/steel_mining_tool.json deleted file mode 100644 index c6cc2af6a..000000000 --- a/src/main/resources/data/astromine/recipes/steel_mining_tool.json +++ /dev/null @@ -1 +0,0 @@ -{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:steel_pickaxe"},"1":{"item":"astromine:steel_shovel"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:steel_mining_tool","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/stellum_mattock.json b/src/main/resources/data/astromine/recipes/stellum_mattock.json deleted file mode 100644 index 6d03a6130..000000000 --- a/src/main/resources/data/astromine/recipes/stellum_mattock.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "astromine:stellum_axe" }, - "1": { "item": "astromine:stellum_hoe" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:stellum_mattock", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/stellum_mining_tool.json b/src/main/resources/data/astromine/recipes/stellum_mining_tool.json deleted file mode 100644 index 678f195e1..000000000 --- a/src/main/resources/data/astromine/recipes/stellum_mining_tool.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "astromine:stellum_pickaxe" }, - "1": { "item": "astromine:stellum_shovel" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:stellum_mining_tool", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/stone_mattock.json b/src/main/resources/data/astromine/recipes/stone_mattock.json deleted file mode 100644 index add16c56c..000000000 --- a/src/main/resources/data/astromine/recipes/stone_mattock.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "minecraft:stone_axe" }, - "1": { "item": "minecraft:stone_hoe" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:stone_mattock", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/stone_mining_tool.json b/src/main/resources/data/astromine/recipes/stone_mining_tool.json deleted file mode 100644 index 8be803d23..000000000 --- a/src/main/resources/data/astromine/recipes/stone_mining_tool.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "minecraft:stone_pickaxe" }, - "1": { "item": "minecraft:stone_shovel" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:stone_mining_tool", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/tin_mattock.json b/src/main/resources/data/astromine/recipes/tin_mattock.json deleted file mode 100644 index 5727b1b5b..000000000 --- a/src/main/resources/data/astromine/recipes/tin_mattock.json +++ /dev/null @@ -1 +0,0 @@ -{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:tin_axe"},"1":{"item":"astromine:tin_hoe"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:tin_mattock","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/tin_mining_tool.json b/src/main/resources/data/astromine/recipes/tin_mining_tool.json deleted file mode 100644 index b8ad38601..000000000 --- a/src/main/resources/data/astromine/recipes/tin_mining_tool.json +++ /dev/null @@ -1 +0,0 @@ -{"type":"minecraft:crafting_shaped","pattern":["012","345","678"],"key":{"0":{"item":"astromine:tin_pickaxe"},"1":{"item":"astromine:tin_shovel"},"2":{"item":"minecraft:air"},"3":{"item":"minecraft:air"},"4":{"item":"minecraft:air"},"5":{"item":"minecraft:air"},"6":{"item":"minecraft:air"},"7":{"item":"minecraft:air"},"8":{"item":"minecraft:air"}},"result":{"item":"astromine:tin_mining_tool","count":1}} \ No newline at end of file diff --git a/src/main/resources/data/astromine/recipes/univite_mattock.json b/src/main/resources/data/astromine/recipes/univite_mattock.json deleted file mode 100644 index 02660802a..000000000 --- a/src/main/resources/data/astromine/recipes/univite_mattock.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "astromine:univite_axe" }, - "1": { "item": "astromine:univite_hoe" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:univite_mattock", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/univite_mining_tool.json b/src/main/resources/data/astromine/recipes/univite_mining_tool.json deleted file mode 100644 index 375ffd020..000000000 --- a/src/main/resources/data/astromine/recipes/univite_mining_tool.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "astromine:univite_pickaxe" }, - "1": { "item": "astromine:univite_shovel" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:univite_mining_tool", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/wooden_mattock.json b/src/main/resources/data/astromine/recipes/wooden_mattock.json deleted file mode 100644 index d70814596..000000000 --- a/src/main/resources/data/astromine/recipes/wooden_mattock.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "minecraft:wooden_axe" }, - "1": { "item": "minecraft:wooden_hoe" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:wooden_mattock", "count": 1 } -} diff --git a/src/main/resources/data/astromine/recipes/wooden_mining_tool.json b/src/main/resources/data/astromine/recipes/wooden_mining_tool.json deleted file mode 100644 index 54686d484..000000000 --- a/src/main/resources/data/astromine/recipes/wooden_mining_tool.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": ["012", "345", "678"], - "key": { - "0": { "item": "minecraft:wooden_pickaxe" }, - "1": { "item": "minecraft:wooden_shovel" }, - "2": { "item": "minecraft:air" }, - "3": { "item": "minecraft:air" }, - "4": { "item": "minecraft:air" }, - "5": { "item": "minecraft:air" }, - "6": { "item": "minecraft:air" }, - "7": { "item": "minecraft:air" }, - "8": { "item": "minecraft:air" } - }, - "result": { "item": "astromine:wooden_mining_tool", "count": 1 } -} From fa1e2d5e4fb529a5aff31d795eba92bbf777c72b Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 24 Jul 2020 00:40:52 +1000 Subject: [PATCH 06/16] Revert "silver and rose gold textures" This reverts commit 673fd19cb71f597e2b22c44e1c159f8bb165ca86. --- .../textures/block/asteroid_silver_ore.png | Bin 649 -> 0 bytes .../astromine/textures/block/rose_gold_block.png | Bin 285 -> 0 bytes .../astromine/textures/block/silver_block.png | Bin 285 -> 0 bytes .../astromine/textures/block/silver_ore.png | Bin 291 -> 0 bytes .../textures/item/armor/rose_gold_boots.png | Bin 283 -> 0 bytes .../textures/item/armor/rose_gold_chestplate.png | Bin 358 -> 0 bytes .../textures/item/armor/rose_gold_helmet.png | Bin 306 -> 0 bytes .../textures/item/armor/rose_gold_leggings.png | Bin 288 -> 0 bytes .../textures/item/armor/silver_boots.png | Bin 286 -> 0 bytes .../textures/item/armor/silver_chestplate.png | Bin 357 -> 0 bytes .../textures/item/armor/silver_helmet.png | Bin 308 -> 0 bytes .../textures/item/armor/silver_leggings.png | Bin 289 -> 0 bytes .../textures/item/asteroid_silver_cluster.png | Bin 445 -> 0 bytes .../astromine/textures/item/copper_boots.png | Bin 0 -> 285 bytes .../textures/item/copper_chestplate.png | Bin 0 -> 361 bytes .../astromine/textures/item/copper_helmet.png | Bin 0 -> 308 bytes .../astromine/textures/item/copper_leggings.png | Bin 0 -> 294 bytes .../astromine/textures/item/rose_gold_dust.png | Bin 339 -> 0 bytes .../astromine/textures/item/rose_gold_gear.png | Bin 385 -> 0 bytes .../astromine/textures/item/rose_gold_ingot.png | Bin 384 -> 0 bytes .../astromine/textures/item/rose_gold_nugget.png | Bin 240 -> 0 bytes .../astromine/textures/item/rose_gold_plates.png | Bin 379 -> 0 bytes .../astromine/textures/item/silver_dust.png | Bin 338 -> 0 bytes .../astromine/textures/item/silver_gear.png | Bin 385 -> 0 bytes .../astromine/textures/item/silver_ingot.png | Bin 391 -> 0 bytes .../astromine/textures/item/silver_nugget.png | Bin 240 -> 0 bytes .../astromine/textures/item/silver_plates.png | Bin 379 -> 0 bytes .../astromine/textures/item/silver_wire.png | Bin 367 -> 0 bytes .../assets/astromine/textures/item/tin_boots.png | Bin 0 -> 285 bytes .../astromine/textures/item/tin_chestplate.png | Bin 0 -> 364 bytes .../astromine/textures/item/tin_leggings.png | Bin 0 -> 293 bytes .../textures/item/tool/rose_gold_axe.png | Bin 312 -> 0 bytes .../textures/item/tool/rose_gold_hoe.png | Bin 294 -> 0 bytes .../textures/item/tool/rose_gold_mattock.png | Bin 414 -> 0 bytes .../textures/item/tool/rose_gold_mining_tool.png | Bin 341 -> 0 bytes .../textures/item/tool/rose_gold_pickaxe.png | Bin 331 -> 0 bytes .../textures/item/tool/rose_gold_shovel.png | Bin 284 -> 0 bytes .../textures/item/tool/rose_gold_sword.png | Bin 354 -> 0 bytes .../astromine/textures/item/tool/silver_axe.png | Bin 312 -> 0 bytes .../astromine/textures/item/tool/silver_hoe.png | Bin 294 -> 0 bytes .../textures/item/tool/silver_mattock.png | Bin 416 -> 0 bytes .../textures/item/tool/silver_mining_tool.png | Bin 341 -> 0 bytes .../textures/item/tool/silver_pickaxe.png | Bin 331 -> 0 bytes .../textures/item/tool/silver_shovel.png | Bin 284 -> 0 bytes .../textures/item/tool/silver_sword.png | Bin 352 -> 0 bytes .../textures/models/armor/rose_gold_layer_1.png | Bin 1109 -> 0 bytes .../textures/models/armor/rose_gold_layer_2.png | Bin 582 -> 0 bytes .../textures/models/armor/silver_layer_1.png | Bin 1099 -> 0 bytes .../textures/models/armor/silver_layer_2.png | Bin 572 -> 0 bytes 49 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/astromine/textures/block/asteroid_silver_ore.png delete mode 100644 src/main/resources/assets/astromine/textures/block/rose_gold_block.png delete mode 100644 src/main/resources/assets/astromine/textures/block/silver_block.png delete mode 100644 src/main/resources/assets/astromine/textures/block/silver_ore.png delete mode 100644 src/main/resources/assets/astromine/textures/item/armor/rose_gold_boots.png delete mode 100644 src/main/resources/assets/astromine/textures/item/armor/rose_gold_chestplate.png delete mode 100644 src/main/resources/assets/astromine/textures/item/armor/rose_gold_helmet.png delete mode 100644 src/main/resources/assets/astromine/textures/item/armor/rose_gold_leggings.png delete mode 100644 src/main/resources/assets/astromine/textures/item/armor/silver_boots.png delete mode 100644 src/main/resources/assets/astromine/textures/item/armor/silver_chestplate.png delete mode 100644 src/main/resources/assets/astromine/textures/item/armor/silver_helmet.png delete mode 100644 src/main/resources/assets/astromine/textures/item/armor/silver_leggings.png delete mode 100644 src/main/resources/assets/astromine/textures/item/asteroid_silver_cluster.png create mode 100644 src/main/resources/assets/astromine/textures/item/copper_boots.png create mode 100644 src/main/resources/assets/astromine/textures/item/copper_chestplate.png create mode 100644 src/main/resources/assets/astromine/textures/item/copper_helmet.png create mode 100644 src/main/resources/assets/astromine/textures/item/copper_leggings.png delete mode 100644 src/main/resources/assets/astromine/textures/item/rose_gold_dust.png delete mode 100644 src/main/resources/assets/astromine/textures/item/rose_gold_gear.png delete mode 100644 src/main/resources/assets/astromine/textures/item/rose_gold_ingot.png delete mode 100644 src/main/resources/assets/astromine/textures/item/rose_gold_nugget.png delete mode 100644 src/main/resources/assets/astromine/textures/item/rose_gold_plates.png delete mode 100644 src/main/resources/assets/astromine/textures/item/silver_dust.png delete mode 100644 src/main/resources/assets/astromine/textures/item/silver_gear.png delete mode 100644 src/main/resources/assets/astromine/textures/item/silver_ingot.png delete mode 100644 src/main/resources/assets/astromine/textures/item/silver_nugget.png delete mode 100644 src/main/resources/assets/astromine/textures/item/silver_plates.png delete mode 100644 src/main/resources/assets/astromine/textures/item/silver_wire.png create mode 100644 src/main/resources/assets/astromine/textures/item/tin_boots.png create mode 100644 src/main/resources/assets/astromine/textures/item/tin_chestplate.png create mode 100644 src/main/resources/assets/astromine/textures/item/tin_leggings.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_axe.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_hoe.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_mattock.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_mining_tool.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_pickaxe.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_shovel.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/rose_gold_sword.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_axe.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_hoe.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_mattock.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_mining_tool.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_pickaxe.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_shovel.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tool/silver_sword.png delete mode 100644 src/main/resources/assets/minecraft/textures/models/armor/rose_gold_layer_1.png delete mode 100644 src/main/resources/assets/minecraft/textures/models/armor/rose_gold_layer_2.png delete mode 100644 src/main/resources/assets/minecraft/textures/models/armor/silver_layer_1.png delete mode 100644 src/main/resources/assets/minecraft/textures/models/armor/silver_layer_2.png diff --git a/src/main/resources/assets/astromine/textures/block/asteroid_silver_ore.png b/src/main/resources/assets/astromine/textures/block/asteroid_silver_ore.png deleted file mode 100644 index 519645e98ad7012ef17f49c788369dc5741bde6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 649 zcmV;40(Sk0P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz0v<_3K~y+TT~fhr z+CUWCwG9Of1qvjjO)5m1&~m7h=D;P26y+fBxF9uxNQtbt z2|`hEC1@1tfU%A3?U=2ssC!t=?!I|5@4cmsM#Hx4QmK?oCg*d@FdkE>q#)2tCJk(w z^L#!h%kgfvXWI@Tg#OU=e!u^<)e=R~vMfOm03=CtT`!eNr_;}MeMl+EzpEb9YUOg7 zo}8Y(EEIsi1{1qJ9$zoP&u-WE{nxv@z{f{N*xQ{B{irBFl_g=XR>L0Bu!D&w+~e|F zr}NA(XtUWw8Z0=0AI6yHdAZHakPLAioo8&Za3tHdZf^RHV@DzpLYVIdgdI_6Ep@QC zRL*C3K@VuXUWZFw5FWUnFP}b3k`#+YE0wnaiIB-;f;J2W1A5kOhoQV&PDXvecjxC| z!Yw?5u<>ChARzAk_Lfr0YZx*1v{2-FsxM{|azdc8oWKyK(5N)@AQj{ z)zu<&*4JM_b~x0L9yMs1=DIFiNQmP(z`<$}GVJwGjAfaq5>nA<6v~Ba6)~81@HHS; zAOxiU<_$gv$jEzuWAHUrC`G1tJdQKE^m}O?WF!LMzbG_96-7a#RaJvyeC*k5wzgJe jEMUSIA~1olM|SPJa^m>?>(_yjxPbJo8xMhUoCO|{#S9F5 zhd`K7RKu$QC|Ks{;us=vS@!Hj-opw!Ee~I_on%|PW}o>HW`<+TE`~f8n11&MsIQ;@ z<^ICgCUcb^hPRj$J8eJUCS{mXzCw_%b&ETP=)*Mmlx?x?Hi}v?x;Y#CqFRO0o`o^V z7rfXf@Nw_K)t7~XDi>~ftt_*l>Y#NJ>$RsFAMkHDprE*#_wPB7lRaJiT-G@yGywpz Ca$h_E diff --git a/src/main/resources/assets/astromine/textures/block/silver_block.png b/src/main/resources/assets/astromine/textures/block/silver_block.png deleted file mode 100644 index 26eb3334921b0d2d3c1b0ee1c18330ec2a8fc3ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF%ZcOE%%{K}Q<_wNHGae;N*R||l0oCO|{#S9F5 zhd`K7RKu$QC|Ks{;us=vS@!Hj-opw!Ee~I_on%|PW}o>HW`<+TE`~f8n11&MsIQ;@ z<^ICgCUcb^hPRj$J8eJUCS{mXzCw_%b&ETP=)*Mmlx?x?Hi}v?x;Y#CqFRO0o`o^V z7rfXf@Nw_K)t7~XDi>~ftt_*l>Y#NJ>$RsFAMkHDprE*#_wPB7lRaJiT-G@yGywpo C`Ck$M diff --git a/src/main/resources/assets/astromine/textures/block/silver_ore.png b/src/main/resources/assets/astromine/textures/block/silver_ore.png deleted file mode 100644 index b88ab405c8f9e1d6a3fcd785e05c67f8771ebb58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFt%^+TnZQo)zm&PIGJ1)sl-eXXv;*eYo;|h{E&Q&Al#NwY*0Q>mzZX#zPM7{4@f787Z+@HuacMs=NMTRy;g$7?m zGedy`1`N}kVi;C)+tpWarwXzaFgq|V%}ro?n#eR`VVK!Bo)e6mW(<+W9uIGCpP|Rl z+4!V_wIz_JaW{hs=jEEuzeHDPu-H_7V$o~MW3*Y=Aad})y3^Y?sEK_sY4E-~fr*EQ ZVf)pz!2CJ$*8|`{NV2l6& diff --git a/src/main/resources/assets/astromine/textures/item/armor/rose_gold_chestplate.png b/src/main/resources/assets/astromine/textures/item/armor/rose_gold_chestplate.png deleted file mode 100644 index a085fd0811abcfc2945bb07c73ad6f65bb8aa8b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@VBRnV~B-+vP8iF4y8#pbN@A0dL-QYR-0fc zabRg1=c%-enKqLTn%hisynTR2tBG^N%0}sePbUQ1s?GD8ZWeK!(lBefp8E^_5SSHEhkd^St zv8F=d5QAQ?0z;9V)d2$rmJgCmd#XE!jka5XZvF)A>0hm|y}o5|JC$jIPrSa-=P`i|OAuW7816yQi=?V^(IrlftP5k^WmuI)$eW#0ud6phzSQdHx$`r>49~q6G^B*2R zKR;ooef@vK6I`7JfBt@2_we27?Y#+(3JFb@3K%y3e0`jsN8YZMX|w$OJ)Fy2MW!Aw zF-mB>q`|PHFs@#G%JBmqo}3hBix1ad!3_3@5|Eu3D9873TiTKv4p z^pHt&!-fq8Q(74!co{N({duS>^O!k;x1llFov+F8#LFEFZHxx$%_dEMxDF}QKW2)E zZFrX>DJiMJE&SjslOe-lhMY#WuKJk9&a15X_mjeVd}WR@Oz>Tj!N$lV-ryt?z2dQu ee8zzT3=FIPCAn>!E&K%N0R~T3KbLh*2~7YCIA!Mm diff --git a/src/main/resources/assets/astromine/textures/item/armor/silver_boots.png b/src/main/resources/assets/astromine/textures/item/armor/silver_boots.png deleted file mode 100644 index 33e486e78fa05aac1967c210be1301c6befe0638..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaI>e2V~B-+vc#_jL9fG&!8w=eH6|zCe^i-J znUfU3=<)Dv`uTt73o{_v(J|qzbYXFgq}&rY+!on#eR`;Wx7|o)e6mW(<+W9uIGC&p()x z!XU(al9T(xA_=B)#t7w*&r@HUFI*(>;mJwi9TK}(KeR9fu`qA{_WsbUhzpk)^h%w% c3=9|;ex;^6az_^H0iDm_>FVdQ&MBb@0JlV8?f?J) diff --git a/src/main/resources/assets/astromine/textures/item/armor/silver_chestplate.png b/src/main/resources/assets/astromine/textures/item/armor/silver_chestplate.png deleted file mode 100644 index d24d752005cdb6907cab78bd1ad3547f484810f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@Rz5HV~B-+vP8iF4y8Fslm9hWdL-O`RGDBY zabRg1=c%+AH*X#ikbZJHA#DM#=s}hnR}S!66n#=Te75@gft*xUOA%?uoCy+}q$Cm= zFKGycx&0DgyCN_lEs-&f=d1#Q`GaeB*?A5fI+W0A_Uu`L;S9$UQuphAocZwWZL|iz zR7X}{Uc&4WldF<7v2z`K3=X6zpID@QJ>TiZ?{dRMEhZ-xoZ91KAU!)xAYyx}dW7KDV!rm$a+>!H{;p=8uGrc4tRJ zX37DkrGX3{$9 zG~i+QDW0Ys$si(})t4vnl0l`-w?@RkfPtY#)%zI#AzdG!rx-k4{an^LB{Ts5g%N94 diff --git a/src/main/resources/assets/astromine/textures/item/armor/silver_leggings.png b/src/main/resources/assets/astromine/textures/item/armor/silver_leggings.png deleted file mode 100644 index b9f10df1365e070eb6cfef06ad118411ebdfa81a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaGR%#V~B-+vP8iFj-?L|XqvsWpVG-V&!+NF zLH2(=5nBzJ3D0gQ#Is2k7aROPadL9PuV;I!6MkL0%gz(N?!Jp*3#Zp&h6%@Zo}S)p zddQ@?VZ#Q4DXk04}GvnkVGu0sm-kC`H3 z8{XweN=j;Q3qSbEWXN!sA*Ye8t3IZ&^DcM(eW%D346`k|7!ziDT;O4n&|_$|*cNbH e)$T$=BO}9}uq4Nn%c3A}F?hQAxvXPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T?+cxi^5x^Py;J4X~%l=&~_#9=!jO+k^9u9miVgLpNLCAOUA2WSi$1i^?vS>^ty2+H%E=V3BP(p>>TQiWs|GxigJNPX7= ngAr0E@gYE!3cLLlo)pnPG>Ei9b+D|600000NkvXXu0mjfwYIo% diff --git a/src/main/resources/assets/astromine/textures/item/copper_boots.png b/src/main/resources/assets/astromine/textures/item/copper_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..755c563bf013eb9e0df17b8f3d00759c29a5d3c2 GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!A+hnjv*HQ$r8UB1icO)v?+b}KS0g-(%JP1 zl{rZfj2;jF^MC(eZ*TLso=IFeMp&;3o{adWJBQw7-ym>n2Jqr{k>CNj-fc(t>Q=L93C8AGJ8$HUjr>ksCn zFbFZ9^pu#nNP?-H(L-oi<+Y3I0f8JAUw%l(@Z4ppaAMSKYGl3tFWFb;MJB`aU5cy{ a5)AeG(`2&xs_KERXYh3Ob6Mw<&;$TTwOyhB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/copper_chestplate.png b/src/main/resources/assets/astromine/textures/item/copper_chestplate.png new file mode 100644 index 0000000000000000000000000000000000000000..425b0aa583c4996775cae9c8c65abb493e9a0dc4 GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!GE4Ejv*HQ$r1$zIFz2PEdI~_d4j{Gv+ENq zB@V1+Q~CM-@ZbOU`Op9OUzzu-KBud2Wg^pQri1;bttJ26vEom=y=%qd8yrc^MzvqEmmBxX4_uzDHC#BJ<#4Dl6NGr{@#Tt_wyF-gXW&ewiCx|7*< zeS4g9Wq`O$)t}zPYZuiMIK@nzHv~H}ED^jLHbH7a)C4&J2I&nCZr8gBuz4O}Fniv_ z;KA!-+riJzEOB6|AdAB}cXkQ31_nFl3yf`yH*y#mV;*U&)NSnkSU+nkkA>L=#t4Q( zfB2a+fNJ!dH)OIg@-RCvq;O2>WV&D)%xGZ1z#!{BgF$naU_US<7(8A5T-G@yGywqj CTz=93 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/copper_helmet.png b/src/main/resources/assets/astromine/textures/item/copper_helmet.png new file mode 100644 index 0000000000000000000000000000000000000000..f6704b35c5e95d5b16ab99bfa7519ae8f242e386 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!IPdYjv*HQ$r8UB1icnFRKB|Nf1!`agp$wN zZB;ys6Vjr^OW8P;gI92{#KdjvO}utdorinhU-yfLd6phzSQe?K)Z2JkvGL*k`|ElB z-`mG<`tSd*jgFINw?2H|eV$jm&e)`hwXuQI>oDV)XY$j_jsEN`l{-^c_|9a8Sg0`T zb%7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/copper_leggings.png b/src/main/resources/assets/astromine/textures/item/copper_leggings.png new file mode 100644 index 0000000000000000000000000000000000000000..4626a8830ca6bcb9dfef059dafde99a76dafa218 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!QGxNjv*HQ$r1$zIF>$4m}m99UPG8!rs_{` z;=%3zHL3zE6wXd8u9CDUxqI-B{Pgmsm-gGwHNQNqz0L59)i0K#0%{t)Ob$}}*SuxO zZpmb03^WbY;AY$)#c=7%qdS=v$Jl{P=Cz;CHyfUKxr3pN(LlY~r0EaWA%*(KOcAjS z?{cgo^)$GJAADspWH`)_)5z9UAJf=*m34jo-nLBvjAn%*%noJ~7fG@N1SK(vD|;EW iEwzYw)XZpLz`)>tAhwbDdSw{U8w{SVelF{r5}E)#d}Ubx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/rose_gold_dust.png b/src/main/resources/assets/astromine/textures/item/rose_gold_dust.png deleted file mode 100644 index fec96f24a1852936197de7ed97901db5d5e94049..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@P(&~V~B-+@}K|z?U_{@IK3wGW@H~|Yvume zY%rx;^nnS(vcM28u5-uOHb^mCVz`u%m(2X^{_e`j3k|h-S1U@e9Wc?>)HJ-ayS)G5 z*UjlX6HlJx*~4^*r}E)JiM9nU%09+C2Y4)Z*4sBv+GTY^mH*wnq#0X^bd^Im53w55 zH<>gtoOt%M_<7S$gR{^2`gjf6{kOZdmAmHpP-UDh1hiB^ZeB&N71O3e4>FVdQ&MBb@08P4k>;M1& diff --git a/src/main/resources/assets/astromine/textures/item/rose_gold_gear.png b/src/main/resources/assets/astromine/textures/item/rose_gold_gear.png deleted file mode 100644 index d5e9e6504e0ba22daed38c7f6391e3840830a58d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engP5m_V~B-+@}K|z?U_{@IK3wG2Jm=%EBeQO zC_vBAj$?yE=7yA@M9Vq6iwZy9{d(p9`#mL-1&_3~GkOHX2DdvpM)o>-#?F0s@9gY^ zLWzb>+a1;251)P2=FwnNu`-oEF^vm^Eiljo}`)KDUU51}DiB;S&Y|Y?&=TrCS_}Hq1C6 z$*sUp%&Xzx$S}8GhFd~YaLJF8lhqS=HcQUz=L`76bV5`?D$PpKj$?s@1K)zYG$mOB b0|o}sHHX|j#}u3f1{;H?tDnm{r-UW|oq>!c diff --git a/src/main/resources/assets/astromine/textures/item/rose_gold_ingot.png b/src/main/resources/assets/astromine/textures/item/rose_gold_ingot.png deleted file mode 100644 index 36639c34ee03e9fc79347b3e8dd07336df8d81d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engQ%yAV~B-+@}K|z?U_{@IK3wGc9<#LJpI$2 z!+B>x!*%WxQd@Y>9QbmTd%483yxXTao-r`CF}|2J<;qn_m!(S%{JDO9p5dL{mBL2_ zHZZoBEZpq>?moYHi{Z)3FYAL6En|dSni=evr%ai0;Lof(C2V2>%qfd@E>?~Z5NF72 z%FJ1>l^zffmR#}a3Fi?8fdgqAo0diHjpfO|zmIiuYisL46OIGC42%;LC!RbRAh$|Q zg5hQl&jGfYe;=kbhBG9++FSiy;@g_|=3r%yw;Pq&55Ac@J-bV1vRfQxc-C5No^SN#&ZfS^=SycVX=UVSFtOiJ&3)=HUxsw=h6%@?)(A+j gc~&mqO-Nv1aQI`?Rr4!#4$wgip00i_>zopr0M7(a+5i9m diff --git a/src/main/resources/assets/astromine/textures/item/rose_gold_plates.png b/src/main/resources/assets/astromine/textures/item/rose_gold_plates.png deleted file mode 100644 index 46679d17995c5919a3ed903741fa264f1602faeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engMg=tV~B-+@}K|z?U_{@IK3XTo{T&9-%;X} zE31O|gF~M4{Qf)sxHO!v#%ro2s7&6%|7Kk_SOq@6|@q(GbVFQlYZW0ch%o7w7q+Us-^oE&zOOSe2 zV!+N3aEKx0_jCUIhqD|QmP`zHkjQzkceeS%Pa1Izna9{B>}{5*2vGF!VsSlrm3#St zu8F1smw1>o5*dm)&3Y9Y)=9Di@Gvk&Oi^lQHS0BKNMztRki)HJ-qoK^Gf zm#K46ic0ea27Tv(GPyQIjf)(Yd6*5HzszH=3$S$a0OxZMR z6VnZ~3EU2BhjQ2(x69iZ@2UMQc9dJfQ}UV3gkVQTb|!;fg@!efECtV4zX-Tr=U{fW dGd46}U})-X5LT{Ts}J-tgQu&X%Q~loCII|OaW?<} diff --git a/src/main/resources/assets/astromine/textures/item/silver_gear.png b/src/main/resources/assets/astromine/textures/item/silver_gear.png deleted file mode 100644 index 451044fe1ee9186bd57d8803092f7ca26c95be67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engP5m_V~B-+@}K|z?U_{@IK3wG2JjU0dH>@- z6rks5$Fad7b3;mHmCzjCMTH-)&b{;h{+;cU1&_3~GkOHL2hVl%jcjy`_3V83Y;Sc! zp+rOH-Ce&M9-jI-n@599!P>iFx^&KomE7SAl>`#f7VuvC^YC-{3J&JO_gsr5AI5d? zeoCDnB+9yZ{@%K?8}d&38A!7^eCm7lEWym9?&Ger31&A~4W2hMoG24uu#~*%Fk`yI zItIoW<`485EP0m{etuV*&}wivVOCA-T!TGqeQpsA4Nj6N!Y2#_*fLvwO1C%`ZJ2RD zl3RhHm{-HWkzsDX47Y@);F2FFC#xs$Y?hqa&lm8C>4d0)RGO8d9mfI*2fhV)X-cvN c1`G^quO6Cxu;#WBFxVJ8UHx3vIVCg!05vp?ng9R* diff --git a/src/main/resources/assets/astromine/textures/item/silver_ingot.png b/src/main/resources/assets/astromine/textures/item/silver_ingot.png deleted file mode 100644 index 63f463995a7455fd59847abed218b8f1ec4f0cb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engN&z(V~B-+@}K|z?U_{@IK3wGc9h;;X3yTsWUuV4t`n59WMDzZ`Ns!XAF#Oj4x(gnL0&ciHqyOKk4h^jqmI!=RYd2 zfw9G8;pXr2Z8*(aE^3;+tgoyRiV<>YX0T(P(jeC0P*usRBH*ZYNaP`tg0I=LX9>IZ zES;P9?$c8q|9Liv35}o~Sc=q+Q zd7?ZqJ8^fUpV7 z(oCP&HZdAJKV;I#;GsOF(}Vp)TSHD_`op9fr3w5Id@K`86`7~Buz2$?xWLL7Giw5) io0p1czzk_g35E%;=EQ&K?X3U?9)qW=pUXO@geCwWm5%=a diff --git a/src/main/resources/assets/astromine/textures/item/silver_nugget.png b/src/main/resources/assets/astromine/textures/item/silver_nugget.png deleted file mode 100644 index f824648070b4997a96d1e4b62838abe86c425fba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enu+`JWF~q_@`Op9V_ROjcoL-Z8HOv^+i_dvH z>EWbm@w2HdMu7}|;teLp*?t;LS*~t4Lo&m7h4s$lt(>bF70xR71}$2|b3Sf=TUQdh zMeKrgOIT7LvRfQxc-A`m`#Zxmw>M3G_-xVvOXXXF}NM<4j3tnS~GsTmm9c5dcpiEnzdPIHJc zFo`fHNS(es`M{s__3_P_DGhlXcNiw5)ksY|xUpDVl26X^SV8f9Ker8xul(NqZ?3r` zd1dO91zsDNXSfM4WU^f>5O3g_IB{a4f$@c71{|~9Bpf)ICnzdNJ(Ei5{bm-HAoZ-o zfSn`Y5JSrE+x+t%&T?Q_5*X1Sp7Y>r_4fy#G~yaEkFibI+bmNNpy=Vn;(Br=clg1s ziKYUVc$hR28Hzd0dKDVhNwNg+Ffc|;QEF#3>osUdWZ*cE#5~_k;y@O|$A(5mhK|d3 VP93eBF&P+O44$rjF6*2UngAc8iG=_F diff --git a/src/main/resources/assets/astromine/textures/item/silver_wire.png b/src/main/resources/assets/astromine/textures/item/silver_wire.png deleted file mode 100644 index 8875e3a70ea881c2bc033cfa4c7ef6d685d44e38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en1B<7NV~B-+vP4_L^NGs;7y2w>P@dA(eC1Z# zf5mrt31;&f7-on)c*b^FeqUYchAS5xFE$@)ylGc_)5}1frKPp?pvj4V2^E=PR$Yn( zY#zow$=R8LH@5l9+co@D*pT*IZik{mrLU{&hByPp%X8#J&nc+uo(;HrmtDw>QNc2& zZ9{`fVjb&6g|n}h`MQ0S68Xbk$-acm#lGs7h|UQXC5J{9Ar?!?XXzyjLi%1^?bY0A znm5z}PN=uG8=Q&W$@a!Y!l9pa#&w5t?K?%@U0JZ^&VPgYLkDhe&tIs+!Elt}1nUBW zhDzb1>lK_G{EklLOVD%RQx;)PV0fY`(EE-_rqOyqLn9+Y$kieX!Pa~pU?4Ggy85}S Ib4q9e04sWeW&i*H diff --git a/src/main/resources/assets/astromine/textures/item/tin_boots.png b/src/main/resources/assets/astromine/textures/item/tin_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..8dcc619a79d3e47fa31042292e1d3f384eed745f GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!A+hnjv*HQ$r8UB1icP7#=Bgp*O;7mxhplH zGAAj5(c|IU>hJ&N@2vQ^e`2p}jIdszKtj`{f)5`*r)zMFHXO0vQ_ufYk)e%Ip}|+t z%uwKf0mF2s7>3o{?`*4BQU%!xm>n3WPM^s3G?8h>Ldi@`o)e6mW(<+W9uGHPUw<$s zg+YkT07nuyxcPX+; aNHFZboW*MwX&el6J%gvKpUXO@geCw@b6*4i literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/tin_chestplate.png b/src/main/resources/assets/astromine/textures/item/tin_chestplate.png new file mode 100644 index 0000000000000000000000000000000000000000..3b7379cac380b727f82f01d76269d249d8ecbe1a GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4UC>Hjv*HQ$r1$zIF$Y5*``D>cDV z;=s~2)>COOaxSVdh~Z(K2G^i*i@Y-s48&fe9lVCKOS$;)#f zwm~Ox$$I`&!vQnKv?kc zf_Enrci2@Z9AePxRbVKxvpQhF!16(|iO+!NKpHp41EJ#v3?d#1M_)*&wetlq39>ja zz7&7K-xrj^z+L-FVdQ&MBb@ E05Cy(vj6}9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/tin_leggings.png b/src/main/resources/assets/astromine/textures/item/tin_leggings.png new file mode 100644 index 0000000000000000000000000000000000000000..eae81c5636536af6423f34b2290a632a865c4855 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Cjs%jv*HQ$r1$zIF>#@DN$RHuXpwt@otG}G97w8KHPgg&ebxsLQ0P?PCo&W#< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/astromine/textures/item/tool/rose_gold_axe.png b/src/main/resources/assets/astromine/textures/item/tool/rose_gold_axe.png deleted file mode 100644 index aa4bc77182478c8dedc842236ad418cf40519068..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@T{kcV~B-+@&ay;PbI(j4+ZFDGA#LcbMEbg zp0fgK8oiwohgTe~DWM4f D4t8^v diff --git a/src/main/resources/assets/astromine/textures/item/tool/rose_gold_hoe.png b/src/main/resources/assets/astromine/textures/item/tool/rose_gold_hoe.png deleted file mode 100644 index c14c24b74d38c5696c1d538f56c6391aa55b9314..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaJQ$6V~B-+@&XY9r_419CojLWpK{V5|F_+q zEJFs5&zr5c|ChhHRk&v&uQOYPZ|UVw=Im2C>rw=!PD+|_{r<@hf8M6DRdV{ZNzRsQ z{3`TRXM&@Gv%`aHANkt$9{*?jW>*dOn(3T6UJMN)=Vyhnm9@@FWepKw>L_YlKJ!KW zgw5~oK4mgQMn;a#Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz0W(QNK~y+TV`M-A z|NsAovM>Q7BZ^WuV1m+kL6W!Y|3ohr?52Zk#fL!}kL=nB#@GyD1S!G=KsF~Alrmg6 zcaGu7imQt65h3x6(F;I~%VTK&}AM%$)DR&IZ}s-ZX_lL{gGr{)Ddo^S19} z!f5~~+CXw%=3@Ur&Yr*h3B&b=Ul>7#W)@e1<+iL^@}CK$5E}*okYVK~zc##AU=82A*c3V4FeChG|9yFiWrkkmd|Ox&In++;IPaoQ#Zu>Hq)$07*qo IM6N<$f=*hbYybcN diff --git a/src/main/resources/assets/astromine/textures/item/tool/rose_gold_mining_tool.png b/src/main/resources/assets/astromine/textures/item/tool/rose_gold_mining_tool.png deleted file mode 100644 index 50012e539ad233e2b3837a908c1aaaf30708f78f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBuf-vKbiP>*~g0DPX978PplT!{bPO_Q%&v_=#=WXu~ujJEa z$gC@SZYHrl-r&FerouKR8H@0c?| z;zU}B;U0!19FfK+Zb}v1Nnmzh6HMjcXfP>Xwz}E0`G-R9iFF60*%Z!x5}L#FdAoh$ zj*l<2uWf0#%rGG>qG4gS*wjf)n+hZxPNb=-s%mg^JA5}bYmjNsSavw)*t49b28r1p jnI^bxGM&sXA;BPet35aP^|lD0uNgdD{an^LB{Ts5RyKkQ diff --git a/src/main/resources/assets/astromine/textures/item/tool/rose_gold_pickaxe.png b/src/main/resources/assets/astromine/textures/item/tool/rose_gold_pickaxe.png deleted file mode 100644 index f15ef7ce9626ecc77d3481307f92c620e32b6dd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@PVg`V~B-+vP8iFj-`eUla^nu*AV7=mV3W_ z;XGEa#S9akO*?5U`R?xS;~#$AG~O^{#T1c_U;qESO=YX(^lOuxE!W6<_;r)I|2&6E z9-f&;rzZTm_K~mc=k56hcPhS!E{|Jt;Ihw`{}W@a|F4fX_`iSlI;lI=J^@nt44G_} z)~c!;XV$--dxpWdWdWnYS-v(W9(KJwtk%_4`PMcu4h-uV4Q7A*DY=~Sg_(2fK?W)1 zgodjOPG;JgnvRhX3?9YlyMER4TITh%urQz4*pOs(CN1Zj8b`-QNucp6(Z)X;8W|a4 XZ>F&uxQ2WM`jx@c)z4*}Q$iB}RFitP diff --git a/src/main/resources/assets/astromine/textures/item/tool/rose_gold_shovel.png b/src/main/resources/assets/astromine/textures/item/tool/rose_gold_shovel.png deleted file mode 100644 index 14ff2eb25038c576346d42b1cb919741230d3897..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaHFS-V~B-+vP8iFj-{PUp7Z?vJARq0?k`am zyU%q}+=gfA<$28?f3bf4zx(B?M&4wm(?SdiXLTp18{OGm-v98)L}i|5W@Z7BN<0qN z{`|UW%oeDrxq^rDz-1qiH*b`8mo@EWD7Fh^ShCYN_V4~S8S~Uxjx{;63f)*eHt%6k zKitTjFPUfa%PVTi!rMLk2{U|Foh@Kh=vBCNFrXvx-#2v^YiU*439BTT8~*t8>|ePKD&qcmVS0>El+Qylp+~IrT zyoOp6&xGIrw$1nV)t(lZH_7ip8V~0LMTPY>fB!T-JULmNWp1w!+q|?z|8GXTH@LH> zj`hs+i4zkQL{bZw9cIb$v`X;BRB&$-O|j+>Hfj+Rd!;bjaaO*~udYWaGty$>7a!9IOD5)=eZtJf#&E(eb1GNCtT3R*7(8A5T-G@y GGywqQXL!m0 diff --git a/src/main/resources/assets/astromine/textures/item/tool/silver_hoe.png b/src/main/resources/assets/astromine/textures/item/tool/silver_hoe.png deleted file mode 100644 index 259fbe21bf2f687d539b5b8cfbd26da22fcc04af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaJQ$6V~B-+@&XY9r_416G|gVxPdT|E|D(;G zEJFs5&u`Pu|9fv!#L_d7*O{%tH?+8fIeXQa(GnYQN;4 zys4dUdZ1>;TNlO&&(4*6{m&&7vxHsg%rn{L_Y7<*KK52bJ2p%>YtV2tWY-NIW{qW+ lucq-ZT=LkK_KA_1nSrAzD!(ZI0|(F>44$rjF6*2UngE@CZN&fp diff --git a/src/main/resources/assets/astromine/textures/item/tool/silver_mattock.png b/src/main/resources/assets/astromine/textures/item/tool/silver_mattock.png deleted file mode 100644 index 84a3d50d695173c5c0e6972975c399f884b31c08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 zcmV;R0bl-!P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz0X0cPK~y+TV`M-A z|NsAovM>Q7BZ^WuV1m+kfop8if0vjMLKjHL(x|2IxGYE*w$S{I*~g0DPX978PplT!{b&Pkg5&v_=#Z?W@-SMq5y zWbXU>MpEK@{QiITn-X6%aC#kP^!Rw@oS4DydwZ)Btjtb`A9X#!aF{`&A+xRV(-)Nu ziu2MI{Wt#e!tz;hZAY4s;U~?+z#K3%^GAHG?pFCIrc24sX=1) jN2UpGn@lJ3OGq%Nsdl`3AmqFT=xYW~S3j3^P6CS6k zIFHq9F~fvsGw15^e1CU0x#HU|(+D505D}NZ>HBxibc}17oOo=Rd&1!lyB?gJtR5i8 z?3@~>HluFq;-BK&v%=MxkEf4;u{|N3Vy*uKjNPdUczFw61W zx&9*d&+6va4G-`rW-xecZeA#GxRE>m;JLi{CbDvR3Jup8W}N-;r{^+5$?S!P5*T^~ z4Gv^6D9)ZbWy%5_9fl=4jbs1rZ<8^1b82FI65(Jdn`Ug5F3fV|Mvr)d$)vS2YYrS> aVA%5_)p=XZH))_>89ZJ6T-G@yGywqLG=RbY diff --git a/src/main/resources/assets/astromine/textures/item/tool/silver_shovel.png b/src/main/resources/assets/astromine/textures/item/tool/silver_shovel.png deleted file mode 100644 index daf5bf7f5e8dec95ad645fac12fe7c392ed7520e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaHFS-V~B-+vP8iFj-{PUej7diJARq0?k|z| z_P*<+xDC&4pP$$G@z2-S|5sb?YUE93IxWPYaMsv5TH@W^-Ny@_Jn>|cE-qfdBgm$Z zUH9#mY4em78X;{g4>Hxb%D$abc0Ul;U^!od;nJO%>;A<%_supst6*n#)?zW!lE}EG z$qx^-Zs#$Vt5wxKbs_f{yMd3|)wCT<6Wj#eCTJWnsQ)dzXm0N$K98$Cj1F~b$L@!) b@bEAwolT#{r#f>x(D4kOu6{1-oD!MIHqC!lZcL z=Aq@1ssgMPI}grs$PtL0H}A-X|4%&G+>49b?%Yyqi~e2yu)l1=vMaaPHux$?JLWjm z9h2()W){X{Jbi5nM`5{QhH)Fq2~mahH9!7LeRy)RI?LSNM@;_47yoC;e>aHPStopE z`oxKe3L>cm%nq|;d0Hj-Vk)?|iKbX{2phEsioH^p?Kmsn=2zFFlo@F;ag4heo;Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T&d0{H?8f{0d15Cr`Kf`y%6tr!g!k{}j7 zV$@VZAm(9+BoS@YxWB{vmy>a4XX0eDyTLzP=AL`cow?_E&z-s;0rzfPo12`Nv3~Qq z273aHoxgQ6@g3ESR0`OA_?Y!q{`zLm*{NxJetbI^oV#?jrWKG2pNSai=?Ol6_+)K% zd@3BReIzOXSI6>eTGt0(N5=|nxhNsE2MF!Ewpy!iX)5G_T1F}bDCRxtn;PdO#acz8 z0wg3BCk(8g7alAJ4@h+i@QgbOYyKFF6A-$Xi^nO#uLH%_f+%mL6=(|JoF~)!SSQPm zjE~wTkDfgp{P;35FY|K}3{Os*Fl{ZZ79s*6@^i)N;MLQ|M*BK~V^qA=P)FntP#YV5 z{oWdaZrHN1U`+&h{-obFj^J+whJx=oa~$J=mo-|?yLhM8gNb(oHg1Z`^Hd8g32I{i z!La`K+(vAyD>@qhKk45YiEf@QhbH35L(I1J9_Y?EfDj z60OjC_s*P>7cqROv#X+(Q_cd5;Yo?5urGnD1$$0)1bYwek1e(qf@B5clNL(g23QTi z>baTGV6eA89La`61(2<&*eHZJ>#G6O9aNzxBP%k;bKG4bdcOPE1q;m(tuk3z>$504-=nW0FJ=TJGO;XaejDML!(ceOSt1*oyG%LbMnjy%LAe{FX5FV z(jc<}_^4f^!iy3#7a<8n<1!^g`N8joRuc*((ddu8=nH4_o6N^NrL`17{4*vRUX|Ve z8XhUQ6f!G-kNCP@ALV9=l@W%UB+$I)mk|CY$~;Feyv&PVG^Y|{qIFD*2Jom~3X2i~ zR^sLx8vwE}jg89Mn)m!PtSNpP0{K&iT{=A{U^t*3!p9WYjmABc~J;57R1mK&A>NK!u0h}H&0Gsl>x0hZM7F(4}< zsFcB2F@Bo(_)`QQP3y`H3xW3LMoT(Wdu)h*d~8B7t-HKjSp0D@s&`^Zz`GDQ&Ye{= zNa5^({!(0-?T-*ih?<|W7vSC;OFm}(y!a_e<2I?>A}ob4{{r&>xn|S?9?>zasq`Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T$q7&30q{H55mmZb9S@;nKPF)9*@W4@pwEQkH_Qjc>W!!dK<8_v0kGs-#(g5Z>L#Y zU2BL*66t#Tjfv@5Gc_}5laO>85`gHJyP_!^oYt=-o5%{-+ub*X@oV|cR`m%xk*vLR29y_1uvi(*kt&s!??8x@mA2xp3 z^ksMF`hxgYCXEQh2n1G375k%)U$!flBqRYl1>6yq$ouP?NWpGGl7O88Y_w?$%-KrjU~;s{1Og58SXnvy{*_sDK#>^7(szgW7qExQ6dr)!@H`B?E0EWhFp zk1v7*DH%W6O0ZgxAHqI}dz-Zh&>w@_hwzJrZQ$t4>GAyNB(S0F^~qE#Uk57JPdo=M zo}+kh?;$?!Z;_@SzP-FsxW&{!9iUEAYC|)2wDqhtVCru|nFR7QuW=BB;Bg{92#JPgPc2qnGix*?w0pEZ^ UEl_PHApigX07*qoM6N<$g4wqG;s5{u diff --git a/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_1.png deleted file mode 100644 index 2eee5d62d0c80dafe0e201ffe4ed3eb61333e804..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1099 zcmV-R1ho5!P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T$SK~!i%?U_Gl z6hRcmH;0W;k%S1w1i?ln78=ARrcsC@3Kl7>EQEAcT3BhNm4#Mzf`xSo3lS8o;#pWE zA_*oILP$)|kRa;Wi1B{U{f_6ld%JOSxxL^A!_Av{vpetq%wAiNf}8gquC9DrvVO<5 zF8c)NARrObR$P&~N>(l`Z!Bx$?z+CuiOUH!fdnX$6$R-&8!Cm=4}AeXzD1 zDqu4pRROpuldq%LA>9ObSrUd+e+#z$e94MXCZM zBo-$O0K$XK-~pMc0KZA4u;t5Ol7P^0E}o- zFANO@^Go0V$oy6bKFyji-Mu{)A_5_@z5Pe;-hQ|rN-*^f4E>#ICPfh9q03?LYmfBfQ! z(O4KO;i^4dTWyTKw;a5zky3aT&jeC1V|oWbVO~Ma!e2R{UQFJ4FlxNlFAXR1T)lnQ zczm4q9XM>ltBL@;rabYg=^@bYm!n`Qfe=y&MR>-Wo&>|+h6B$iQuhCk5UEzU|LFOu zk{2;Na{gpfEvK9X*29xhkHY>4ToeqSI2sHbIhJ_XS_@JYK+-}9+yILJtiG^P3SQ1k zh9miqssOSzCpHd3)cPWTa|fqTl#v&?<2mUr5v}h&cEMWs;q?^+)T4brEk~q!Ko)S; zAM78jy_op)0#E`E?LQb&@%-?xhDM(_mvAHJP8$zk&DrB;EDwm*yo6Vd$b#Go;H4aO zby0%mA|#<`T&9F5Kj`lGX+ohS8vXLS#c(#TnCECMg%JOYiH284ZvYLC6kHFv6~IgU zxnD2kW{H&%hMOeNyyuq?{wB&ir59f2#V?ww#F%K6Y0&^4_3L3>LVzkkV*@}Irm<03 zTl1cuhBd`cLm*#uNWR=aB@nbv$RtEhi$4o;CqZ0XmmO|{Y!b`Ifoj6M=LbGNcx=S? zf;I%8BkM@Zo{sjTV+f4p(7dNTu(%Wux0hZL~F(4}mg+S-7-+y*++G9g}<6{$wY2D@J!s1VgQ9Tn&0u!hzaFRRg%pirc2l^XvWwtLu zBq7fH9D4!oO*vMKku+(O$}Pf12=gy650Gm{E#MIy)0$>~(#nS*_yvhJKHuYY RdvyQ+002ovPDHLkV1n>j>s|l= diff --git a/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_2.png deleted file mode 100644 index cb816f2292cb42cfc7c366ab74ca4559d6e3f4c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 572 zcmV-C0>k}@P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T=oSt<@d%Ht1 zSt37Zf3UStb+u~ECn4($B>>T__NQw!9|l*lO=1PqFYB)JG8qZTY0iU6p1BWN2h@kS zeR{Y*)@y{XfLx*A7RrnM0s`sF2Ktqi^+-H+X>Q5)$DO=J5+txxnDIYs{IcoGo-Y-n z_;DtW2*d~kc6x9AM<2iJP%ufz0)7gFBP@~6oo=GwFdw}GQGr^oBNo5+Uu-jsU{rdH@Do&y)pQ9OkA5TEw9 z$jA>rI63R{-N2Ml#q4ZuyZiQ|_iL@7f>beU%d3Bir{dC1K;lvOKOhJ(S`)AtL4<^2 z03R`m7l==aSGA?d$O+I(>gBQ7Q4qlh^GzXfp`f^(6i>p^#kns5lts1&Js=?f0000< KMNUMnLSTX<1@#L6 From a08d8d582caab149fdb46563798a6d94f0629812 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 24 Jul 2020 00:41:33 +1000 Subject: [PATCH 07/16] remove duplicate textures haha yes --- .../astromine/textures/item/copper_boots.png | Bin 285 -> 0 bytes .../astromine/textures/item/copper_chestplate.png | Bin 361 -> 0 bytes .../astromine/textures/item/copper_helmet.png | Bin 308 -> 0 bytes .../astromine/textures/item/copper_leggings.png | Bin 294 -> 0 bytes .../assets/astromine/textures/item/tin_boots.png | Bin 285 -> 0 bytes .../astromine/textures/item/tin_chestplate.png | Bin 364 -> 0 bytes .../astromine/textures/item/tin_leggings.png | Bin 293 -> 0 bytes 7 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/astromine/textures/item/copper_boots.png delete mode 100644 src/main/resources/assets/astromine/textures/item/copper_chestplate.png delete mode 100644 src/main/resources/assets/astromine/textures/item/copper_helmet.png delete mode 100644 src/main/resources/assets/astromine/textures/item/copper_leggings.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tin_boots.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tin_chestplate.png delete mode 100644 src/main/resources/assets/astromine/textures/item/tin_leggings.png diff --git a/src/main/resources/assets/astromine/textures/item/copper_boots.png b/src/main/resources/assets/astromine/textures/item/copper_boots.png deleted file mode 100644 index 755c563bf013eb9e0df17b8f3d00759c29a5d3c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!A+hnjv*HQ$r8UB1icO)v?+b}KS0g-(%JP1 zl{rZfj2;jF^MC(eZ*TLso=IFeMp&;3o{adWJBQw7-ym>n2Jqr{k>CNj-fc(t>Q=L93C8AGJ8$HUjr>ksCn zFbFZ9^pu#nNP?-H(L-oi<+Y3I0f8JAUw%l(@Z4ppaAMSKYGl3tFWFb;MJB`aU5cy{ a5)AeG(`2&xs_KERXYh3Ob6Mw<&;$TTwOyhB diff --git a/src/main/resources/assets/astromine/textures/item/copper_chestplate.png b/src/main/resources/assets/astromine/textures/item/copper_chestplate.png deleted file mode 100644 index 425b0aa583c4996775cae9c8c65abb493e9a0dc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!GE4Ejv*HQ$r1$zIFz2PEdI~_d4j{Gv+ENq zB@V1+Q~CM-@ZbOU`Op9OUzzu-KBud2Wg^pQri1;bttJ26vEom=y=%qd8yrc^MzvqEmmBxX4_uzDHC#BJ<#4Dl6NGr{@#Tt_wyF-gXW&ewiCx|7*< zeS4g9Wq`O$)t}zPYZuiMIK@nzHv~H}ED^jLHbH7a)C4&J2I&nCZr8gBuz4O}Fniv_ z;KA!-+riJzEOB6|AdAB}cXkQ31_nFl3yf`yH*y#mV;*U&)NSnkSU+nkkA>L=#t4Q( zfB2a+fNJ!dH)OIg@-RCvq;O2>WV&D)%xGZ1z#!{BgF$naU_US<7(8A5T-G@yGywqj CTz=93 diff --git a/src/main/resources/assets/astromine/textures/item/copper_helmet.png b/src/main/resources/assets/astromine/textures/item/copper_helmet.png deleted file mode 100644 index f6704b35c5e95d5b16ab99bfa7519ae8f242e386..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!IPdYjv*HQ$r8UB1icnFRKB|Nf1!`agp$wN zZB;ys6Vjr^OW8P;gI92{#KdjvO}utdorinhU-yfLd6phzSQe?K)Z2JkvGL*k`|ElB z-`mG<`tSd*jgFINw?2H|eV$jm&e)`hwXuQI>oDV)XY$j_jsEN`l{-^c_|9a8Sg0`T zb%7 diff --git a/src/main/resources/assets/astromine/textures/item/copper_leggings.png b/src/main/resources/assets/astromine/textures/item/copper_leggings.png deleted file mode 100644 index 4626a8830ca6bcb9dfef059dafde99a76dafa218..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!QGxNjv*HQ$r1$zIF>$4m}m99UPG8!rs_{` z;=%3zHL3zE6wXd8u9CDUxqI-B{Pgmsm-gGwHNQNqz0L59)i0K#0%{t)Ob$}}*SuxO zZpmb03^WbY;AY$)#c=7%qdS=v$Jl{P=Cz;CHyfUKxr3pN(LlY~r0EaWA%*(KOcAjS z?{cgo^)$GJAADspWH`)_)5z9UAJf=*m34jo-nLBvjAn%*%noJ~7fG@N1SK(vD|;EW iEwzYw)XZpLz`)>tAhwbDdSw{U8w{SVelF{r5}E)#d}Ubx diff --git a/src/main/resources/assets/astromine/textures/item/tin_boots.png b/src/main/resources/assets/astromine/textures/item/tin_boots.png deleted file mode 100644 index 8dcc619a79d3e47fa31042292e1d3f384eed745f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!A+hnjv*HQ$r8UB1icP7#=Bgp*O;7mxhplH zGAAj5(c|IU>hJ&N@2vQ^e`2p}jIdszKtj`{f)5`*r)zMFHXO0vQ_ufYk)e%Ip}|+t z%uwKf0mF2s7>3o{?`*4BQU%!xm>n3WPM^s3G?8h>Ldi@`o)e6mW(<+W9uGHPUw<$s zg+YkT07nuyxcPX+; aNHFZboW*MwX&el6J%gvKpUXO@geCw@b6*4i diff --git a/src/main/resources/assets/astromine/textures/item/tin_chestplate.png b/src/main/resources/assets/astromine/textures/item/tin_chestplate.png deleted file mode 100644 index 3b7379cac380b727f82f01d76269d249d8ecbe1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4UC>Hjv*HQ$r1$zIF$Y5*``D>cDV z;=s~2)>COOaxSVdh~Z(K2G^i*i@Y-s48&fe9lVCKOS$;)#f zwm~Ox$$I`&!vQnKv?kc zf_Enrci2@Z9AePxRbVKxvpQhF!16(|iO+!NKpHp41EJ#v3?d#1M_)*&wetlq39>ja zz7&7K-xrj^z+L-FVdQ&MBb@ E05Cy(vj6}9 diff --git a/src/main/resources/assets/astromine/textures/item/tin_leggings.png b/src/main/resources/assets/astromine/textures/item/tin_leggings.png deleted file mode 100644 index eae81c5636536af6423f34b2290a632a865c4855..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Cjs%jv*HQ$r1$zIF>#@DN$RHuXpwt@otG}G97w8KHPgg&ebxsLQ0P?PCo&W#< From 80139002af6f381d4ea3fe4415ea20c5212438de Mon Sep 17 00:00:00 2001 From: SuperCoder7979 Date: Thu, 23 Jul 2020 12:18:04 -0400 Subject: [PATCH 08/16] mars canyon generation --- .../{MoonBiome.java => DepthScaleBiome.java} | 4 +- .../astromine/common/world/MarsBiome.java | 20 ---------- .../world/generation/MarsBiomeSource.java | 38 ++++++++++++++++++- .../world/generation/MarsChunkGenerator.java | 31 ++++++++++++++- .../common/world/layer/MarsBiomeLayer.java | 24 ++++++++++++ .../common/world/layer/MarsRiverLayer.java | 22 +++++++++++ .../common/world/layer/PlainsOnlyLayer.java | 14 +++++++ .../astromine/registry/AstromineBiomes.java | 13 ++++--- 8 files changed, 136 insertions(+), 30 deletions(-) rename src/main/java/com/github/chainmailstudios/astromine/common/world/{MoonBiome.java => DepthScaleBiome.java} (91%) delete mode 100644 src/main/java/com/github/chainmailstudios/astromine/common/world/MarsBiome.java create mode 100644 src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsBiomeLayer.java create mode 100644 src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsRiverLayer.java create mode 100644 src/main/java/com/github/chainmailstudios/astromine/common/world/layer/PlainsOnlyLayer.java diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/MoonBiome.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/DepthScaleBiome.java similarity index 91% rename from src/main/java/com/github/chainmailstudios/astromine/common/world/MoonBiome.java rename to src/main/java/com/github/chainmailstudios/astromine/common/world/DepthScaleBiome.java index 2b5ac34bf..88850a0f4 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/MoonBiome.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/DepthScaleBiome.java @@ -13,8 +13,8 @@ import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder; -public class MoonBiome extends Biome { - public MoonBiome(float baseHeight, float variation) { +public class DepthScaleBiome extends Biome { + public DepthScaleBiome(float baseHeight, float variation) { super(new Settings().configureSurfaceBuilder(SurfaceBuilder.NOPE, SurfaceBuilder.STONE_CONFIG) .precipitation(Precipitation.NONE) .category(Category.NONE) diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/MarsBiome.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/MarsBiome.java deleted file mode 100644 index 9ad3a341e..000000000 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/MarsBiome.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.github.chainmailstudios.astromine.common.world; - -import net.minecraft.sound.BiomeMoodSound; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.BiomeEffects; -import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder; - -public class MarsBiome extends Biome { - public MarsBiome() { - super(new Settings().configureSurfaceBuilder(SurfaceBuilder.NOPE, SurfaceBuilder.STONE_CONFIG) - .precipitation(Precipitation.NONE) - .category(Category.NONE) - .depth(0.1f) - .scale(0.1f) - .temperature(0.5F) - .downfall(0.5F) - .effects(new BiomeEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(12638463).moodSound(BiomeMoodSound.CAVE).build()) - .parent(null)); - } -} diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java index c0dacee13..b43b047a2 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java @@ -1,19 +1,35 @@ package com.github.chainmailstudios.astromine.common.world.generation; +import java.util.function.LongFunction; + +import com.github.chainmailstudios.astromine.common.world.layer.MarsBiomeLayer; +import com.github.chainmailstudios.astromine.common.world.layer.MarsRiverLayer; +import com.github.chainmailstudios.astromine.common.world.layer.MoonBiomeLayer; +import com.github.chainmailstudios.astromine.common.world.layer.PlainsOnlyLayer; import com.github.chainmailstudios.astromine.registry.AstromineBiomes; import com.google.common.collect.ImmutableList; import com.mojang.serialization.Codec; import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.layer.ScaleLayer; +import net.minecraft.world.biome.layer.SimpleLandNoiseLayer; +import net.minecraft.world.biome.layer.type.ParentedLayer; +import net.minecraft.world.biome.layer.util.CachingLayerContext; +import net.minecraft.world.biome.layer.util.LayerFactory; +import net.minecraft.world.biome.layer.util.LayerSampleContext; +import net.minecraft.world.biome.layer.util.LayerSampler; +import net.minecraft.world.biome.source.BiomeLayerSampler; import net.minecraft.world.biome.source.BiomeSource; public class MarsBiomeSource extends BiomeSource { public static Codec CODEC = Codec.LONG.fieldOf("seed").xmap(MarsBiomeSource::new, (source) -> source.seed).stable().codec(); private final long seed; + private final BiomeLayerSampler sampler; public MarsBiomeSource(long seed) { super(ImmutableList.of()); this.seed = seed; + this.sampler = build(seed); } @Override @@ -28,6 +44,26 @@ public BiomeSource withSeed(long seed) { @Override public Biome getBiomeForNoiseGen(int biomeX, int biomeY, int biomeZ) { - return AstromineBiomes.MARS; + return sampler.sample(biomeX, biomeZ); + } + + public static BiomeLayerSampler build(long seed) { + return new BiomeLayerSampler(build((salt) -> new CachingLayerContext(25, seed, salt))); + } + + private static > LayerFactory build(LongFunction contextProvider) { + LayerFactory mainLayer = SimpleLandNoiseLayer.INSTANCE.create(contextProvider.apply(432L), PlainsOnlyLayer.INSTANCE.create(contextProvider.apply(543L))); + for (int i = 0; i < 7; i++) { + mainLayer = ScaleLayer.FUZZY.create(contextProvider.apply(43 + i), mainLayer); + } + + mainLayer = MarsRiverLayer.INSTANCE.create(contextProvider.apply(56L), mainLayer); + for (int i = 0; i < 2; i++) { + mainLayer = ScaleLayer.FUZZY.create(contextProvider.apply(473 + i), mainLayer); + } + + mainLayer = MarsBiomeLayer.INSTANCE.create(contextProvider.apply(721), mainLayer); + + return mainLayer; } } diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsChunkGenerator.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsChunkGenerator.java index 06dc32197..8a509903f 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsChunkGenerator.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsChunkGenerator.java @@ -21,6 +21,7 @@ import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.source.BiomeSource; import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.gen.ChunkRandom; import net.minecraft.world.gen.StructureAccessor; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.chunk.StructuresConfig; @@ -35,6 +36,7 @@ public class MarsChunkGenerator extends ChunkGenerator { private final OctaveNoiseSampler lowerInterpolatedNoise; private final OctaveNoiseSampler upperInterpolatedNoise; private final OctaveNoiseSampler interpolationNoise; + private final ThreadLocal cache; public MarsChunkGenerator(BiomeSource biomeSource, long seed) { super(biomeSource, new StructuresConfig(false)); this.biomeSource = biomeSource; @@ -43,6 +45,7 @@ public MarsChunkGenerator(BiomeSource biomeSource, long seed) { lowerInterpolatedNoise = new OctaveNoiseSampler<>(OpenSimplexNoise.class, random, 5, 140.43, 45, 10); upperInterpolatedNoise = new OctaveNoiseSampler<>(OpenSimplexNoise.class, random, 5, 140.43, 45, 10); interpolationNoise = new OctaveNoiseSampler<>(OpenSimplexNoise.class, random, 3, 80.32, 3, 3); + this.cache = ThreadLocal.withInitial(() -> new BiomeGenCache(biomeSource)); } @Override @@ -68,8 +71,29 @@ public void populateNoise(WorldAccess world, StructureAccessor accessor, Chunk c int x2 = chunk.getPos().getEndX(); int z2 = chunk.getPos().getEndZ(); + ChunkRandom chunkRandom = new ChunkRandom(); + chunkRandom.setTerrainSeed(chunk.getPos().x, chunk.getPos().z); + for (int x = x1; x <= x2; ++x) { for (int z = z1; z <= z2; ++z) { + float depth = 0; + float scale = 0; + int i = 0; + + // Biome lerp + for (int x0 = -5; x0 <= 5; x0++) { + for (int z0 = -5; z0 <= 5; z0++) { + Biome biome = this.cache.get().getBiome((x + x0) >> 2, (z + z0) >> 2); + + i++; + depth += biome.getDepth(); + scale += biome.getScale(); + } + } + + depth /= i; + scale /= i; + // Noise calculation double noise = interpolationNoise.sample(x, z); if (noise >= 1) { @@ -80,9 +104,14 @@ public void populateNoise(WorldAccess world, StructureAccessor accessor, Chunk c noise = MathHelper.clampedLerp(lowerInterpolatedNoise.sample(x, z), upperInterpolatedNoise.sample(x, z), noise); } - int height = 100 + (int) noise; + int height = (int) (depth + (noise * scale)); for (int y = 0; y <= height; ++y) { chunk.setBlockState(new BlockPos(x, y, z), AstromineBlocks.MARS_SOIL.getDefaultState(), false); + if (y <= 5) { + if (chunkRandom.nextInt(y + 1) == 0) { + chunk.setBlockState(new BlockPos(x, y, z), Blocks.BEDROCK.getDefaultState(), false); + } + } } } } diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsBiomeLayer.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsBiomeLayer.java new file mode 100644 index 000000000..f5a8bbf09 --- /dev/null +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsBiomeLayer.java @@ -0,0 +1,24 @@ +package com.github.chainmailstudios.astromine.common.world.layer; + +import com.github.chainmailstudios.astromine.registry.AstromineBiomes; + +import net.minecraft.util.registry.Registry; +import net.minecraft.world.biome.layer.type.ParentedLayer; +import net.minecraft.world.biome.layer.util.IdentityCoordinateTransformer; +import net.minecraft.world.biome.layer.util.LayerSampleContext; +import net.minecraft.world.biome.layer.util.LayerSampler; + +public enum MarsBiomeLayer implements ParentedLayer, IdentityCoordinateTransformer { + INSTANCE; + private static final int RIVER_ID = Registry.BIOME.getRawId(AstromineBiomes.MARS_RIVERBED); + private static final int MARS_ID = Registry.BIOME.getRawId(AstromineBiomes.MARS); + + @Override + public int sample(LayerSampleContext context, LayerSampler parent, int x, int z) { + if (parent.sample(x, z) == RIVER_ID) { + return RIVER_ID; + } + + return MARS_ID; + } +} diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsRiverLayer.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsRiverLayer.java new file mode 100644 index 000000000..48124e69c --- /dev/null +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsRiverLayer.java @@ -0,0 +1,22 @@ +package com.github.chainmailstudios.astromine.common.world.layer; + +import com.github.chainmailstudios.astromine.registry.AstromineBiomes; + +import net.minecraft.util.registry.Registry; +import net.minecraft.world.biome.layer.type.CrossSamplingLayer; +import net.minecraft.world.biome.layer.util.LayerRandomnessSource; + +public enum MarsRiverLayer implements CrossSamplingLayer { + INSTANCE; + + public static final int RIVER_ID = Registry.BIOME.getRawId(AstromineBiomes.MARS_RIVERBED); + + public int sample(LayerRandomnessSource context, int n, int e, int s, int w, int center) { + int i = isValidForRiver(center); + return i == isValidForRiver(w) && i == isValidForRiver(n) && i == isValidForRiver(e) && i == isValidForRiver(s) ? -1 : RIVER_ID; + } + + private static int isValidForRiver(int value) { + return value >= 2 ? 2 + (value & 1) : value; + } +} \ No newline at end of file diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/PlainsOnlyLayer.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/PlainsOnlyLayer.java new file mode 100644 index 000000000..1fb7a35ac --- /dev/null +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/PlainsOnlyLayer.java @@ -0,0 +1,14 @@ +package com.github.chainmailstudios.astromine.common.world.layer; + +import net.minecraft.world.biome.layer.type.InitLayer; +import net.minecraft.world.biome.layer.util.IdentityCoordinateTransformer; +import net.minecraft.world.biome.layer.util.LayerRandomnessSource; + +public enum PlainsOnlyLayer implements InitLayer, IdentityCoordinateTransformer { + INSTANCE; + + @Override + public int sample(LayerRandomnessSource context, int x, int y) { + return 1; + } +} diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java index 6b216abf8..f67c45e6d 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java @@ -2,8 +2,7 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.world.EarthSpaceBiome; -import com.github.chainmailstudios.astromine.common.world.MarsBiome; -import com.github.chainmailstudios.astromine.common.world.MoonBiome; +import com.github.chainmailstudios.astromine.common.world.DepthScaleBiome; import com.github.chainmailstudios.astromine.common.world.generation.EarthSpaceBiomeSource; import com.github.chainmailstudios.astromine.common.world.generation.MarsBiomeSource; import com.github.chainmailstudios.astromine.common.world.generation.MoonBiomeSource; @@ -17,6 +16,7 @@ public class AstromineBiomes { public static Biome MOON_HILLS; public static Biome MOON_LOWLANDS; public static Biome MARS; + public static Biome MARS_RIVERBED; public static void initialize() { // Biome Sources @@ -26,9 +26,10 @@ public static void initialize() { // Biomes ASTEROID_BELT = Registry.register(Registry.BIOME, AstromineCommon.identifier("asteroid_belt"), new EarthSpaceBiome()); - MOON_FLATS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_flats"), new MoonBiome(100, 20)); - MOON_HILLS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_hills"), new MoonBiome(105, 30)); - MOON_LOWLANDS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_lowlands"), new MoonBiome(93, 9)); - MARS = Registry.register(Registry.BIOME, AstromineCommon.identifier("mars"), new MarsBiome()); + MOON_FLATS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_flats"), new DepthScaleBiome(100, 20)); + MOON_HILLS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_hills"), new DepthScaleBiome(105, 30)); + MOON_LOWLANDS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_lowlands"), new DepthScaleBiome(93, 9)); + MARS = Registry.register(Registry.BIOME, AstromineCommon.identifier("mars"), new DepthScaleBiome(100, 1)); + MARS_RIVERBED = Registry.register(Registry.BIOME, AstromineCommon.identifier("mars_riverbed"), new DepthScaleBiome(75, 0.1f)); } } From ab50dd947e92f28336360c58b678685206c7bbe8 Mon Sep 17 00:00:00 2001 From: vini2003 Date: Thu, 23 Jul 2020 16:10:57 -0300 Subject: [PATCH 09/16] Fix #176. --- .../astromine/client/registry/AsteroidOreRegistry.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/github/chainmailstudios/astromine/client/registry/AsteroidOreRegistry.java b/src/main/java/com/github/chainmailstudios/astromine/client/registry/AsteroidOreRegistry.java index 0ccca563f..c904687fa 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/client/registry/AsteroidOreRegistry.java +++ b/src/main/java/com/github/chainmailstudios/astromine/client/registry/AsteroidOreRegistry.java @@ -50,6 +50,9 @@ public void register(Range range, int minimumDiameter, int maximumDiame for (int chance = range.getMinimum(); chance < range.getMaximum(); ++chance) { this.register(chance, block); } + + this.minimumDiameters.put(block, minimumDiameter); + this.maximumDiameters.put(block, maximumDiameter); } public int getDiameter(Random random, Block block) { From d5a45fdc26e1fcd8555479222bf715b45afb83b2 Mon Sep 17 00:00:00 2001 From: vini2003 Date: Thu, 23 Jul 2020 17:10:04 -0300 Subject: [PATCH 10/16] Fix #175. --- gradle.properties | 2 +- .../astromine/common/block/entity/VentBlockEntity.java | 2 +- .../chainmailstudios/astromine/registry/AstromineConfig.java | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7adbe9f5b..fc3f5a42c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ version_meta = fabric-1.16.1 # Dependencies cardinal_components_version = 2.4.2 -spinnery_version = 3.1.13+fabric-1.16.x +spinnery_version = 3.1.14+fabric-1.16.x shapes_version = 2.0.0+build.10 patchouli_version = 1.16-37.21-FABRIC lba_version = 0.7.1-pre.4 diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/VentBlockEntity.java b/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/VentBlockEntity.java index 0ac204910..02670195c 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/VentBlockEntity.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/VentBlockEntity.java @@ -81,7 +81,7 @@ public void tick() { BlockPos output = position.offset(direction); - if (asEnergy().use(50) && world.getBlockState(output).getBlock() instanceof AirBlock) { + if (asEnergy().use(AstromineConfig.get().ventEnergyConsumed) && world.getBlockState(output).getBlock() instanceof AirBlock) { ComponentProvider componentProvider = ComponentProvider.fromWorld(world); WorldAtmosphereComponent atmosphereComponent = componentProvider.getComponent(AstromineComponentTypes.WORLD_ATMOSPHERE_COMPONENT); diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java index 11e91b00c..bca3960a0 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineConfig.java @@ -510,6 +510,9 @@ public class AstromineConfig implements ConfigData { @Comment("Energy for the Fluid Extractor actions.") public double fluidExtractorEnergyConsumed = 1024D; + @Comment("Energy for the Vent actions.") + public double ventEnergyConsumed = 1024D; + @Comment("Delay for the Block Placer actions (smaller is faster).") public long blockPlacerTimeConsumed = 40L; From 71e87a3199001c661ecbf08093508da2816ab0c8 Mon Sep 17 00:00:00 2001 From: SuperCoder7979 Date: Thu, 23 Jul 2020 17:10:12 -0400 Subject: [PATCH 11/16] improve mars gen --- .../astromine/common/world/generation/MarsBiomeSource.java | 4 ++-- .../chainmailstudios/astromine/registry/AstromineBiomes.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java index b43b047a2..26fe347db 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java @@ -54,12 +54,12 @@ public static BiomeLayerSampler build(long seed) { private static > LayerFactory build(LongFunction contextProvider) { LayerFactory mainLayer = SimpleLandNoiseLayer.INSTANCE.create(contextProvider.apply(432L), PlainsOnlyLayer.INSTANCE.create(contextProvider.apply(543L))); for (int i = 0; i < 7; i++) { - mainLayer = ScaleLayer.FUZZY.create(contextProvider.apply(43 + i), mainLayer); + mainLayer = ScaleLayer.NORMAL.create(contextProvider.apply(43 + i), mainLayer); } mainLayer = MarsRiverLayer.INSTANCE.create(contextProvider.apply(56L), mainLayer); for (int i = 0; i < 2; i++) { - mainLayer = ScaleLayer.FUZZY.create(contextProvider.apply(473 + i), mainLayer); + mainLayer = ScaleLayer.NORMAL.create(contextProvider.apply(473 + i), mainLayer); } mainLayer = MarsBiomeLayer.INSTANCE.create(contextProvider.apply(721), mainLayer); diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java index f67c45e6d..7a56257df 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java @@ -30,6 +30,6 @@ public static void initialize() { MOON_HILLS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_hills"), new DepthScaleBiome(105, 30)); MOON_LOWLANDS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_lowlands"), new DepthScaleBiome(93, 9)); MARS = Registry.register(Registry.BIOME, AstromineCommon.identifier("mars"), new DepthScaleBiome(100, 1)); - MARS_RIVERBED = Registry.register(Registry.BIOME, AstromineCommon.identifier("mars_riverbed"), new DepthScaleBiome(75, 0.1f)); + MARS_RIVERBED = Registry.register(Registry.BIOME, AstromineCommon.identifier("mars_riverbed"), new DepthScaleBiome(60, 0.1f)); } } From b18033dce11361bfc312fbe06af5198e2e49a725 Mon Sep 17 00:00:00 2001 From: SuperCoder7979 Date: Thu, 23 Jul 2020 19:25:18 -0400 Subject: [PATCH 12/16] restructure worldgen --- .../common/world/{ => biome}/DepthScaleBiome.java | 2 +- .../common/world/{ => biome}/EarthSpaceBiome.java | 2 +- .../world/generation/{ => mars}/MarsBiomeSource.java | 11 ++++------- .../generation/{ => mars}/MarsChunkGenerator.java | 3 ++- .../world/generation/{ => moon}/MoonBiomeSource.java | 4 ++-- .../generation/{ => moon}/MoonChunkGenerator.java | 2 +- .../{ => space}/EarthSpaceBiomeSource.java | 2 +- .../{ => space}/EarthSpaceChunkGenerator.java | 2 +- .../world/layer/{ => mars}/MarsBiomeLayer.java | 2 +- .../world/layer/{ => mars}/MarsRiverLayer.java | 2 +- .../world/layer/{ => moon}/MoonBiomeLayer.java | 2 +- .../world/layer/{ => util}/PlainsOnlyLayer.java | 2 +- .../astromine/mixin/ServerChunkManagerMixin.java | 12 ++++++------ .../astromine/registry/AstromineBiomes.java | 10 +++++----- .../astromine/registry/AstromineChunkGenerators.java | 6 +++--- 15 files changed, 31 insertions(+), 33 deletions(-) rename src/main/java/com/github/chainmailstudios/astromine/common/world/{ => biome}/DepthScaleBiome.java (96%) rename src/main/java/com/github/chainmailstudios/astromine/common/world/{ => biome}/EarthSpaceBiome.java (97%) rename src/main/java/com/github/chainmailstudios/astromine/common/world/generation/{ => mars}/MarsBiomeSource.java (90%) rename src/main/java/com/github/chainmailstudios/astromine/common/world/generation/{ => mars}/MarsChunkGenerator.java (97%) rename src/main/java/com/github/chainmailstudios/astromine/common/world/generation/{ => moon}/MoonBiomeSource.java (98%) rename src/main/java/com/github/chainmailstudios/astromine/common/world/generation/{ => moon}/MoonChunkGenerator.java (99%) rename src/main/java/com/github/chainmailstudios/astromine/common/world/generation/{ => space}/EarthSpaceBiomeSource.java (99%) rename src/main/java/com/github/chainmailstudios/astromine/common/world/generation/{ => space}/EarthSpaceChunkGenerator.java (99%) rename src/main/java/com/github/chainmailstudios/astromine/common/world/layer/{ => mars}/MarsBiomeLayer.java (99%) rename src/main/java/com/github/chainmailstudios/astromine/common/world/layer/{ => mars}/MarsRiverLayer.java (99%) rename src/main/java/com/github/chainmailstudios/astromine/common/world/layer/{ => moon}/MoonBiomeLayer.java (99%) rename src/main/java/com/github/chainmailstudios/astromine/common/world/layer/{ => util}/PlainsOnlyLayer.java (98%) diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/DepthScaleBiome.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/biome/DepthScaleBiome.java similarity index 96% rename from src/main/java/com/github/chainmailstudios/astromine/common/world/DepthScaleBiome.java rename to src/main/java/com/github/chainmailstudios/astromine/common/world/biome/DepthScaleBiome.java index 1a0e9bb93..afda9ffd9 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/DepthScaleBiome.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/biome/DepthScaleBiome.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.chainmailstudios.astromine.common.world; +package com.github.chainmailstudios.astromine.common.world.biome; import net.minecraft.sound.BiomeMoodSound; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/EarthSpaceBiome.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/biome/EarthSpaceBiome.java similarity index 97% rename from src/main/java/com/github/chainmailstudios/astromine/common/world/EarthSpaceBiome.java rename to src/main/java/com/github/chainmailstudios/astromine/common/world/biome/EarthSpaceBiome.java index c27ec5b1d..2b574600d 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/EarthSpaceBiome.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/biome/EarthSpaceBiome.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.chainmailstudios.astromine.common.world; +package com.github.chainmailstudios.astromine.common.world.biome; import com.github.chainmailstudios.astromine.registry.AstromineEntityTypes; import com.github.chainmailstudios.astromine.registry.AstromineFeatures; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/mars/MarsBiomeSource.java similarity index 90% rename from src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java rename to src/main/java/com/github/chainmailstudios/astromine/common/world/generation/mars/MarsBiomeSource.java index 26fe347db..0627fb917 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsBiomeSource.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/mars/MarsBiomeSource.java @@ -1,19 +1,16 @@ -package com.github.chainmailstudios.astromine.common.world.generation; +package com.github.chainmailstudios.astromine.common.world.generation.mars; import java.util.function.LongFunction; -import com.github.chainmailstudios.astromine.common.world.layer.MarsBiomeLayer; -import com.github.chainmailstudios.astromine.common.world.layer.MarsRiverLayer; -import com.github.chainmailstudios.astromine.common.world.layer.MoonBiomeLayer; -import com.github.chainmailstudios.astromine.common.world.layer.PlainsOnlyLayer; -import com.github.chainmailstudios.astromine.registry.AstromineBiomes; +import com.github.chainmailstudios.astromine.common.world.layer.mars.MarsBiomeLayer; +import com.github.chainmailstudios.astromine.common.world.layer.mars.MarsRiverLayer; +import com.github.chainmailstudios.astromine.common.world.layer.util.PlainsOnlyLayer; import com.google.common.collect.ImmutableList; import com.mojang.serialization.Codec; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.layer.ScaleLayer; import net.minecraft.world.biome.layer.SimpleLandNoiseLayer; -import net.minecraft.world.biome.layer.type.ParentedLayer; import net.minecraft.world.biome.layer.util.CachingLayerContext; import net.minecraft.world.biome.layer.util.LayerFactory; import net.minecraft.world.biome.layer.util.LayerSampleContext; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsChunkGenerator.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/mars/MarsChunkGenerator.java similarity index 97% rename from src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsChunkGenerator.java rename to src/main/java/com/github/chainmailstudios/astromine/common/world/generation/mars/MarsChunkGenerator.java index 8a509903f..cd63f6146 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MarsChunkGenerator.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/mars/MarsChunkGenerator.java @@ -1,4 +1,4 @@ -package com.github.chainmailstudios.astromine.common.world.generation; +package com.github.chainmailstudios.astromine.common.world.generation.mars; import java.util.Arrays; import java.util.Random; @@ -6,6 +6,7 @@ import com.github.chainmailstudios.astromine.common.miscellaneous.BiomeGenCache; import com.github.chainmailstudios.astromine.common.noise.OctaveNoiseSampler; import com.github.chainmailstudios.astromine.common.noise.OpenSimplexNoise; +import com.github.chainmailstudios.astromine.common.world.generation.moon.MoonBiomeSource; import com.github.chainmailstudios.astromine.registry.AstromineBlocks; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MoonBiomeSource.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/moon/MoonBiomeSource.java similarity index 98% rename from src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MoonBiomeSource.java rename to src/main/java/com/github/chainmailstudios/astromine/common/world/generation/moon/MoonBiomeSource.java index 3d715217d..9ff246640 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MoonBiomeSource.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/moon/MoonBiomeSource.java @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.chainmailstudios.astromine.common.world.generation; +package com.github.chainmailstudios.astromine.common.world.generation.moon; import java.util.function.LongFunction; -import com.github.chainmailstudios.astromine.common.world.layer.MoonBiomeLayer; +import com.github.chainmailstudios.astromine.common.world.layer.moon.MoonBiomeLayer; import com.google.common.collect.ImmutableList; import com.mojang.serialization.Codec; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MoonChunkGenerator.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/moon/MoonChunkGenerator.java similarity index 99% rename from src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MoonChunkGenerator.java rename to src/main/java/com/github/chainmailstudios/astromine/common/world/generation/moon/MoonChunkGenerator.java index 52379ef23..77e5fd89d 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/MoonChunkGenerator.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/moon/MoonChunkGenerator.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.chainmailstudios.astromine.common.world.generation; +package com.github.chainmailstudios.astromine.common.world.generation.moon; import java.util.Arrays; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/EarthSpaceBiomeSource.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/space/EarthSpaceBiomeSource.java similarity index 99% rename from src/main/java/com/github/chainmailstudios/astromine/common/world/generation/EarthSpaceBiomeSource.java rename to src/main/java/com/github/chainmailstudios/astromine/common/world/generation/space/EarthSpaceBiomeSource.java index de675cd24..25034325a 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/EarthSpaceBiomeSource.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/space/EarthSpaceBiomeSource.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.chainmailstudios.astromine.common.world.generation; +package com.github.chainmailstudios.astromine.common.world.generation.space; import com.github.chainmailstudios.astromine.registry.AstromineBiomes; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/EarthSpaceChunkGenerator.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/space/EarthSpaceChunkGenerator.java similarity index 99% rename from src/main/java/com/github/chainmailstudios/astromine/common/world/generation/EarthSpaceChunkGenerator.java rename to src/main/java/com/github/chainmailstudios/astromine/common/world/generation/space/EarthSpaceChunkGenerator.java index 6bad18e80..71e4be166 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/EarthSpaceChunkGenerator.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/generation/space/EarthSpaceChunkGenerator.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.chainmailstudios.astromine.common.world.generation; +package com.github.chainmailstudios.astromine.common.world.generation.space; import com.github.chainmailstudios.astromine.common.noise.OctaveNoiseSampler; import com.github.chainmailstudios.astromine.common.noise.OpenSimplexNoise; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsBiomeLayer.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/mars/MarsBiomeLayer.java similarity index 99% rename from src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsBiomeLayer.java rename to src/main/java/com/github/chainmailstudios/astromine/common/world/layer/mars/MarsBiomeLayer.java index f5a8bbf09..8844002ea 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsBiomeLayer.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/mars/MarsBiomeLayer.java @@ -1,4 +1,4 @@ -package com.github.chainmailstudios.astromine.common.world.layer; +package com.github.chainmailstudios.astromine.common.world.layer.mars; import com.github.chainmailstudios.astromine.registry.AstromineBiomes; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsRiverLayer.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/mars/MarsRiverLayer.java similarity index 99% rename from src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsRiverLayer.java rename to src/main/java/com/github/chainmailstudios/astromine/common/world/layer/mars/MarsRiverLayer.java index 48124e69c..8c8f43498 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MarsRiverLayer.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/mars/MarsRiverLayer.java @@ -1,4 +1,4 @@ -package com.github.chainmailstudios.astromine.common.world.layer; +package com.github.chainmailstudios.astromine.common.world.layer.mars; import com.github.chainmailstudios.astromine.registry.AstromineBiomes; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MoonBiomeLayer.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/moon/MoonBiomeLayer.java similarity index 99% rename from src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MoonBiomeLayer.java rename to src/main/java/com/github/chainmailstudios/astromine/common/world/layer/moon/MoonBiomeLayer.java index 6b4d9aacd..3bcc6fd29 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/MoonBiomeLayer.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/moon/MoonBiomeLayer.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.chainmailstudios.astromine.common.world.layer; +package com.github.chainmailstudios.astromine.common.world.layer.moon; import com.github.chainmailstudios.astromine.registry.AstromineBiomes; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/PlainsOnlyLayer.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/util/PlainsOnlyLayer.java similarity index 98% rename from src/main/java/com/github/chainmailstudios/astromine/common/world/layer/PlainsOnlyLayer.java rename to src/main/java/com/github/chainmailstudios/astromine/common/world/layer/util/PlainsOnlyLayer.java index 1fb7a35ac..97bfda5e7 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/PlainsOnlyLayer.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/layer/util/PlainsOnlyLayer.java @@ -1,4 +1,4 @@ -package com.github.chainmailstudios.astromine.common.world.layer; +package com.github.chainmailstudios.astromine.common.world.layer.util; import net.minecraft.world.biome.layer.type.InitLayer; import net.minecraft.world.biome.layer.util.IdentityCoordinateTransformer; diff --git a/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerChunkManagerMixin.java b/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerChunkManagerMixin.java index 9d45ff228..c473bd292 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerChunkManagerMixin.java +++ b/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerChunkManagerMixin.java @@ -26,12 +26,12 @@ import java.util.concurrent.Executor; import java.util.function.Supplier; -import com.github.chainmailstudios.astromine.common.world.generation.EarthSpaceBiomeSource; -import com.github.chainmailstudios.astromine.common.world.generation.EarthSpaceChunkGenerator; -import com.github.chainmailstudios.astromine.common.world.generation.MarsBiomeSource; -import com.github.chainmailstudios.astromine.common.world.generation.MarsChunkGenerator; -import com.github.chainmailstudios.astromine.common.world.generation.MoonBiomeSource; -import com.github.chainmailstudios.astromine.common.world.generation.MoonChunkGenerator; +import com.github.chainmailstudios.astromine.common.world.generation.space.EarthSpaceBiomeSource; +import com.github.chainmailstudios.astromine.common.world.generation.space.EarthSpaceChunkGenerator; +import com.github.chainmailstudios.astromine.common.world.generation.mars.MarsBiomeSource; +import com.github.chainmailstudios.astromine.common.world.generation.mars.MarsChunkGenerator; +import com.github.chainmailstudios.astromine.common.world.generation.moon.MoonBiomeSource; +import com.github.chainmailstudios.astromine.common.world.generation.moon.MoonChunkGenerator; import com.mojang.datafixers.DataFixer; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java index 852b86f85..d5b754725 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java @@ -24,11 +24,11 @@ package com.github.chainmailstudios.astromine.registry; import com.github.chainmailstudios.astromine.AstromineCommon; -import com.github.chainmailstudios.astromine.common.world.EarthSpaceBiome; -import com.github.chainmailstudios.astromine.common.world.DepthScaleBiome; -import com.github.chainmailstudios.astromine.common.world.generation.EarthSpaceBiomeSource; -import com.github.chainmailstudios.astromine.common.world.generation.MarsBiomeSource; -import com.github.chainmailstudios.astromine.common.world.generation.MoonBiomeSource; +import com.github.chainmailstudios.astromine.common.world.biome.EarthSpaceBiome; +import com.github.chainmailstudios.astromine.common.world.biome.DepthScaleBiome; +import com.github.chainmailstudios.astromine.common.world.generation.space.EarthSpaceBiomeSource; +import com.github.chainmailstudios.astromine.common.world.generation.mars.MarsBiomeSource; +import com.github.chainmailstudios.astromine.common.world.generation.moon.MoonBiomeSource; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineChunkGenerators.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineChunkGenerators.java index 95b28a426..13a40e0ec 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineChunkGenerators.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineChunkGenerators.java @@ -24,9 +24,9 @@ package com.github.chainmailstudios.astromine.registry; import com.github.chainmailstudios.astromine.AstromineCommon; -import com.github.chainmailstudios.astromine.common.world.generation.EarthSpaceChunkGenerator; -import com.github.chainmailstudios.astromine.common.world.generation.MarsChunkGenerator; -import com.github.chainmailstudios.astromine.common.world.generation.MoonChunkGenerator; +import com.github.chainmailstudios.astromine.common.world.generation.space.EarthSpaceChunkGenerator; +import com.github.chainmailstudios.astromine.common.world.generation.mars.MarsChunkGenerator; +import com.github.chainmailstudios.astromine.common.world.generation.moon.MoonChunkGenerator; import net.minecraft.util.registry.Registry; From 28d7292a8074857f4e7adb4bb15fcd444ace8fc4 Mon Sep 17 00:00:00 2001 From: SuperCoder7979 Date: Thu, 23 Jul 2020 20:54:53 -0400 Subject: [PATCH 13/16] added very very high quality craters --- .../common/world/biome/MoonBiome.java | 15 +++++ .../world/feature/MoonCraterFeature.java | 66 +++++++++++++++++++ .../astromine/registry/AstromineBiomes.java | 8 ++- .../astromine/registry/AstromineFeatures.java | 9 +-- 4 files changed, 89 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/github/chainmailstudios/astromine/common/world/biome/MoonBiome.java create mode 100644 src/main/java/com/github/chainmailstudios/astromine/common/world/feature/MoonCraterFeature.java diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/biome/MoonBiome.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/biome/MoonBiome.java new file mode 100644 index 000000000..7070dcf2d --- /dev/null +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/biome/MoonBiome.java @@ -0,0 +1,15 @@ +package com.github.chainmailstudios.astromine.common.world.biome; + +import com.github.chainmailstudios.astromine.registry.AstromineFeatures; + +import net.minecraft.world.gen.GenerationStep; +import net.minecraft.world.gen.decorator.CountDecoratorConfig; +import net.minecraft.world.gen.decorator.Decorator; +import net.minecraft.world.gen.feature.DefaultFeatureConfig; + +public class MoonBiome extends DepthScaleBiome { + public MoonBiome(float baseHeight, float variation) { + super(baseHeight, variation); + this.addFeature(GenerationStep.Feature.RAW_GENERATION, AstromineFeatures.MOON_CRATER.configure(DefaultFeatureConfig.INSTANCE).createDecoratedFeature(Decorator.COUNT_HEIGHTMAP.configure(new CountDecoratorConfig(2)))); + } +} diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/world/feature/MoonCraterFeature.java b/src/main/java/com/github/chainmailstudios/astromine/common/world/feature/MoonCraterFeature.java new file mode 100644 index 000000000..3b1dd9958 --- /dev/null +++ b/src/main/java/com/github/chainmailstudios/astromine/common/world/feature/MoonCraterFeature.java @@ -0,0 +1,66 @@ +package com.github.chainmailstudios.astromine.common.world.feature; + +import java.util.Random; + +import com.github.chainmailstudios.astromine.common.noise.OpenSimplexNoise; +import com.mojang.serialization.Codec; + +import net.minecraft.block.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ServerWorldAccess; +import net.minecraft.world.gen.StructureAccessor; +import net.minecraft.world.gen.chunk.ChunkGenerator; +import net.minecraft.world.gen.feature.DefaultFeatureConfig; +import net.minecraft.world.gen.feature.Feature; + +public class MoonCraterFeature extends Feature { + private static final double SCALE = 1 / 19.42; + private long seed = 0; + private OpenSimplexNoise noise = new OpenSimplexNoise(0); + + public MoonCraterFeature(Codec configCodec) { + super(configCodec); + } + + @Override + public boolean generate(ServerWorldAccess world, StructureAccessor structureAccessor, ChunkGenerator generator, Random random, BlockPos pos, DefaultFeatureConfig config) { + if (this.seed != world.getSeed()) { + this.noise = new OpenSimplexNoise(world.getSeed()); + this.seed = world.getSeed(); + } + + int radius = random.nextInt(7) + 4; + + int radiusSquared = radius * radius; + + for (int x = -radius; x <= radius; x++) { + for (int z = -radius; z <= radius; z++) { + + for (int y = -radius; y <= radius; y++) { + int squareDistance = (x * x) + (y * y) + (z * z); + + if (squareDistance <= radiusSquared) { + BlockPos local = pos.add(x, y, z); + + double noiseX = local.getX() * SCALE; + double noiseY = local.getY() * SCALE; + double noiseZ = local.getZ() * SCALE; + + double noise = this.noise.sample(noiseX, noiseY, noiseZ); + noise += computeNoiseFalloff(y, radius); + + if (noise > 0 && !world.getBlockState(local).isAir()) { + world.setBlockState(local, Blocks.AIR.getDefaultState(), 3); + } + } + } + } + } + + return true; + } + + private double computeNoiseFalloff(int y, int radius) { + return -(2.0 / (y + radius + 0.5)); + } +} diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java index d5b754725..4cc8f89c8 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBiomes.java @@ -26,6 +26,7 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.world.biome.EarthSpaceBiome; import com.github.chainmailstudios.astromine.common.world.biome.DepthScaleBiome; +import com.github.chainmailstudios.astromine.common.world.biome.MoonBiome; import com.github.chainmailstudios.astromine.common.world.generation.space.EarthSpaceBiomeSource; import com.github.chainmailstudios.astromine.common.world.generation.mars.MarsBiomeSource; import com.github.chainmailstudios.astromine.common.world.generation.moon.MoonBiomeSource; @@ -49,9 +50,10 @@ public static void initialize() { // Biomes ASTEROID_BELT = Registry.register(Registry.BIOME, AstromineCommon.identifier("asteroid_belt"), new EarthSpaceBiome()); - MOON_FLATS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_flats"), new DepthScaleBiome(100, 20)); - MOON_HILLS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_hills"), new DepthScaleBiome(105, 30)); - MOON_LOWLANDS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_lowlands"), new DepthScaleBiome(93, 9)); + MOON_FLATS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_flats"), new MoonBiome(100, 20)); + MOON_HILLS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_hills"), new MoonBiome(105, 30)); + MOON_LOWLANDS = Registry.register(Registry.BIOME, AstromineCommon.identifier("moon_lowlands"), new MoonBiome(93, 9)); + MARS = Registry.register(Registry.BIOME, AstromineCommon.identifier("mars"), new DepthScaleBiome(100, 1)); MARS_RIVERBED = Registry.register(Registry.BIOME, AstromineCommon.identifier("mars_riverbed"), new DepthScaleBiome(60, 0.1f)); } diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineFeatures.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineFeatures.java index f358c3f88..223603142 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineFeatures.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineFeatures.java @@ -27,6 +27,7 @@ import com.github.chainmailstudios.astromine.common.world.feature.AsteroidOreFeature; import com.github.chainmailstudios.astromine.common.world.feature.MeteorFeature; import com.github.chainmailstudios.astromine.common.world.feature.MeteorGenerator; +import com.github.chainmailstudios.astromine.common.world.feature.MoonCraterFeature; import net.earthcomputer.libstructure.LibStructure; import net.minecraft.structure.StructurePieceType; import net.minecraft.util.registry.Registry; @@ -41,12 +42,7 @@ public class AstromineFeatures { public static Feature ASTEROID_ORES; - - public static final Feature ASTEROIDS = Registry.register( - Registry.FEATURE, - AstromineCommon.identifier("asteroids_feature"), - new AsteroidOreFeature(DefaultFeatureConfig.CODEC) - ); + public static Feature MOON_CRATER; public static final StructurePieceType METEOR = register(MeteorGenerator::new, "meteor"); @@ -56,6 +52,7 @@ public static StructurePieceType register(StructurePieceType pieceType, String i public static void initialize() { ASTEROID_ORES = Registry.register(Registry.FEATURE, AstromineCommon.identifier("asteroid_ores"), new AsteroidOreFeature(DefaultFeatureConfig.CODEC)); + MOON_CRATER = Registry.register(Registry.FEATURE, AstromineCommon.identifier("moon_crater"), new MoonCraterFeature(DefaultFeatureConfig.CODEC)); // initialize meteor structure/feature MeteorFeature meteor = new MeteorFeature(DefaultFeatureConfig.CODEC); From aec98de4821ecded843f474cf92be49a869480e4 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 24 Jul 2020 11:09:05 +0800 Subject: [PATCH 14/16] Remove dumb vini fix :tiny_potato: --- .../astromine/client/registry/AsteroidOreRegistry.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/github/chainmailstudios/astromine/client/registry/AsteroidOreRegistry.java b/src/main/java/com/github/chainmailstudios/astromine/client/registry/AsteroidOreRegistry.java index 995547da1..d15df138f 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/client/registry/AsteroidOreRegistry.java +++ b/src/main/java/com/github/chainmailstudios/astromine/client/registry/AsteroidOreRegistry.java @@ -50,9 +50,6 @@ public void register(Range range, Block block) { } else { diameters.put(block, range); } - - this.minimumDiameters.put(block, minimumDiameter); - this.maximumDiameters.put(block, maximumDiameter); } public Set keySet() { From f12f0659cab4c25f2a73b731631802ab2549ce65 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 24 Jul 2020 17:04:24 +1000 Subject: [PATCH 15/16] Fix crash when attack speed doesnt exist Fixes #179 --- .../chainmailstudios/astromine/mixin/MiningToolItemMixin.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/github/chainmailstudios/astromine/mixin/MiningToolItemMixin.java b/src/main/java/com/github/chainmailstudios/astromine/mixin/MiningToolItemMixin.java index a4d19dc36..6ff05805f 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/mixin/MiningToolItemMixin.java +++ b/src/main/java/com/github/chainmailstudios/astromine/mixin/MiningToolItemMixin.java @@ -33,6 +33,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; +import java.util.Optional; import java.util.UUID; @Mixin(MiningToolItem.class) @@ -42,6 +43,7 @@ public abstract class MiningToolItemMixin implements MiningToolItemAccess { @Override public double astromine_getAttackSpeed() { - return getAttributeModifiers(EquipmentSlot.MAINHAND).get(EntityAttributes.GENERIC_ATTACK_SPEED).stream().filter((EntityAttributeModifier modifier) -> modifier.getId().equals(UUID.fromString("FA233E1C-4180-4865-B01B-BCCE9785ACA3"))).findFirst().get().getValue(); + Optional opt = getAttributeModifiers(EquipmentSlot.MAINHAND).get(EntityAttributes.GENERIC_ATTACK_SPEED).stream().filter((EntityAttributeModifier modifier) -> modifier.getId().equals(UUID.fromString("FA233E1C-4180-4865-B01B-BCCE9785ACA3"))).findFirst(); + return opt.map(EntityAttributeModifier::getValue).orElse(0d); } } From 3d061a3e069efa00d5b5f7c3cbbaa4e74a59e416 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 24 Jul 2020 17:07:28 +1000 Subject: [PATCH 16/16] bump to 1.3.5 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fc3f5a42c..3b969648b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ api_version = 0.15.1+build.380-1.16.1 # Mod mod_name = astromine -mod_version = 1.3.4 +mod_version = 1.3.5 mod_group = com.github.chainmailstudios version_meta = fabric-1.16.1