diff --git a/CHANGELOG b/CHANGELOG index 26c1068..76a3d12 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,28 +1,3 @@ # Changes: -## 1.18.2-0.1.0-unstable -- changed dependencies for update to 1.18.2 -- still have "errors" in code, not sure how to fix -- ore gen works perfectly (checked) even with errors -- created CHANGELOG file for version branch -- have crippling depression -- man, updating is a bitch - -## 1.18.2-1.0.0-stable -- for all i care this shit looks stable to me - -## 1.18.2-1.1.0-stable -- ported gamer bow to 1.18.2 - -## 1.18.2-1.1.1-unstable -- fixed weem stacking to 85 (maybe) -- nerfed high effect - -## 1.18.2-1.1.2-unstable -- added healing back to high effect with lower amplifier -- changed block strength of all (non joke) blocks - -## 1.18.2-1.1.3-unstable (incomplete) -- added evade enchantment -- added more advancements -- added weem hay bale -- rearranged block files \ No newline at end of file +## 1.19-1.0.0-stable +- updating is despicable \ No newline at end of file diff --git a/build.gradle b/build.gradle index 367fb8f..050a121 100755 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,8 @@ dependencies { // 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-deprecated:${project.fabric_version}" + } processResources { diff --git a/gradle.properties b/gradle.properties index 358e4e2..c1e9449 100755 --- a/gradle.properties +++ b/gradle.properties @@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx6G # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.18.2 - yarn_mappings=1.18.2+build.3 - loader_version=0.13.2 + minecraft_version=1.19 + yarn_mappings=1.19+build.4 + loader_version=0.14.8 # Mod Properties - mod_version = 1.18.2-1.1.2-unstable + mod_version = 1.19-1.0.0-stable maven_group = ryantlg.GamerItems.mod archives_base_name = GamerItems # Dependencies - fabric_version=0.51.1+1.18.2 + fabric_version=0.57.0+1.19 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84d1f85..aa991fc 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME 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 zipStorePath=wrapper/dists diff --git a/src/main/java/net/arcmods/ryantlg/blockClasses/jeremiumBlock.java b/src/main/java/net/arcmods/ryantlg/blockClasses/jeremiumBlock.java index 0d0f912..18d8075 100644 --- a/src/main/java/net/arcmods/ryantlg/blockClasses/jeremiumBlock.java +++ b/src/main/java/net/arcmods/ryantlg/blockClasses/jeremiumBlock.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.client.item.TooltipContext; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; + import net.minecraft.util.Formatting; import net.minecraft.world.BlockView; @@ -17,8 +17,8 @@ public class jeremiumBlock extends Block{ } @Override public void appendTooltip(ItemStack itemStack, BlockView world, List tooltip, TooltipContext tooltipContext) { - tooltip.add( new TranslatableText("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("block.gameritems.jeremium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); + tooltip.add(Text.translatable("all.gameritems.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); } } diff --git a/src/main/java/net/arcmods/ryantlg/blockClasses/oriumBlock.java b/src/main/java/net/arcmods/ryantlg/blockClasses/oriumBlock.java index c3d76ee..371e924 100644 --- a/src/main/java/net/arcmods/ryantlg/blockClasses/oriumBlock.java +++ b/src/main/java/net/arcmods/ryantlg/blockClasses/oriumBlock.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.client.item.TooltipContext; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; + import net.minecraft.util.Formatting; import net.minecraft.world.BlockView; @@ -17,6 +17,6 @@ public class oriumBlock extends Block{ } @Override public void appendTooltip(ItemStack itemStack, BlockView world, List 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) ); } } diff --git a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/jeremium/JeremiumSwordItem.java b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/jeremium/JeremiumSwordItem.java index 866394c..03b3ff9 100755 --- a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/jeremium/JeremiumSwordItem.java +++ b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/jeremium/JeremiumSwordItem.java @@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; import net.minecraft.item.ToolMaterial; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import net.minecraft.world.World; @@ -21,7 +20,7 @@ public class JeremiumSwordItem extends SwordItem { } @Override public void appendTooltip(ItemStack itemStack, World world, List 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 diff --git a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/omnium/OmniumSwordItem.java b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/omnium/OmniumSwordItem.java index 2b7f539..eb77189 100755 --- a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/omnium/OmniumSwordItem.java +++ b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/omnium/OmniumSwordItem.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; import net.minecraft.item.ToolMaterial; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import net.minecraft.world.World; @@ -17,6 +16,6 @@ public class OmniumSwordItem extends SwordItem { } @Override public void appendTooltip(ItemStack itemStack, World world, List 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) ); } } diff --git a/src/main/java/net/arcmods/ryantlg/itemClasses/BreemItem.java b/src/main/java/net/arcmods/ryantlg/itemClasses/BreemItem.java index 4f309d2..8d8f574 100755 --- a/src/main/java/net/arcmods/ryantlg/itemClasses/BreemItem.java +++ b/src/main/java/net/arcmods/ryantlg/itemClasses/BreemItem.java @@ -6,7 +6,6 @@ import net.minecraft.client.item.TooltipContext; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import net.minecraft.world.World; @@ -19,6 +18,8 @@ public class BreemItem extends Item { @Override public void appendTooltip(ItemStack itemStack, World world, List 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) ); + } } diff --git a/src/main/java/net/arcmods/ryantlg/itemClasses/FabricReality.java b/src/main/java/net/arcmods/ryantlg/itemClasses/FabricReality.java index de80255..33c5b3a 100644 --- a/src/main/java/net/arcmods/ryantlg/itemClasses/FabricReality.java +++ b/src/main/java/net/arcmods/ryantlg/itemClasses/FabricReality.java @@ -7,7 +7,7 @@ import net.minecraft.client.item.TooltipContext; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; + import net.minecraft.util.Formatting; import net.minecraft.world.World; @@ -19,7 +19,7 @@ public class FabricReality extends Item{ @Override public void appendTooltip(ItemStack itemStack, World world, List 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) ); } } diff --git a/src/main/java/net/arcmods/ryantlg/itemClasses/WeemItem.java b/src/main/java/net/arcmods/ryantlg/itemClasses/WeemItem.java index cc276fc..f484957 100755 --- a/src/main/java/net/arcmods/ryantlg/itemClasses/WeemItem.java +++ b/src/main/java/net/arcmods/ryantlg/itemClasses/WeemItem.java @@ -6,7 +6,7 @@ import net.minecraft.client.item.TooltipContext; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; + import net.minecraft.util.Formatting; import net.minecraft.world.World; @@ -19,6 +19,6 @@ public class WeemItem extends Item { @Override public void appendTooltip(ItemStack itemStack, World world, List 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) ); } } diff --git a/src/main/java/net/arcmods/ryantlg/itemClasses/jeremiumItem.java b/src/main/java/net/arcmods/ryantlg/itemClasses/jeremiumItem.java index 7436199..6727c32 100644 --- a/src/main/java/net/arcmods/ryantlg/itemClasses/jeremiumItem.java +++ b/src/main/java/net/arcmods/ryantlg/itemClasses/jeremiumItem.java @@ -6,7 +6,7 @@ import net.minecraft.client.item.TooltipContext; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; + import net.minecraft.util.Formatting; import net.minecraft.world.World; @@ -19,7 +19,7 @@ public class jeremiumItem extends Item{ @Override public void appendTooltip(ItemStack itemStack, World world, List 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) ); } diff --git a/src/main/java/net/arcmods/ryantlg/itemClasses/oriumItem.java b/src/main/java/net/arcmods/ryantlg/itemClasses/oriumItem.java index 7eb09f8..de5d261 100644 --- a/src/main/java/net/arcmods/ryantlg/itemClasses/oriumItem.java +++ b/src/main/java/net/arcmods/ryantlg/itemClasses/oriumItem.java @@ -6,7 +6,7 @@ import net.minecraft.client.item.TooltipContext; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; + import net.minecraft.util.Formatting; import net.minecraft.world.World; @@ -19,7 +19,7 @@ public class oriumItem extends Item{ @Override public void appendTooltip(ItemStack itemStack, World world, List 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) ); } } diff --git a/src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java b/src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java index 3a609df..2c27b43 100755 --- a/src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java +++ b/src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java @@ -2,31 +2,39 @@ package net.arcmods.ryantlg.lootTables; import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.items.itemsByCrop.weemItems; -import net.fabricmc.fabric.api.loot.v1.FabricLootPoolBuilder; -import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback; +import net.fabricmc.fabric.api.loot.v2.LootTableEvents; +import net.minecraft.block.Blocks; +import net.minecraft.loot.LootPool; import net.minecraft.loot.condition.RandomChanceLootCondition; import net.minecraft.loot.entry.ItemEntry; -import net.minecraft.loot.function.SetCountLootFunction; -import net.minecraft.loot.provider.number.ConstantLootNumberProvider; import net.minecraft.util.Identifier; 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() { - LootTableLoadingCallback.EVENT.register(((resourceManager, manager, id, supplier, setter) -> { + LootTableEvents.MODIFY.register(((resourceManager, manager, id, tableBuilder, source) -> { - if (GRASS_LOOT_TABLE_ID.equals(id)) { - FabricLootPoolBuilder weemSeed = FabricLootPoolBuilder.builder() - .rolls(ConstantLootNumberProvider.create(1)) + if (source.isBuiltin() && GRASS_LOOT_TABLE_ID.equals(id)) { + LootPool.Builder poolBuilder = LootPool.builder() .with(ItemEntry.builder(weemItems.WEEM_SEEDS)) - .withFunction(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0f)).build()) - .conditionally(RandomChanceLootCondition.builder(0.0123132f)); - supplier.withPool(weemSeed.build()); - + .conditionally(RandomChanceLootCondition.builder(0.0123132f));; + + 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()); + + // } + })); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d3fff6b..25d8a4e 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -31,12 +31,12 @@ ], "depends": { - "fabricloader": ">=0.13.2", + "fabricloader": ">=0.14.8", "fabric": "*", - "minecraft": "1.18.2", + "minecraft": "1.19", "java": ">=17" }, "suggests": { - "darkevolution": "1.18.2-x" + "darkevolution": "1.19-x" } }