Gaemer/GamerItems
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Compare commits

base: Gaemer:1.18.2-1.1.2-unstable
Branches Tags
Gaemer:1.19/stable Gaemer:1.19.2/unstable Gaemer:1.19.2/stable Gaemer:1.19/unstable Gaemer:1-18-2/unstable Gaemer:1-18-1/unstable Gaemer:images Gaemer:1.18.1/stable Gaemer:1-18-2/stable
Gaemer:1.18.2-1.1.2-unstable Gaemer:1.18.1-1.1.2-unstable Gaemer:1.18.1-1.1.1-unstable Gaemer:1.18.2-1.1.1-unstable Gaemer:1.18.1-1.1.0-stable Gaemer:1.18.2-1.1.0-stable
..
compare: Gaemer:1.18.1/stable
Branches Tags
Gaemer:1.19.2/unstable Gaemer:1.19.2/stable Gaemer:1.19/unstable Gaemer:1.19/stable Gaemer:1-18-2/unstable Gaemer:1-18-1/unstable Gaemer:images Gaemer:1.18.1/stable Gaemer:1-18-2/stable
Gaemer:1.18.2-1.1.2-unstable Gaemer:1.18.1-1.1.2-unstable Gaemer:1.18.1-1.1.1-unstable Gaemer:1.18.2-1.1.1-unstable Gaemer:1.18.1-1.1.0-stable Gaemer:1.18.2-1.1.0-stable

4 Commits
1.18.2-1.1 ... 1.18.1/sta

Author SHA1 Message Date
RyanTLG
126f41617f update name 2022-05-01 15:09:52 +02:00
RyanTLG
b0eaaeb61d Finalized bow item 2022-04-30 14:23:23 +02:00
RyanTLG
e6d5c373f9 Add bowModelPredicateProvider 2022-04-30 13:46:37 +02:00
RyanTLG
c97fad41f6 First strongbow test 2022-04-30 12:48:55 +02:00
20 changed files with 115 additions and 8525 deletions
Expand all files Collapse all files

8330
AAAAAAAAAAAAAAAa
View File

File diff suppressed because it is too large Load Diff

33
CHANGELOG
View File

@@ -1,23 +1,16 @@
# Changes: # Changes:
## 1.18.2-0.1.0-unstable ## 1.18.1-1.0.1-unstable
- changed dependencies for update to 1.18.2 - first test and register to Strong bow (name not decided yet)
- still have "errors" in code, not sure how to fix - praying to god i did nothing wrong
- ore gen works perfectly (checked) even with errors
- created CHANGELOG file for version branch
- have crippling depression
- man, updating is a bitch
## 1.18.2-1.0.0-stable ## 1.18.1-1.0.2-unstable
- for all i care this shit looks stable to me - added model predicate provider
- changed bow maxDamage to 458 from 19 (found ot it wasnt attack damage)
- registered model predicate provider in client initializer
- figuring out new stuff is painful
## 1.18.2-1.1.0-stable ## 1.18.1-1.1.0-stable
- ported gamer bow to 1.18.2 - renamed strong bow to Gamer Bow
- added textures for Gamer Bow
## 1.18.2-1.1.1-unstable - added crafting recipe for Gamer Bow
- fixed weem stacking to 85 (maybe) - fully implemented Gamer Bow
- nerfed high effect
## 1.18.2-1.1.2-unstable
- added healing back to high effect with lower amplifier
- changed block strength of all (non joke) blocks
- 1.1.2 complete

BIN
badges/poweredbyelec.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.3 KiB

3
build.gradle
View File

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

12
gradle.properties
View File

@@ -1,16 +1,16 @@
# Done to increase the memory available to gradle. # Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx6G org.gradle.jvmargs=-Xmx4G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.18.2 minecraft_version=1.18.1
yarn_mappings=1.18.2+build.3 yarn_mappings=1.18.1+build.1
loader_version=0.13.2 loader_version=0.12.12
# Mod Properties # Mod Properties
mod_version = 1.18.2-1.1.2-unstable mod_version = 1.18.1-1.1.0-stable
maven_group = ryantlg.GamerItems.mod maven_group = ryantlg.GamerItems.mod
archives_base_name = GamerItems archives_base_name = GamerItems
# Dependencies # Dependencies
fabric_version=0.51.1+1.18.2 fabric_version=0.46.0+1.18

6
src/main/java/net/arcmods/ryantlg/BlockTags.java
View File

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

6
src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java
View File

@@ -13,9 +13,9 @@ import net.minecraft.util.registry.Registry;
public class jeremiumBlocks { public class jeremiumBlocks {
public static final Block JEREMIUM_BLOCK = new jeremiumBlock(FabricBlockSettings.of(Material.METAL).strength(5.5f, 4.8f).requiresTool().luminance(16)); public static final Block JEREMIUM_BLOCK = new jeremiumBlock(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool().luminance(16));
public static final Block JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(6.5f, 8.0f).requiresTool().luminance(5)); public static final Block JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().luminance(5));
public static final Block DEEPSLATE_JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f, 4.2f).requiresTool().luminance(5).sounds(BlockSoundGroup.DEEPSLATE)); public static final Block DEEPSLATE_JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().luminance(5).sounds(BlockSoundGroup.DEEPSLATE));
public static void register() { public static void register() {
Registry.register(Registry.BLOCK, new Identifier("gameritems", "jeremium_ore"), JEREMIUM_ORE); Registry.register(Registry.BLOCK, new Identifier("gameritems", "jeremium_ore"), JEREMIUM_ORE);

6
src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java
View File

@@ -11,9 +11,9 @@ import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
public class omniumBlocks { public class omniumBlocks {
public static final Block OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(3.5f, 4.0f).requiresTool()); public static final Block OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool());
public static final Block OMNIUM_BLOCK = new Block(FabricBlockSettings.of(Material.METAL).strength(5.5f, 7f).requiresTool()); public static final Block OMNIUM_BLOCK = new Block(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool());
public static final Block DEEPSLATE_OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.5f, 3.5f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE)); public static final Block DEEPSLATE_OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
public static void register() { public static void register() {

6
src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java
View File

@@ -13,9 +13,9 @@ import net.minecraft.util.Rarity;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
public class oriumBlocks { public class oriumBlocks {
public static final Block ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(3.2f, 3.0f).requiresTool()); public static final Block ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool());
public static final Block ORIUM_BLOCK = new oriumBlock(FabricBlockSettings.of(Material.METAL).strength(5.0f, 4.0F).requiresTool()); public static final Block ORIUM_BLOCK = new oriumBlock(FabricBlockSettings.of(Material.METAL).strength(4.0f).requiresTool());
public static final Block DEEPSLATE_ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.3f, 3.5f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE)); public static final Block DEEPSLATE_ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
public static void register() { public static void register() {

2
src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java
View File

@@ -18,7 +18,7 @@ public class weemItems {
//main items //main items
//================================================================================================================ //================================================================================================================
public static final Item WEEM = new Item(new Item.Settings().group(gameritems.CHING).maxCount(64)); public static final Item WEEM = new Item(new Item.Settings().group(gameritems.CHING).maxCount(128));
// foods // foods
//================================================================================================================ //================================================================================================================

2
src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java
View File

@@ -22,7 +22,7 @@ public class grassVanillaWeem {
.rolls(ConstantLootNumberProvider.create(1)) .rolls(ConstantLootNumberProvider.create(1))
.with(ItemEntry.builder(weemItems.WEEM_SEEDS)) .with(ItemEntry.builder(weemItems.WEEM_SEEDS))
.withFunction(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0f)).build()) .withFunction(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0f)).build())
.conditionally(RandomChanceLootCondition.builder(0.0123132f)); .conditionally(RandomChanceLootCondition.builder(0.04f));
supplier.withPool(weemSeed.build()); supplier.withPool(weemSeed.build());
} }

6
src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java
View File

@@ -2,7 +2,7 @@ package net.arcmods.ryantlg.statusEffects;
import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.gameritems;
import net.arcmods.ryantlg.statusEffects.effectClasses.highStatusEffect; import net.arcmods.ryantlg.statusEffects.effectClasses.highStatusEffect;
//import net.arcmods.ryantlg.statusEffects.effectClasses.jeremydStatusEffect; import net.arcmods.ryantlg.statusEffects.effectClasses.jeremydStatusEffect;
import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffect;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
@@ -11,12 +11,12 @@ public class GamerEffects {
public static final StatusEffect HIGH = new highStatusEffect(); public static final StatusEffect HIGH = new highStatusEffect();
//public static final StatusEffect JEREMYD = new jeremydStatusEffect(); public static final StatusEffect JEREMYD = new jeremydStatusEffect();
public static void register() { public static void register() {
Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "high"), HIGH); Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "high"), HIGH);
//Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "jeremyd"), JEREMYD); Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "jeremyd"), JEREMYD);
gameritems.LOGGER.info("statusEffects Loaded"); gameritems.LOGGER.info("statusEffects Loaded");
} }

7
src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/highStatusEffect.java
View File

@@ -1,7 +1,7 @@
package net.arcmods.ryantlg.statusEffects.effectClasses; package net.arcmods.ryantlg.statusEffects.effectClasses;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
//import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.damage.DamageSource;
import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffect;
import net.minecraft.entity.effect.StatusEffectCategory; import net.minecraft.entity.effect.StatusEffectCategory;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
@@ -22,10 +22,13 @@ public class highStatusEffect extends StatusEffect{
@Override @Override
public void applyUpdateEffect(LivingEntity entity, int amplifier) { public void applyUpdateEffect(LivingEntity entity, int amplifier) {
if (entity instanceof PlayerEntity) { if (entity instanceof PlayerEntity) {
((PlayerEntity) entity).addExperience(0 << amplifier);
((PlayerEntity) entity).getFallSounds(); ((PlayerEntity) entity).getFallSounds();
((PlayerEntity) entity).disableShield(true); ((PlayerEntity) entity).disableShield(true);
((PlayerEntity) entity).dismountVehicle(); ((PlayerEntity) entity).dismountVehicle();
((PlayerEntity) entity).heal(0 << amplifier); ((PlayerEntity) entity).damage(DamageSource.FALL, (float) 0.01);
((PlayerEntity) entity).heal(3 << amplifier);
((PlayerEntity) entity).getFallSounds();
} }
} }

6
src/main/java/net/arcmods/ryantlg/utils/bowModelPredicateProvider.java
View File

@@ -1,7 +1,7 @@
package net.arcmods.ryantlg.utils; package net.arcmods.ryantlg.utils;
import net.arcmods.ryantlg.items.bows.gamerBow; import net.arcmods.ryantlg.items.bows.gamerBow;
import net.minecraft.client.item.ModelPredicateProviderRegistry; import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
@@ -12,7 +12,7 @@ public class bowModelPredicateProvider {
} }
private static void registerBow(Item bow) { private static void registerBow(Item bow) {
ModelPredicateProviderRegistry.register(bow, new Identifier("pull"), FabricModelPredicateProviderRegistry.register(bow, new Identifier("pull"),
(stack, world, entity, seed) -> { (stack, world, entity, seed) -> {
if (entity == null) { if (entity == null) {
return 0.0f; return 0.0f;
@@ -23,7 +23,7 @@ public class bowModelPredicateProvider {
return (float)(stack.getMaxUseTime() - entity.getItemUseTimeLeft()) / 20.0f; return (float)(stack.getMaxUseTime() - entity.getItemUseTimeLeft()) / 20.0f;
}); });
ModelPredicateProviderRegistry.register(bow, new Identifier("pulling"), FabricModelPredicateProviderRegistry.register(bow, new Identifier("pulling"),
(stack, world, entity, seed) -> entity != null && entity.isUsingItem() (stack, world, entity, seed) -> entity != null && entity.isUsingItem()
&& entity.getActiveItem() == stack ? 1.0f : 0.0f); && entity.getActiveItem() == stack ? 1.0f : 0.0f);
} }

40
src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOmniumOreGen.java
View File

@@ -1,7 +1,5 @@
package net.arcmods.ryantlg.worldGeneration; package net.arcmods.ryantlg.worldGeneration;
import java.util.Arrays;
import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.gameritems;
import net.arcmods.ryantlg.blocks.omniumBlocks; import net.arcmods.ryantlg.blocks.omniumBlocks;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
@@ -9,43 +7,29 @@ import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
import net.minecraft.util.registry.RegistryKey; import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.gen.YOffset; import net.minecraft.world.gen.YOffset;
import net.minecraft.world.gen.GenerationStep; 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.ConfiguredFeature;
import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.OreConfiguredFeatures; import net.minecraft.world.gen.feature.OreConfiguredFeatures;
import net.minecraft.world.gen.feature.OreFeatureConfig; import net.minecraft.world.gen.feature.OreFeatureConfig;
import net.minecraft.world.gen.feature.PlacedFeature; 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.BuiltinRegistries;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryEntry;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
public class DeepslateOmniumOreGen { 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, OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
omniumBlocks.DEEPSLATE_OMNIUM_ORE.getDefaultState(), 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 CountPlacementModifier.of(2), // number of veins per chunk
SquarePlacementModifier.of(), // spreading horizontally 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
@@ -53,11 +37,11 @@ public class DeepslateOmniumOreGen {
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, Registry.register(BuiltinRegistries.CONFIGURED_FEATURE,
new Identifier("gameritems", "deepslate_omnium_ore"), ORE_CONFIGURED_FEATURE); new Identifier("gameritems", "deepslate_omnium_ore"), ORE_CONFIGURED_FEATURE);
Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "deepslate_omnium_ore"), Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "deepslate_omnium_ore"),
ORE_PLACED_FEATURE); ORE_PLACED_FEATURE);
BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES,
RegistryKey.of(Registry.PLACED_FEATURE_KEY, RegistryKey.of(Registry.PLACED_FEATURE_KEY,
new Identifier("gameritems", "deepslate_omnium_ore"))); new Identifier("gameritems", "deepslate_omnium_ore")));
gameritems.LOGGER.info("DeepslateOmniumOreGen loaded"); gameritems.LOGGER.info("DeepslateOmniumOreGen loaded");
} }

38
src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOriumOreGen.java
View File

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

38
src/main/java/net/arcmods/ryantlg/worldGeneration/JeremiumOreGen.java
View File

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

42
src/main/java/net/arcmods/ryantlg/worldGeneration/OmniumOreGen.java
View File

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

41
src/main/java/net/arcmods/ryantlg/worldGeneration/OriumOreGen.java
View File

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

6
src/main/resources/fabric.mod.json
View File

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