Compare commits
16 Commits
1.18.1-1.1
...
1.19/stabl
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
188c889737 | ||
|
|
5eb78fbbd2 | ||
|
|
15808a2598 | ||
|
|
ed7a3dd418 | ||
|
|
cf6114eda3 | ||
|
|
cb1fedc2fc | ||
|
|
6a220b43dc | ||
|
|
3ccaaf149a | ||
|
|
5e801ec1d5 | ||
|
|
6d37a1e3ff | ||
|
|
9b7b950f9a | ||
|
|
555113e04e | ||
|
|
714a636a83 | ||
|
|
b00f4a96fa | ||
|
|
95cf937175 | ||
|
|
ceb4174a80 |
8330
AAAAAAAAAAAAAAAa
8330
AAAAAAAAAAAAAAAa
File diff suppressed because it is too large
Load Diff
22
CHANGELOG
22
CHANGELOG
@@ -1,20 +1,6 @@
|
|||||||
# Changes:
|
# Changes:
|
||||||
## 1.18.1-1.0.1-unstable
|
## 1.19-1.0.0-stable
|
||||||
- first test and register to Strong bow (name not decided yet)
|
- updating is despicable
|
||||||
- praying to god i did nothing wrong
|
|
||||||
|
|
||||||
## 1.18.1-1.0.2-unstable
|
## 1.19-1.1.0-stable
|
||||||
- added model predicate provider
|
- fixed an issue where the game crashes when right clicking on weem, Matt Damon, Elon Musk
|
||||||
- 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
|
|
||||||
- renamed strong bow to Gamer Bow
|
|
||||||
- added textures for Gamer Bow
|
|
||||||
- added crafting recipe for Gamer Bow
|
|
||||||
- fully implemented Gamer Bow
|
|
||||||
|
|
||||||
## 1.18.1-1.1.1-unstable
|
|
||||||
- fixed weem stacking to 85 (maybe)
|
|
||||||
- nerfed high effect
|
|
||||||
BIN
badges/poweredbyelec.png
Normal file
BIN
badges/poweredbyelec.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
@@ -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 {
|
||||||
@@ -27,6 +26,8 @@ dependencies {
|
|||||||
|
|
||||||
// Fabric API. This is technically optional, but you probably want it anyway.
|
// Fabric API. This is technically optional, but you probably want it anyway.
|
||||||
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
|
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
|
||||||
|
modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
|
|||||||
@@ -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.19
|
||||||
yarn_mappings=1.18.1+build.1
|
yarn_mappings=1.19+build.4
|
||||||
loader_version=0.12.12
|
loader_version=0.14.8
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 1.18.1-1.1.1-unstable
|
mod_version = 1.19-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.46.0+1.18
|
fabric_version=0.57.0+1.19
|
||||||
|
|||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@@ -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"));
|
||||||
}
|
}
|
||||||
@@ -17,18 +17,4 @@ public class Damon extends Block{
|
|||||||
super(settings);
|
super(settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public ActionResult onUse(BlockState blockState, World world, BlockPos blockPos, PlayerEntity placedBy, Hand hand, BlockHitResult blockHitResult) {
|
|
||||||
if (!world.isClient) {
|
|
||||||
world.playSound(
|
|
||||||
null, // Player - if non-null, will play sound for every nearby player *except* the specified player
|
|
||||||
blockPos, // The position of where the sound will come from
|
|
||||||
sounds.MATT_SOUND_EVENT, // The sound that will play
|
|
||||||
SoundCategory.BLOCKS, // This determines which of the volume sliders affect this sound
|
|
||||||
1f, //Volume multiplier, 1 is normal, 0.5 is half volume, etc
|
|
||||||
1f // Pitch multiplier, 1 is normal, 0.5 is half pitch, etc
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return ActionResult.FAIL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,21 +40,6 @@ public class WeemCropBlock extends CropBlock {
|
|||||||
return AGE_TO_SHAPE[(Integer)state.get(this.getAgeProperty())];
|
return AGE_TO_SHAPE[(Integer)state.get(this.getAgeProperty())];
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public ActionResult onUse(BlockState blockState, World world, BlockPos blockPos, PlayerEntity placedBy, Hand hand, BlockHitResult blockHitResult) {
|
|
||||||
if (!world.isClient) {
|
|
||||||
world.playSound(
|
|
||||||
null, // Player - if non-null, will play sound for every nearby player *except* the specified player
|
|
||||||
blockPos, // The position of where the sound will come from
|
|
||||||
sounds.SNIFF_SOUND_EVENT, // The sound that will play
|
|
||||||
SoundCategory.BLOCKS, // This determines which of the volume sliders affect this sound
|
|
||||||
1f, //Volume multiplier, 1 is normal, 0.5 is half volume, etc
|
|
||||||
1f // Pitch multiplier, 1 is normal, 0.5 is half pitch, etc
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return ActionResult.FAIL;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -17,18 +17,4 @@ public class elon extends Block{
|
|||||||
super(settings);
|
super(settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public ActionResult onUse(BlockState blockState, World world, BlockPos blockPos, PlayerEntity placedBy, Hand hand, BlockHitResult blockHitResult) {
|
|
||||||
if (!world.isClient) {
|
|
||||||
world.playSound(
|
|
||||||
null, // Player - if non-null, will play sound for every nearby player *except* the specified player
|
|
||||||
blockPos, // The position of where the sound will come from
|
|
||||||
sounds.ELON_SOUND_EVENT, // The sound that will play
|
|
||||||
SoundCategory.BLOCKS, // This determines which of the volume sliders affect this sound
|
|
||||||
1f, //Volume multiplier, 1 is normal, 0.5 is half volume, etc
|
|
||||||
1f // Pitch multiplier, 1 is normal, 0.5 is half pitch, etc
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return ActionResult.FAIL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import net.minecraft.block.Block;
|
|||||||
import net.minecraft.client.item.TooltipContext;
|
import net.minecraft.client.item.TooltipContext;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import net.minecraft.util.Formatting;
|
import net.minecraft.util.Formatting;
|
||||||
import net.minecraft.world.BlockView;
|
import net.minecraft.world.BlockView;
|
||||||
|
|
||||||
@@ -17,8 +17,8 @@ public class jeremiumBlock extends Block{
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void appendTooltip(ItemStack itemStack, BlockView world, List<Text> tooltip, TooltipContext tooltipContext) {
|
public void appendTooltip(ItemStack itemStack, BlockView world, List<Text> tooltip, TooltipContext tooltipContext) {
|
||||||
tooltip.add( new TranslatableText("block.gameritems.jeremium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
tooltip.add(Text.translatable("block.gameritems.jeremium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
||||||
tooltip.add( new TranslatableText("all.gameritems.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
tooltip.add(Text.translatable("all.gameritems.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import net.minecraft.block.Block;
|
|||||||
import net.minecraft.client.item.TooltipContext;
|
import net.minecraft.client.item.TooltipContext;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import net.minecraft.util.Formatting;
|
import net.minecraft.util.Formatting;
|
||||||
import net.minecraft.world.BlockView;
|
import net.minecraft.world.BlockView;
|
||||||
|
|
||||||
@@ -17,6 +17,6 @@ public class oriumBlock extends Block{
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void appendTooltip(ItemStack itemStack, BlockView world, List<Text> tooltip, TooltipContext tooltipContext) {
|
public void appendTooltip(ItemStack itemStack, BlockView world, List<Text> tooltip, TooltipContext tooltipContext) {
|
||||||
tooltip.add( new TranslatableText("block.gameritems.orium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
tooltip.add(Text.translatable("block.gameritems.orium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
package net.arcmods.ryantlg.blocks;
|
|
||||||
|
|
||||||
import net.arcmods.ryantlg.gameritems;
|
|
||||||
import net.arcmods.ryantlg.blockClasses.WeemCropBlock;
|
|
||||||
import net.minecraft.block.AbstractBlock;
|
|
||||||
import net.minecraft.block.CropBlock;
|
|
||||||
import net.minecraft.block.Material;
|
|
||||||
import net.minecraft.sound.BlockSoundGroup;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.registry.Registry;
|
|
||||||
|
|
||||||
public class CropBlocks {
|
|
||||||
public static final CropBlock WEEM_CROP_BLOCK = new WeemCropBlock(AbstractBlock.Settings.of(Material.PLANT).nonOpaque().noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP));
|
|
||||||
|
|
||||||
public static void register() {
|
|
||||||
|
|
||||||
Registry.register(Registry.BLOCK, new Identifier("gameritems","weem_crop_block"), WEEM_CROP_BLOCK);
|
|
||||||
|
|
||||||
gameritems.LOGGER.info("CropBlocks loaded");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
31
src/main/java/net/arcmods/ryantlg/blocks/cropBlocks/weemCrop.java
Executable file
31
src/main/java/net/arcmods/ryantlg/blocks/cropBlocks/weemCrop.java
Executable file
@@ -0,0 +1,31 @@
|
|||||||
|
package net.arcmods.ryantlg.blocks.cropBlocks;
|
||||||
|
|
||||||
|
import net.arcmods.ryantlg.gameritems;
|
||||||
|
import net.arcmods.ryantlg.blockClasses.WeemCropBlock;
|
||||||
|
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
|
||||||
|
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
|
||||||
|
import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
|
||||||
|
import net.minecraft.block.AbstractBlock;
|
||||||
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.block.CropBlock;
|
||||||
|
import net.minecraft.block.Material;
|
||||||
|
import net.minecraft.block.PillarBlock;
|
||||||
|
import net.minecraft.item.BlockItem;
|
||||||
|
import net.minecraft.sound.BlockSoundGroup;
|
||||||
|
import net.minecraft.util.Identifier;
|
||||||
|
import net.minecraft.util.registry.Registry;
|
||||||
|
|
||||||
|
public class weemCrop {
|
||||||
|
public static final CropBlock WEEM_CROP_BLOCK = new WeemCropBlock(AbstractBlock.Settings.of(Material.PLANT).nonOpaque().noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP));
|
||||||
|
public static final Block WEEM_HAY_BLOCK = new PillarBlock(FabricBlockSettings.of(Material.SOLID_ORGANIC).nonOpaque().strength(1, 1).sounds(BlockSoundGroup.GRASS));
|
||||||
|
|
||||||
|
public static void register() {
|
||||||
|
|
||||||
|
Registry.register(Registry.BLOCK, new Identifier("gameritems","weem_crop_block"), WEEM_CROP_BLOCK);
|
||||||
|
Registry.register(Registry.BLOCK, new Identifier("gameritems", "weem_hay_block"), WEEM_HAY_BLOCK);
|
||||||
|
Registry.register(Registry.ITEM, new Identifier("gameritems", "weem_hay_block"), new BlockItem(WEEM_HAY_BLOCK, new FabricItemSettings().group(gameritems.CHING)));
|
||||||
|
FlammableBlockRegistry.getDefaultInstance().add(WEEM_HAY_BLOCK, 60, 20);
|
||||||
|
|
||||||
|
gameritems.LOGGER.info("CropBlocks loaded");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package net.arcmods.ryantlg.blocks;
|
package net.arcmods.ryantlg.blocks.metalBlocks;
|
||||||
|
|
||||||
import net.arcmods.ryantlg.gameritems;
|
import net.arcmods.ryantlg.gameritems;
|
||||||
import net.arcmods.ryantlg.blockClasses.jeremiumBlock;
|
import net.arcmods.ryantlg.blockClasses.jeremiumBlock;
|
||||||
@@ -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(4.0f).requiresTool().luminance(16));
|
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_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().luminance(5));
|
public static final Block JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(6.5f, 8.0f).requiresTool().luminance(5));
|
||||||
public static final Block DEEPSLATE_JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().luminance(5).sounds(BlockSoundGroup.DEEPSLATE));
|
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 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);
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package net.arcmods.ryantlg.blocks;
|
package net.arcmods.ryantlg.blocks.metalBlocks;
|
||||||
|
|
||||||
import net.arcmods.ryantlg.gameritems;
|
import net.arcmods.ryantlg.gameritems;
|
||||||
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
|
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
|
||||||
@@ -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(4.0f).requiresTool());
|
public static final Block OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(3.5f, 4.0f).requiresTool());
|
||||||
public static final Block OMNIUM_BLOCK = new Block(FabricBlockSettings.of(Material.METAL).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 DEEPSLATE_OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
|
public static final Block DEEPSLATE_OMNIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.5f, 3.5f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
|
||||||
|
|
||||||
public static void register() {
|
public static void register() {
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package net.arcmods.ryantlg.blocks;
|
package net.arcmods.ryantlg.blocks.metalBlocks;
|
||||||
|
|
||||||
import net.arcmods.ryantlg.gameritems;
|
import net.arcmods.ryantlg.gameritems;
|
||||||
import net.arcmods.ryantlg.blockClasses.oriumBlock;
|
import net.arcmods.ryantlg.blockClasses.oriumBlock;
|
||||||
@@ -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(4.0f).requiresTool());
|
public static final Block ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(3.2f, 3.0f).requiresTool());
|
||||||
public static final Block ORIUM_BLOCK = new oriumBlock(FabricBlockSettings.of(Material.METAL).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 DEEPSLATE_ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
|
public static final Block DEEPSLATE_ORIUM_ORE = new oriumBlock(FabricBlockSettings.of(Material.STONE).strength(4.3f, 3.5f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE));
|
||||||
|
|
||||||
public static void register() {
|
public static void register() {
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package net.arcmods.ryantlg.blocks;
|
package net.arcmods.ryantlg.blocks.otherBlocks;
|
||||||
|
|
||||||
import net.arcmods.ryantlg.gameritems;
|
import net.arcmods.ryantlg.gameritems;
|
||||||
import net.arcmods.ryantlg.blockClasses.Damon;
|
import net.arcmods.ryantlg.blockClasses.Damon;
|
||||||
@@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack;
|
|||||||
import net.minecraft.item.SwordItem;
|
import net.minecraft.item.SwordItem;
|
||||||
import net.minecraft.item.ToolMaterial;
|
import net.minecraft.item.ToolMaterial;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import net.minecraft.util.Formatting;
|
import net.minecraft.util.Formatting;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
@@ -21,7 +20,7 @@ public class JeremiumSwordItem extends SwordItem {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
||||||
tooltip.add( new TranslatableText("item.gameritems.jeremium_sword.tooltip").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC) );
|
tooltip.add(Text.translatable("item.gameritems.jeremium_sword.tooltip").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack;
|
|||||||
import net.minecraft.item.SwordItem;
|
import net.minecraft.item.SwordItem;
|
||||||
import net.minecraft.item.ToolMaterial;
|
import net.minecraft.item.ToolMaterial;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import net.minecraft.util.Formatting;
|
import net.minecraft.util.Formatting;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
@@ -17,6 +16,6 @@ public class OmniumSwordItem extends SwordItem {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
||||||
tooltip.add( new TranslatableText("item.gameritems.omnium_sword.tooltip").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC) );
|
tooltip.add(Text.translatable("item.gameritems.omnium_sword.tooltip").formatted(Formatting.RED) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
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");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
package net.arcmods.ryantlg;
|
package net.arcmods.ryantlg;
|
||||||
|
|
||||||
import net.arcmods.ryantlg.blocks.CropBlocks;
|
import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop;
|
||||||
import net.arcmods.ryantlg.blocks.FunnyBlocks;
|
import net.arcmods.ryantlg.blocks.metalBlocks.jeremiumBlocks;
|
||||||
import net.arcmods.ryantlg.blocks.jeremiumBlocks;
|
import net.arcmods.ryantlg.blocks.metalBlocks.omniumBlocks;
|
||||||
import net.arcmods.ryantlg.blocks.omniumBlocks;
|
import net.arcmods.ryantlg.blocks.metalBlocks.oriumBlocks;
|
||||||
import net.arcmods.ryantlg.blocks.oriumBlocks;
|
import net.arcmods.ryantlg.blocks.otherBlocks.FunnyBlocks;
|
||||||
|
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;
|
||||||
@@ -85,7 +86,7 @@ public class gameritems implements ModInitializer {
|
|||||||
OriumOreGen.register();
|
OriumOreGen.register();
|
||||||
DeepslateOriumOreGen.register();
|
DeepslateOriumOreGen.register();
|
||||||
|
|
||||||
CropBlocks.register();
|
weemCrop.register();
|
||||||
|
|
||||||
fabricOfReality.register();
|
fabricOfReality.register();
|
||||||
|
|
||||||
@@ -100,6 +101,8 @@ public class gameritems implements ModInitializer {
|
|||||||
notArmour.register();
|
notArmour.register();
|
||||||
gamerBow.register();
|
gamerBow.register();
|
||||||
|
|
||||||
|
evadeEnchantment.register();
|
||||||
|
|
||||||
}
|
}
|
||||||
//fight me
|
//fight me
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package net.arcmods.ryantlg;
|
package net.arcmods.ryantlg;
|
||||||
|
|
||||||
import net.arcmods.ryantlg.blocks.CropBlocks;
|
import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop;
|
||||||
import net.arcmods.ryantlg.utils.bowModelPredicateProvider;
|
import net.arcmods.ryantlg.utils.bowModelPredicateProvider;
|
||||||
import net.fabricmc.api.ClientModInitializer;
|
import net.fabricmc.api.ClientModInitializer;
|
||||||
import net.fabricmc.api.EnvType;
|
import net.fabricmc.api.EnvType;
|
||||||
@@ -13,7 +13,7 @@ public class gameritemsClient implements ClientModInitializer{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onInitializeClient() {
|
public void onInitializeClient() {
|
||||||
BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), CropBlocks.WEEM_CROP_BLOCK);
|
BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), weemCrop.WEEM_CROP_BLOCK);
|
||||||
|
|
||||||
bowModelPredicateProvider.registerBowModels();
|
bowModelPredicateProvider.registerBowModels();
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import net.minecraft.client.item.TooltipContext;
|
|||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import net.minecraft.util.Formatting;
|
import net.minecraft.util.Formatting;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
@@ -19,6 +18,8 @@ public class BreemItem extends Item {
|
|||||||
@Override
|
@Override
|
||||||
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
||||||
|
|
||||||
tooltip.add( new TranslatableText("item.gameritems.breem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
tooltip.add(Text.translatable("item.gameritems.breem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
||||||
}
|
|
||||||
|
//tooltip.add( new TranslatableText("item.gameritems.breem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import net.minecraft.client.item.TooltipContext;
|
|||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import net.minecraft.util.Formatting;
|
import net.minecraft.util.Formatting;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
@@ -19,7 +19,7 @@ public class FabricReality extends Item{
|
|||||||
@Override
|
@Override
|
||||||
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
||||||
|
|
||||||
tooltip.add( new TranslatableText("item.gameritems.fabric_of_reality.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
tooltip.add(Text.translatable("item.gameritems.fabric_of_reality.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import net.minecraft.client.item.TooltipContext;
|
|||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import net.minecraft.util.Formatting;
|
import net.minecraft.util.Formatting;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
@@ -19,6 +19,6 @@ public class WeemItem extends Item {
|
|||||||
@Override
|
@Override
|
||||||
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
||||||
|
|
||||||
tooltip.add( new TranslatableText("item.gameritems.weem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
tooltip.add(Text.translatable("item.gameritems.weem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import net.minecraft.client.item.TooltipContext;
|
|||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import net.minecraft.util.Formatting;
|
import net.minecraft.util.Formatting;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
@@ -19,7 +19,7 @@ public class jeremiumItem extends Item{
|
|||||||
@Override
|
@Override
|
||||||
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
||||||
|
|
||||||
tooltip.add( new TranslatableText("all.gameritems.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
tooltip.add(Text.translatable("all.gameritems.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import net.minecraft.client.item.TooltipContext;
|
|||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import net.minecraft.util.Formatting;
|
import net.minecraft.util.Formatting;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
@@ -19,7 +19,7 @@ public class oriumItem extends Item{
|
|||||||
@Override
|
@Override
|
||||||
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
||||||
|
|
||||||
tooltip.add( new TranslatableText("item.gameritems.orium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
tooltip.add(Text.translatable("item.gameritems.orium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package net.arcmods.ryantlg.items.itemsByCrop;
|
package net.arcmods.ryantlg.items.itemsByCrop;
|
||||||
|
|
||||||
import net.arcmods.ryantlg.gameritems;
|
import net.arcmods.ryantlg.gameritems;
|
||||||
import net.arcmods.ryantlg.blocks.CropBlocks;
|
import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop;
|
||||||
import net.arcmods.ryantlg.itemClasses.BreemItem;
|
import net.arcmods.ryantlg.itemClasses.BreemItem;
|
||||||
import net.arcmods.ryantlg.itemClasses.WeemItem;
|
import net.arcmods.ryantlg.itemClasses.WeemItem;
|
||||||
import net.arcmods.ryantlg.statusEffects.GamerEffects;
|
import net.arcmods.ryantlg.statusEffects.GamerEffects;
|
||||||
@@ -56,14 +56,13 @@ public class weemItems {
|
|||||||
|
|
||||||
//seeds
|
//seeds
|
||||||
//================================================================================================================
|
//================================================================================================================
|
||||||
public static final Item WEEM_SEEDS = new AliasedBlockItem(CropBlocks.WEEM_CROP_BLOCK, new Item.Settings().group(gameritems.CHING));
|
public static final Item WEEM_SEEDS = new AliasedBlockItem(weemCrop.WEEM_CROP_BLOCK, new Item.Settings().group(gameritems.CHING));
|
||||||
|
|
||||||
|
|
||||||
public static void register() {
|
public static void register() {
|
||||||
|
|
||||||
Registry.register(Registry.ITEM, new Identifier("gameritems", "breem"), BREEM);
|
Registry.register(Registry.ITEM, new Identifier("gameritems", "breem"), BREEM);
|
||||||
Registry.register(Registry.ITEM, new Identifier("gameritems", "weem_apple"), WEEM_APPLE);
|
Registry.register(Registry.ITEM, new Identifier("gameritems", "weem_apple"), WEEM_APPLE);
|
||||||
|
|
||||||
Registry.register(Registry.ITEM, new Identifier("gameritems","weem_seeds"), WEEM_SEEDS);
|
Registry.register(Registry.ITEM, new Identifier("gameritems","weem_seeds"), WEEM_SEEDS);
|
||||||
Registry.register(Registry.ITEM, new Identifier("gameritems", "weem"), WEEM);
|
Registry.register(Registry.ITEM, new Identifier("gameritems", "weem"), WEEM);
|
||||||
|
|
||||||
|
|||||||
@@ -2,31 +2,39 @@ package net.arcmods.ryantlg.lootTables;
|
|||||||
|
|
||||||
import net.arcmods.ryantlg.gameritems;
|
import net.arcmods.ryantlg.gameritems;
|
||||||
import net.arcmods.ryantlg.items.itemsByCrop.weemItems;
|
import net.arcmods.ryantlg.items.itemsByCrop.weemItems;
|
||||||
import net.fabricmc.fabric.api.loot.v1.FabricLootPoolBuilder;
|
import net.fabricmc.fabric.api.loot.v2.LootTableEvents;
|
||||||
import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback;
|
import net.minecraft.block.Blocks;
|
||||||
|
import net.minecraft.loot.LootPool;
|
||||||
import net.minecraft.loot.condition.RandomChanceLootCondition;
|
import net.minecraft.loot.condition.RandomChanceLootCondition;
|
||||||
import net.minecraft.loot.entry.ItemEntry;
|
import net.minecraft.loot.entry.ItemEntry;
|
||||||
import net.minecraft.loot.function.SetCountLootFunction;
|
|
||||||
import net.minecraft.loot.provider.number.ConstantLootNumberProvider;
|
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
|
|
||||||
public class grassVanillaWeem {
|
public class grassVanillaWeem {
|
||||||
|
|
||||||
private static final Identifier GRASS_LOOT_TABLE_ID = new Identifier("minecraft", "blocks/grass");
|
private static final Identifier GRASS_LOOT_TABLE_ID = Blocks.GRASS.getLootTableId();
|
||||||
|
|
||||||
private static void modifyLootTables() {
|
private static void modifyLootTables() {
|
||||||
LootTableLoadingCallback.EVENT.register(((resourceManager, manager, id, supplier, setter) -> {
|
LootTableEvents.MODIFY.register(((resourceManager, manager, id, tableBuilder, source) -> {
|
||||||
|
|
||||||
if (GRASS_LOOT_TABLE_ID.equals(id)) {
|
if (source.isBuiltin() && GRASS_LOOT_TABLE_ID.equals(id)) {
|
||||||
FabricLootPoolBuilder weemSeed = FabricLootPoolBuilder.builder()
|
LootPool.Builder poolBuilder = LootPool.builder()
|
||||||
.rolls(ConstantLootNumberProvider.create(1))
|
|
||||||
.with(ItemEntry.builder(weemItems.WEEM_SEEDS))
|
.with(ItemEntry.builder(weemItems.WEEM_SEEDS))
|
||||||
.withFunction(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0f)).build())
|
.conditionally(RandomChanceLootCondition.builder(0.0123132f));;
|
||||||
.conditionally(RandomChanceLootCondition.builder(0.04f));
|
|
||||||
supplier.withPool(weemSeed.build());
|
|
||||||
|
|
||||||
|
tableBuilder.pool(poolBuilder);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// if (GRASS_LOOT_TABLE_ID.equals(id)) {
|
||||||
|
// FabricLootPoolBuilder weemSeed = FabricLootPoolBuilder.builder()
|
||||||
|
// .rolls(ConstantLootNumberProvider.create(1))
|
||||||
|
// .with(ItemEntry.builder(weemItems.WEEM_SEEDS))
|
||||||
|
// .withFunction(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0f)).build())
|
||||||
|
// .conditionally(RandomChanceLootCondition.builder(0.0123132f));
|
||||||
|
// supplier.withPool(weemSeed.build());
|
||||||
|
|
||||||
|
// }
|
||||||
|
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,19 +6,21 @@ import net.minecraft.util.registry.Registry;
|
|||||||
|
|
||||||
public class sounds {
|
public class sounds {
|
||||||
|
|
||||||
public static final Identifier SNIFF = new Identifier("gameritems:sniff");
|
// THIS IS BROKEN DO NOT TOUCH
|
||||||
public static SoundEvent SNIFF_SOUND_EVENT = new SoundEvent(SNIFF);
|
|
||||||
public static final Identifier MATT = new Identifier("gameritems:matt");
|
|
||||||
public static SoundEvent MATT_SOUND_EVENT = new SoundEvent(MATT);
|
|
||||||
public static final Identifier ELON = new Identifier("gameritems:elon");
|
|
||||||
public static SoundEvent ELON_SOUND_EVENT = new SoundEvent(ELON);
|
|
||||||
|
|
||||||
public static void register() {
|
// public static final Identifier SNIFF = new Identifier("gameritems:sniff");
|
||||||
gameritems.LOGGER.info("Sounds Loaded");
|
// public static SoundEvent SNIFF_SOUND_EVENT = new SoundEvent(SNIFF);
|
||||||
|
// public static final Identifier MATT = new Identifier("gameritems:matt");
|
||||||
|
// public static SoundEvent MATT_SOUND_EVENT = new SoundEvent(MATT);
|
||||||
|
// public static final Identifier ELON = new Identifier("gameritems:elon");
|
||||||
|
// public static SoundEvent ELON_SOUND_EVENT = new SoundEvent(ELON);
|
||||||
|
|
||||||
Registry.register(Registry.SOUND_EVENT, sounds.SNIFF, SNIFF_SOUND_EVENT);
|
// public static void register() {
|
||||||
Registry.register(Registry.SOUND_EVENT, sounds.MATT, MATT_SOUND_EVENT);
|
// gameritems.LOGGER.info("Sounds Loaded");
|
||||||
Registry.register(Registry.SOUND_EVENT, sounds.ELON, ELON_SOUND_EVENT);
|
|
||||||
}
|
// Registry.register(Registry.SOUND_EVENT, sounds.SNIFF, SNIFF_SOUND_EVENT);
|
||||||
|
// Registry.register(Registry.SOUND_EVENT, sounds.MATT, MATT_SOUND_EVENT);
|
||||||
|
// Registry.register(Registry.SOUND_EVENT, sounds.ELON, ELON_SOUND_EVENT);
|
||||||
|
// }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ public class highStatusEffect extends StatusEffect{
|
|||||||
((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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,3 +5,6 @@ advancements
|
|||||||
argentine
|
argentine
|
||||||
geranine
|
geranine
|
||||||
soulium
|
soulium
|
||||||
|
floute
|
||||||
|
|
||||||
|
port to 1.18.1 when busyn't
|
||||||
@@ -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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,35 +1,51 @@
|
|||||||
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.metalBlocks.omniumBlocks;
|
||||||
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
|
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
|
||||||
import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
|
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,
|
||||||
|
omniumBlocks.DEEPSLATE_OMNIUM_ORE.getDefaultState(),
|
||||||
|
4)); // vein size*/
|
||||||
|
private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
|
||||||
|
Feature.ORE, 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
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,36 +1,52 @@
|
|||||||
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.metalBlocks.oriumBlocks;
|
||||||
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
|
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
|
||||||
import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
|
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,
|
||||||
|
// oriumBlocks.DEEPSLATE_ORIUM_ORE.getDefaultState(),
|
||||||
|
// 5)); // vein size
|
||||||
|
|
||||||
|
private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
|
||||||
|
Feature.ORE, 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(
|
// 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
|
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 void register() {
|
public static void register() {
|
||||||
|
|||||||
@@ -1,41 +1,55 @@
|
|||||||
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.metalBlocks.jeremiumBlocks;
|
||||||
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
|
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
|
||||||
import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
|
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,
|
||||||
|
// jeremiumBlocks.DEEPSLATE_JEREMIUM_ORE.getDefaultState(),
|
||||||
|
// 3)); // vein size
|
||||||
|
|
||||||
|
private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
|
||||||
|
Feature.ORE, 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
|
||||||
|
|
||||||
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
|
||||||
|
// 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
|
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 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"),
|
||||||
|
|||||||
@@ -1,44 +1,60 @@
|
|||||||
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.metalBlocks.omniumBlocks;
|
||||||
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
|
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
|
||||||
import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
|
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,
|
||||||
|
// omniumBlocks.OMNIUM_ORE.getDefaultState(),
|
||||||
|
// 4)); // vein size
|
||||||
|
|
||||||
|
private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
|
||||||
|
Feature.ORE, new OreFeatureConfig(
|
||||||
OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
|
OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
|
||||||
omniumBlocks.OMNIUM_ORE.getDefaultState(),
|
omniumBlocks.OMNIUM_ORE.getDefaultState(),
|
||||||
4)); // vein size
|
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
|
||||||
|
// 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
|
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 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")));
|
||||||
|
|||||||
@@ -1,44 +1,59 @@
|
|||||||
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.metalBlocks.oriumBlocks;
|
||||||
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
|
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
|
||||||
import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
|
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,
|
||||||
|
// oriumBlocks.ORIUM_ORE.getDefaultState(),
|
||||||
|
// 5)); // vein size
|
||||||
|
|
||||||
|
private static ConfiguredFeature<?, ?> ORE_CONFIGURED_FEATURE = new ConfiguredFeature(
|
||||||
|
Feature.ORE, new OreFeatureConfig(
|
||||||
OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
|
OreConfiguredFeatures.STONE_ORE_REPLACEABLES,
|
||||||
oriumBlocks.ORIUM_ORE.getDefaultState(),
|
oriumBlocks.ORIUM_ORE.getDefaultState(),
|
||||||
5)); // vein size
|
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
|
||||||
|
// 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
|
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 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")));
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"variants": {
|
||||||
|
"axis=y": {
|
||||||
|
"model": "gameritems:block/weem_hay_block"
|
||||||
|
},
|
||||||
|
"axis=z": {
|
||||||
|
"model": "gameritems:block/weem_hay_block",
|
||||||
|
"x": 90
|
||||||
|
},
|
||||||
|
"axis=x": {
|
||||||
|
"model": "gameritems:block/weem_hay_block",
|
||||||
|
"x": 90,
|
||||||
|
"y": 90
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -69,6 +69,8 @@
|
|||||||
"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",
|
||||||
|
"block.gameritems.weem_hay_block": "Weem Hay Bale"
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"parent": "minecraft:block/cube_column",
|
||||||
|
"textures": {
|
||||||
|
"end": "gameritems:block/weem_block_top",
|
||||||
|
"side": "gameritems:block/weem_block_side"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"parent": "minecraft:block/cube_column_horizontal",
|
||||||
|
"textures": {
|
||||||
|
"end": "gameritems:block/weem_block_top",
|
||||||
|
"side": "gameritems:block/weem_block_side"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"parent": "gameritems:block/weem_hay_block"
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 821 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
@@ -0,0 +1,43 @@
|
|||||||
|
{
|
||||||
|
"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"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
{
|
||||||
|
"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"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
{
|
||||||
|
"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"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
27
src/main/resources/data/gameritems/advancements/raw_jeremium.json
Executable file
27
src/main/resources/data/gameritems/advancements/raw_jeremium.json
Executable file
@@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
"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"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
"show_toast": true,
|
"show_toast": true,
|
||||||
"announce_to_chat": true
|
"announce_to_chat": true
|
||||||
},
|
},
|
||||||
"parent": "gameritems:gameritems",
|
"parent": "gameritems:orium_armour",
|
||||||
"criteria": {
|
"criteria": {
|
||||||
"requirement": {
|
"requirement": {
|
||||||
"trigger": "minecraft:inventory_changed",
|
"trigger": "minecraft:inventory_changed",
|
||||||
@@ -24,4 +24,4 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
27
src/main/resources/data/gameritems/advancements/raw_orium.json
Executable file
27
src/main/resources/data/gameritems/advancements/raw_orium.json
Executable file
@@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
"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"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -31,12 +31,12 @@
|
|||||||
],
|
],
|
||||||
|
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.12.12",
|
"fabricloader": ">=0.14.8",
|
||||||
"fabric": "*",
|
"fabric": "*",
|
||||||
"minecraft": "1.18.1",
|
"minecraft": "1.19",
|
||||||
"java": ">=17"
|
"java": ">=17"
|
||||||
},
|
},
|
||||||
"suggests": {
|
"suggests": {
|
||||||
"darkevolution": "1.18.1-x"
|
"darkevolution": "1.19-x"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user