Update to 1.18.2

changed dependencies for update to 1.18.2
still have "errors" in code, not sure how to fix
ore gen works perfectly (checked) even with errors
created CHANGELOG file for version branch
still have crippling depression
This commit is contained in:
RyanTLG
2022-04-29 23:17:08 +02:00
parent d0326ddb09
commit ceb4174a80
10 changed files with 163 additions and 79 deletions

8
CHANGELOG Normal file
View File

@@ -0,0 +1,8 @@
# Changes:
## 1.18.2-0.1.0-unstable
- changed dependencies for update to 1.18.2
- still have "errors" in code, not sure how to fix
- ore gen works perfectly (checked) even with errors
- created CHANGELOG file for version branch
- have crippling depression
- man, updating is a bitch

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.10-SNAPSHOT'
id 'fabric-loom' version '0.11-SNAPSHOT'
id 'maven-publish'
}
@@ -16,7 +16,6 @@ repositories {
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories.
allprojects { repositories { maven { url 'https://jitpack.io' } } }
}
dependencies {

View File

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx6G
# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.18.1
yarn_mappings=1.18.1+build.1
loader_version=0.12.12
minecraft_version=1.18.2
yarn_mappings=1.18.2+build.3
loader_version=0.13.2
# Mod Properties
mod_version = 1.18.1-1.0.0-stable
mod_version = 1.18.2-0.1.9-unstable
maven_group = ryantlg.GamerMod.mod
archives_base_name = GamerMod
# Dependencies
fabric_version=0.46.0+1.18
fabric_version=0.51.1+1.18.2

View File

@@ -1,10 +1,10 @@
package net.arcmods.ryantlg;
import net.fabricmc.fabric.api.tag.TagFactory;
import net.minecraft.block.Block;
import net.minecraft.tag.Tag;
import net.minecraft.tag.TagKey;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
public class BlockTags {
public static final Tag<Block> ORES = TagFactory.BLOCK.create(new Identifier("gamermod", "ores"));
public static final TagKey<Block> ORES = TagKey.of(Registry.BLOCK_KEY, new Identifier("gamermod", "ores"));
}

View File

@@ -1,5 +1,7 @@
package net.arcmods.ryantlg.worldGeneration;
import java.util.Arrays;
import net.arcmods.ryantlg.gamermod;
import net.arcmods.ryantlg.blocks.omniumBlocks;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
@@ -7,29 +9,43 @@ import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.gen.YOffset;
import net.minecraft.world.gen.GenerationStep;
import net.minecraft.world.gen.decorator.CountPlacementModifier;
import net.minecraft.world.gen.decorator.HeightRangePlacementModifier;
import net.minecraft.world.gen.decorator.SquarePlacementModifier;
import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.OreConfiguredFeatures;
import net.minecraft.world.gen.feature.OreFeatureConfig;
import net.minecraft.world.gen.feature.PlacedFeature;
import net.minecraft.world.gen.placementmodifier.CountPlacementModifier;
import net.minecraft.world.gen.placementmodifier.HeightRangePlacementModifier;
import net.minecraft.world.gen.placementmodifier.SquarePlacementModifier;
import net.minecraft.util.registry.BuiltinRegistries;
import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryEntry;
import net.minecraft.util.Identifier;
public class DeepslateOmniumOreGen {
private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
/*private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
omniumBlocks.DEEPSLATE_OMNIUM_ORE.getDefaultState(),
4)); // vein size
4)); // vein size*/
private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
Feature.ORE, new OreFeatureConfig(
OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
omniumBlocks.DEEPSLATE_OMNIUM_ORE.getDefaultState(),
4)); // vein size
public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
/*public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
CountPlacementModifier.of(2), // number of veins per chunk
SquarePlacementModifier.of(), // spreading horizontally
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(19))); // height
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(19))); // height*/
public static PlacedFeature ORE_PLACED_FEATURE = new PlacedFeature(
RegistryEntry.of(ORE_CONFIGURED_FEATURE),
Arrays.asList(
CountPlacementModifier.of(2), // number of veins per chunk
SquarePlacementModifier.of(), // spreading horizontally
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(19))
)); // height
@@ -37,11 +53,11 @@ public class DeepslateOmniumOreGen {
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE,
new Identifier("gamermod", "deepslate_omnium_ore"), ORE_CONFIGURED_FEATURE);
Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gamermod", "deepslate_omnium_ore"),
ORE_PLACED_FEATURE);
BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES,
RegistryKey.of(Registry.PLACED_FEATURE_KEY,
new Identifier("gamermod", "deepslate_omnium_ore")));
Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gamermod", "deepslate_omnium_ore"),
ORE_PLACED_FEATURE);
BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES,
RegistryKey.of(Registry.PLACED_FEATURE_KEY,
new Identifier("gamermod", "deepslate_omnium_ore")));
gamermod.LOGGER.info("DeepslateOmniumOreGen loaded");
}

View File

@@ -1,5 +1,7 @@
package net.arcmods.ryantlg.worldGeneration;
import java.util.Arrays;
import net.arcmods.ryantlg.gamermod;
import net.arcmods.ryantlg.blocks.oriumBlocks;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
@@ -7,30 +9,44 @@ import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.gen.YOffset;
import net.minecraft.world.gen.GenerationStep;
import net.minecraft.world.gen.decorator.CountPlacementModifier;
import net.minecraft.world.gen.decorator.HeightRangePlacementModifier;
import net.minecraft.world.gen.decorator.SquarePlacementModifier;
import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.OreConfiguredFeatures;
import net.minecraft.world.gen.feature.OreFeatureConfig;
import net.minecraft.world.gen.feature.PlacedFeature;
import net.minecraft.world.gen.placementmodifier.CountPlacementModifier;
import net.minecraft.world.gen.placementmodifier.HeightRangePlacementModifier;
import net.minecraft.world.gen.placementmodifier.SquarePlacementModifier;
import net.minecraft.util.registry.BuiltinRegistries;
import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryEntry;
import net.minecraft.util.Identifier;
public class DeepslateOriumOreGen {
private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
oriumBlocks.DEEPSLATE_ORIUM_ORE.getDefaultState(),
5)); // vein size
public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
CountPlacementModifier.of(5), // number of veins per chunk
SquarePlacementModifier.of(), // spreading horizontally
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))); // height
// private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
// OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
// oriumBlocks.DEEPSLATE_ORIUM_ORE.getDefaultState(),
// 5)); // vein size
private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
Feature.ORE, new OreFeatureConfig(
OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
oriumBlocks.DEEPSLATE_ORIUM_ORE.getDefaultState(),
5)); // vein size
// public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
// CountPlacementModifier.of(5), // number of veins per chunk
// SquarePlacementModifier.of(), // spreading horizontally
// HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))); // height
public static PlacedFeature ORE_PLACED_FEATURE = new PlacedFeature(
RegistryEntry.of(ORE_CONFIGURED_FEATURE),
Arrays.asList(
CountPlacementModifier.of(5), // number of veins per chunk
SquarePlacementModifier.of(), // spreading horizontally
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))
)); // height
public static void register() {

View File

@@ -1,5 +1,7 @@
package net.arcmods.ryantlg.worldGeneration;
import java.util.Arrays;
import net.arcmods.ryantlg.gamermod;
import net.arcmods.ryantlg.blocks.jeremiumBlocks;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
@@ -7,35 +9,47 @@ import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.gen.YOffset;
import net.minecraft.world.gen.GenerationStep;
import net.minecraft.world.gen.decorator.CountPlacementModifier;
import net.minecraft.world.gen.decorator.HeightRangePlacementModifier;
import net.minecraft.world.gen.decorator.SquarePlacementModifier;
import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.OreConfiguredFeatures;
import net.minecraft.world.gen.feature.OreFeatureConfig;
import net.minecraft.world.gen.feature.PlacedFeature;
import net.minecraft.world.gen.placementmodifier.CountPlacementModifier;
import net.minecraft.world.gen.placementmodifier.HeightRangePlacementModifier;
import net.minecraft.world.gen.placementmodifier.SquarePlacementModifier;
import net.minecraft.util.registry.BuiltinRegistries;
import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryEntry;
import net.minecraft.util.Identifier;
public class JeremiumOreGen {
private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
jeremiumBlocks.DEEPSLATE_JEREMIUM_ORE.getDefaultState(),
3)); // vein size
// private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
// OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
// jeremiumBlocks.DEEPSLATE_JEREMIUM_ORE.getDefaultState(),
// 3)); // vein size
private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
Feature.ORE, new OreFeatureConfig(
OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
jeremiumBlocks.DEEPSLATE_JEREMIUM_ORE.getDefaultState(),
3)); // vein size
public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
CountPlacementModifier.of(1), // number of veins per chunk
SquarePlacementModifier.of(), // spreading horizontally
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(-4))); // height
// public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
// CountPlacementModifier.of(1), // number of veins per chunk
// SquarePlacementModifier.of(), // spreading horizontally
// HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(-4))); // height
public static PlacedFeature ORE_PLACED_FEATURE = new PlacedFeature(
RegistryEntry.of(ORE_CONFIGURED_FEATURE),
Arrays.asList(
CountPlacementModifier.of(1), // number of veins per chunk
SquarePlacementModifier.of(), // spreading horizontally
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(-4))
)); // height
public static void register() {
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE,
new Identifier("gamermod", "deepslate_jeremium_ore"), ORE_CONFIGURED_FEATURE);
Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gamermod", "deepslate_jeremium_ore"),

View File

@@ -1,5 +1,7 @@
package net.arcmods.ryantlg.worldGeneration;
import java.util.Arrays;
import net.arcmods.ryantlg.gamermod;
import net.arcmods.ryantlg.blocks.omniumBlocks;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
@@ -7,38 +9,52 @@ import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.gen.YOffset;
import net.minecraft.world.gen.GenerationStep;
import net.minecraft.world.gen.decorator.CountPlacementModifier;
import net.minecraft.world.gen.decorator.HeightRangePlacementModifier;
import net.minecraft.world.gen.decorator.SquarePlacementModifier;
import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.OreConfiguredFeatures;
import net.minecraft.world.gen.feature.OreFeatureConfig;
import net.minecraft.world.gen.feature.PlacedFeature;
import net.minecraft.world.gen.placementmodifier.CountPlacementModifier;
import net.minecraft.world.gen.placementmodifier.HeightRangePlacementModifier;
import net.minecraft.world.gen.placementmodifier.SquarePlacementModifier;
import net.minecraft.util.registry.BuiltinRegistries;
import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryEntry;
import net.minecraft.util.Identifier;
public class OmniumOreGen {
private static ConfiguredFeature<?, ?> OMNIUM_ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
omniumBlocks.OMNIUM_ORE.getDefaultState(),
4)); // vein size
// private static ConfiguredFeature<?, ?> OMNIUM_ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
// OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
// omniumBlocks.OMNIUM_ORE.getDefaultState(),
// 4)); // vein size
private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
Feature.ORE, new OreFeatureConfig(
OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
omniumBlocks.OMNIUM_ORE.getDefaultState(),
4)); // vein size
public static PlacedFeature OMNIUM_ORE_PLACED_FEATURE = OMNIUM_ORE_CONFIGURED_FEATURE.withPlacement(
CountPlacementModifier.of(2), // number of veins per chunk
SquarePlacementModifier.of(), // spreading horizontally
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(19))); // height
// public static PlacedFeature OMNIUM_ORE_PLACED_FEATURE = OMNIUM_ORE_CONFIGURED_FEATURE.withPlacement(
// CountPlacementModifier.of(2), // number of veins per chunk
// SquarePlacementModifier.of(), // spreading horizontally
// HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(19))); // height
public static PlacedFeature ORE_PLACED_FEATURE = new PlacedFeature(
RegistryEntry.of(ORE_CONFIGURED_FEATURE),
Arrays.asList(
CountPlacementModifier.of(2), // number of veins per chunk
SquarePlacementModifier.of(), // spreading horizontally
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(19))
)); // height
public static void register() {
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE,
new Identifier("gamermod", "omnium_ore"), OMNIUM_ORE_CONFIGURED_FEATURE);
new Identifier("gamermod", "omnium_ore"), ORE_CONFIGURED_FEATURE);
Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gamermod", "omnium_ore"),
OMNIUM_ORE_PLACED_FEATURE);
ORE_PLACED_FEATURE);
BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES,
RegistryKey.of(Registry.PLACED_FEATURE_KEY,
new Identifier("gamermod", "omnium_ore")));

View File

@@ -1,5 +1,7 @@
package net.arcmods.ryantlg.worldGeneration;
import java.util.Arrays;
import net.arcmods.ryantlg.gamermod;
import net.arcmods.ryantlg.blocks.oriumBlocks;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
@@ -7,38 +9,51 @@ import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.gen.YOffset;
import net.minecraft.world.gen.GenerationStep;
import net.minecraft.world.gen.decorator.CountPlacementModifier;
import net.minecraft.world.gen.decorator.HeightRangePlacementModifier;
import net.minecraft.world.gen.decorator.SquarePlacementModifier;
import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.OreConfiguredFeatures;
import net.minecraft.world.gen.feature.OreFeatureConfig;
import net.minecraft.world.gen.feature.PlacedFeature;
import net.minecraft.world.gen.placementmodifier.CountPlacementModifier;
import net.minecraft.world.gen.placementmodifier.HeightRangePlacementModifier;
import net.minecraft.world.gen.placementmodifier.SquarePlacementModifier;
import net.minecraft.util.registry.BuiltinRegistries;
import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryEntry;
import net.minecraft.util.Identifier;
public class OriumOreGen {
private static ConfiguredFeature<?, ?> ORIUM_ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
oriumBlocks.ORIUM_ORE.getDefaultState(),
5)); // vein size
// private static ConfiguredFeature<?, ?> ORIUM_ORE_CONFIGURED_FEATURE = Feature.ORE.configure(new OreFeatureConfig(
// OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
// oriumBlocks.ORIUM_ORE.getDefaultState(),
// 5)); // vein size
private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
Feature.ORE, new OreFeatureConfig(
OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
oriumBlocks.ORIUM_ORE.getDefaultState(),
5)); // vein size
public static PlacedFeature ORIUM_ORE_PLACED_FEATURE = ORIUM_ORE_CONFIGURED_FEATURE.withPlacement(
CountPlacementModifier.of(5), // number of veins per chunk
SquarePlacementModifier.of(), // spreading horizontally
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))); // height
// public static PlacedFeature ORIUM_ORE_PLACED_FEATURE = ORIUM_ORE_CONFIGURED_FEATURE.withPlacement(
// CountPlacementModifier.of(5), // number of veins per chunk
// SquarePlacementModifier.of(), // spreading horizontally
// HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))); // height
public static PlacedFeature ORE_PLACED_FEATURE = new PlacedFeature(
RegistryEntry.of(ORE_CONFIGURED_FEATURE),
Arrays.asList(
CountPlacementModifier.of(5), // number of veins per chunk
SquarePlacementModifier.of(), // spreading horizontally
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))
)); // height
public static void register() {
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE,
new Identifier("gamermod", "orium_ore"), ORIUM_ORE_CONFIGURED_FEATURE);
new Identifier("gamermod", "orium_ore"), ORE_CONFIGURED_FEATURE);
Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gamermod", "orium_ore"),
ORIUM_ORE_PLACED_FEATURE);
ORE_PLACED_FEATURE);
BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES,
RegistryKey.of(Registry.PLACED_FEATURE_KEY,
new Identifier("gamermod", "orium_ore")));

View File

@@ -31,12 +31,12 @@
],
"depends": {
"fabricloader": ">=0.12.12",
"fabricloader": ">=0.13.2",
"fabric": "*",
"minecraft": "1.18.1",
"minecraft": "1.18.2",
"java": ">=17"
},
"suggests": {
"darkevolution": "1.18.1-x"
"darkevolution": "1.18.2-x"
}
}