11 Commits

Author SHA1 Message Date
RyanTLG
cb1fedc2fc release 1.1.2 2022-05-15 15:20:30 +02:00
RyanTLG
6a220b43dc slight changes 2022-05-15 00:49:06 +02:00
RyanTLG
3ccaaf149a genius 2022-05-07 17:29:54 +02:00
RyanTLG
5e801ec1d5 i am an idiot 2022-05-07 17:20:58 +02:00
RyanTLG
6d37a1e3ff Update CHANGELOG 2022-05-07 17:16:37 +02:00
RyanTLG
9b7b950f9a fixed dumb shit 2022-05-07 17:15:16 +02:00
RyanTLG
555113e04e update name
FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU
2022-05-01 14:42:02 +02:00
RyanTLG
714a636a83 Update CHANGELOG 2022-04-30 14:41:46 +02:00
RyanTLG
b00f4a96fa port gamer bow to 1.18.2 2022-04-30 14:40:45 +02:00
RyanTLG
95cf937175 Update to stable
for all i care this shit looks stable to me
2022-04-29 23:22:54 +02:00
RyanTLG
ceb4174a80 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
2022-04-29 23:17:08 +02:00
24 changed files with 8529 additions and 368 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,28 +1,23 @@
# Changes: # Changes:
## 1.18.1-1.0.1-unstable ## 1.18.2-0.1.0-unstable
- first test and register to Strong bow (name not decided yet) - changed dependencies for update to 1.18.2
- praying to god i did nothing wrong - 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
## 1.18.1-1.0.2-unstable ## 1.18.2-1.0.0-stable
- added model predicate provider - for all i care this shit looks stable to me
- 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.1-1.1.0-stable ## 1.18.2-1.1.0-stable
- renamed strong bow to Gamer Bow - ported gamer bow to 1.18.2
- added textures for Gamer Bow
- added crafting recipe for Gamer Bow
- fully implemented Gamer Bow
## 1.18.1-1.1.1-unstable ## 1.18.2-1.1.1-unstable
- fixed weem stacking to 85 (maybe) - fixed weem stacking to 85 (maybe)
- nerfed high effect - nerfed high effect
## 1.18.1-1.1.2-unstable ## 1.18.2-1.1.2-unstable
- added healing back to high effect with lower amplifier - added healing back to high effect with lower amplifier
- changed block strength of all (non joke) blocks - changed block strength of all (non joke) blocks
- 1.1.2 complete
## 1.18.1-1.1.3-unstable (incomplete)
- added evade enchantment
- added more advancements

BIN
badges/poweredbyelec.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '0.10-SNAPSHOT' id 'fabric-loom' version '0.11-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }
@@ -16,7 +16,6 @@ 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 {

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=-Xmx4G org.gradle.jvmargs=-Xmx6G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.18.1 minecraft_version=1.18.2
yarn_mappings=1.18.1+build.1 yarn_mappings=1.18.2+build.3
loader_version=0.12.12 loader_version=0.13.2
# Mod Properties # Mod Properties
mod_version = 1.18.1-1.1.2-unstable mod_version = 1.18.2-1.1.2-unstable
maven_group = ryantlg.GamerItems.mod maven_group = ryantlg.GamerItems.mod
archives_base_name = GamerItems archives_base_name = GamerItems
# Dependencies # 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; 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.Tag; import net.minecraft.tag.TagKey;
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 Tag<Block> ORES = TagFactory.BLOCK.create(new Identifier("gameritems", "ores")); public static final TagKey<Block> ORES = TagKey.of(Registry.BLOCK_KEY, new Identifier("gameritems", "ores"));
} }

View File

@@ -1,53 +0,0 @@
package net.arcmods.ryantlg.enchantments;
import net.arcmods.ryantlg.gameritems;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentTarget;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EquipmentSlot;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
public class evadeEnchantment extends Enchantment {
public evadeEnchantment() {
super(Enchantment.Rarity.UNCOMMON, EnchantmentTarget.ARMOR_CHEST, new EquipmentSlot[] {EquipmentSlot.HEAD, EquipmentSlot.CHEST, EquipmentSlot.FEET, EquipmentSlot.LEGS});
}
@Override
public int getMinPower(int level) {
return 30;
}
@Override
public int getMaxLevel() {
return 4;
}
// public void onTargetDamaged(LivingEntity user, Entity target, int level) {
// if(target instanceof LivingEntity) {
// ((LivingEntity) user).addStatusEffect(new StatusEffectInstance(StatusEffects.SPEED, 20 * 5, level - 1));
// }
// super.onTargetDamaged(user, target, level);
// }
@Override
public void onUserDamaged(LivingEntity user, Entity attacker, int level) {
if (attacker instanceof LivingEntity) {
((LivingEntity) user).addStatusEffect(new StatusEffectInstance(StatusEffects.SPEED, 20 * 7, level));
((LivingEntity) attacker).addStatusEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 20 * 5, level));
}
super.onUserDamaged(user, attacker, level);
}
public static void register() {
Registry.register(
Registry.ENCHANTMENT,
new Identifier("gameritems", "evade"),
new evadeEnchantment()
);
gameritems.LOGGER.info("evadeEnchantment loaded");
}
}

View File

@@ -5,7 +5,6 @@ import net.arcmods.ryantlg.blocks.FunnyBlocks;
import net.arcmods.ryantlg.blocks.jeremiumBlocks; import net.arcmods.ryantlg.blocks.jeremiumBlocks;
import net.arcmods.ryantlg.blocks.omniumBlocks; import net.arcmods.ryantlg.blocks.omniumBlocks;
import net.arcmods.ryantlg.blocks.oriumBlocks; import net.arcmods.ryantlg.blocks.oriumBlocks;
import net.arcmods.ryantlg.enchantments.evadeEnchantment;
import net.arcmods.ryantlg.items.armour.jeremiumArmour; import net.arcmods.ryantlg.items.armour.jeremiumArmour;
import net.arcmods.ryantlg.items.armour.notArmour; import net.arcmods.ryantlg.items.armour.notArmour;
import net.arcmods.ryantlg.items.armour.omniumArmour; import net.arcmods.ryantlg.items.armour.omniumArmour;
@@ -101,8 +100,6 @@ public class gameritems implements ModInitializer {
notArmour.register(); notArmour.register();
gamerBow.register(); gamerBow.register();
evadeEnchantment.register();
} }
//fight me //fight me

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.04f)); .conditionally(RandomChanceLootCondition.builder(0.0123132f));
supplier.withPool(weemSeed.build()); supplier.withPool(weemSeed.build());
} }

View File

@@ -4,5 +4,4 @@ crafting recipes
advancements advancements
argentine argentine
geranine geranine
soulium soulium
floute

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.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry; import net.minecraft.client.item.ModelPredicateProviderRegistry;
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) {
FabricModelPredicateProviderRegistry.register(bow, new Identifier("pull"), ModelPredicateProviderRegistry.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;
}); });
FabricModelPredicateProviderRegistry.register(bow, new Identifier("pulling"), ModelPredicateProviderRegistry.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);
} }

View File

@@ -1,5 +1,7 @@
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;
@@ -7,29 +9,43 @@ 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
@@ -37,11 +53,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");
} }

View File

@@ -1,5 +1,7 @@
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;
@@ -7,30 +9,44 @@ 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
public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement( private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
CountPlacementModifier.of(5), // number of veins per chunk Feature.ORE, new OreFeatureConfig(
SquarePlacementModifier.of(), // spreading horizontally OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES,
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))); // height 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() { public static void register() {

View File

@@ -1,5 +1,7 @@
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;
@@ -7,35 +9,47 @@ 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(
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( // public static PlacedFeature ORE_PLACED_FEATURE = ORE_CONFIGURED_FEATURE.withPlacement(
CountPlacementModifier.of(1), // number of veins per chunk // CountPlacementModifier.of(1), // number of veins per chunk
SquarePlacementModifier.of(), // spreading horizontally // SquarePlacementModifier.of(), // spreading horizontally
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(-4))); // height // 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"),

View File

@@ -1,5 +1,7 @@
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;
@@ -7,38 +9,52 @@ 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(
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( // public static PlacedFeature OMNIUM_ORE_PLACED_FEATURE = OMNIUM_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
public static void register() { public static void register() {
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, Registry.register(BuiltinRegistries.CONFIGURED_FEATURE,
new Identifier("gameritems", "omnium_ore"), OMNIUM_ORE_CONFIGURED_FEATURE); new Identifier("gameritems", "omnium_ore"), ORE_CONFIGURED_FEATURE);
Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "omnium_ore"), Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "omnium_ore"),
OMNIUM_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", "omnium_ore"))); new Identifier("gameritems", "omnium_ore")));

View File

@@ -1,5 +1,7 @@
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;
@@ -7,38 +9,51 @@ 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(
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( // public static PlacedFeature ORIUM_ORE_PLACED_FEATURE = ORIUM_ORE_CONFIGURED_FEATURE.withPlacement(
CountPlacementModifier.of(5), // number of veins per chunk // CountPlacementModifier.of(5), // number of veins per chunk
SquarePlacementModifier.of(), // spreading horizontally // SquarePlacementModifier.of(), // spreading horizontally
HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(35))); // height // 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"), ORIUM_ORE_CONFIGURED_FEATURE); new Identifier("gameritems", "orium_ore"), ORE_CONFIGURED_FEATURE);
Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "orium_ore"), Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "orium_ore"),
ORIUM_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", "orium_ore"))); new Identifier("gameritems", "orium_ore")));

View File

@@ -69,7 +69,6 @@
"block.gameritems.deepslate_jeremium_ore": "Deepslate Jeremium Ore", "block.gameritems.deepslate_jeremium_ore": "Deepslate Jeremium Ore",
"block.gameritems.deepslate_omnium_ore": "Deepslate Omnium Ore", "block.gameritems.deepslate_omnium_ore": "Deepslate Omnium Ore",
"block.gameritems.deepslate_orium_ore": "Deepslate Orium Ore", "block.gameritems.deepslate_orium_ore": "Deepslate Orium Ore",
"item.gameritems.gamer_bow": "Gamer Bow", "item.gameritems.gamer_bow": "Gamer Bow"
"enchantment.gameritems.evade": "Evade"
} }

View File

@@ -1,43 +0,0 @@
{
"display": {
"icon": {
"item": "gameritems:jeremium_helmet"
},
"title": "coSvered in red",
"description": "Get a full set of Jeremium armour",
"frame": "task",
"show_toast": true,
"announce_to_chat": true
},
"parent": "gameritems:raw_jeremium",
"criteria": {
"requirement": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"gameritems:jeremium_helmet"
]
},
{
"items": [
"gameritems:jeremium_chestplate"
]
},
{
"items": [
"gameritems:jeremium_leggings"
]
},
{
"items": [
"gameritems:jeremium_boots"
]
}
]
}
}
}
}

View File

@@ -1,43 +0,0 @@
{
"display": {
"icon": {
"item": "gameritems:omnium_helmet"
},
"title": "covereD in greEn",
"description": "Get a full set of Omnium armour",
"frame": "task",
"show_toast": true,
"announce_to_chat": true
},
"parent": "gameritems:raw_omnium",
"criteria": {
"requirement": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"gameritems:omnium_helmet"
]
},
{
"items": [
"gameritems:omnium_chestplate"
]
},
{
"items": [
"gameritems:omnium_leggings"
]
},
{
"items": [
"gameritems:omnium_boots"
]
}
]
}
}
}
}

View File

@@ -1,42 +0,0 @@
{
"display": {
"icon": {
"item": "gameritems:orium_helmet"
},
"title": "covered iN blUe",
"description": "Get a full set of Orium armour",
"frame": "task",
"show_toast": true,
"announce_to_chat": true
},
"parent": "gameritems:raw_orium",
"criteria": {
"requirement": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"gameritems:orium_helmet"
]
},
{
"items": [
"gameritems:orium_chestplate"
]
},
{
"items": [
"gameritems:orium_leggings"
]
},
{
"items": [
"gameritems:orium_boots"
]
}
]
}
}
}
}

View File

@@ -1,27 +0,0 @@
{
"display": {
"icon": {
"item": "gameritems:raw_jeremium"
},
"title": "reD?",
"description": "Get a piece of raw Jeremium",
"frame": "task",
"show_toast": true,
"announce_to_chat": true
},
"parent": "gameritems:omnium_armour",
"criteria": {
"requirement": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"gameritems:raw_jeremium"
]
}
]
}
}
}
}

View File

@@ -1,27 +1,27 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "gameritems:raw_omnium" "item": "gameritems:raw_omnium"
},
"title": "greEN?",
"description": "Get a piece of raw Omnium",
"frame": "task",
"show_toast": true,
"announce_to_chat": true
}, },
"title": "greEN?", "parent": "gameritems:gameritems",
"description": "Get a piece of raw Omnium", "criteria": {
"frame": "task", "requirement": {
"show_toast": true, "trigger": "minecraft:inventory_changed",
"announce_to_chat": true "conditions": {
}, "items": [
"parent": "gameritems:orium_armour", {
"criteria": { "items": [
"requirement": { "gameritems:raw_omnium"
"trigger": "minecraft:inventory_changed", ]
"conditions": { }
"items": [ ]
{ }
"items": [
"gameritems:raw_omnium"
]
}
]
} }
} }
} }
}

View File

@@ -1,27 +0,0 @@
{
"display": {
"icon": {
"item": "gameritems:raw_orium"
},
"title": "blueS?",
"description": "Get a piece of raw Orium",
"frame": "task",
"show_toast": true,
"announce_to_chat": true
},
"parent": "gameritems:gameritems",
"criteria": {
"requirement": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"gameritems:raw_orium"
]
}
]
}
}
}
}

View File

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