update to 1.19

This commit is contained in:
RyanTLG
2022-07-13 16:42:59 +02:00
parent 15808a2598
commit 5eb78fbbd2
15 changed files with 53 additions and 69 deletions

View File

@@ -1,28 +1,3 @@
# Changes: # Changes:
## 1.18.2-0.1.0-unstable ## 1.19-1.0.0-stable
- changed dependencies for update to 1.18.2 - updating is despicable
- 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

View File

@@ -26,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 {

View File

@@ -3,14 +3,14 @@ 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.2 minecraft_version=1.19
yarn_mappings=1.18.2+build.3 yarn_mappings=1.19+build.4
loader_version=0.13.2 loader_version=0.14.8
# Mod Properties # Mod Properties
mod_version = 1.18.2-1.1.2-unstable mod_version = 1.19-1.0.0-stable
maven_group = ryantlg.GamerItems.mod maven_group = ryantlg.GamerItems.mod
archives_base_name = GamerItems archives_base_name = GamerItems
# Dependencies # Dependencies
fabric_version=0.51.1+1.18.2 fabric_version=0.57.0+1.19

View File

@@ -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

View File

@@ -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) );
} }
} }

View File

@@ -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) );
} }
} }

View File

@@ -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

View File

@@ -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) );
} }
} }

View File

@@ -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) );
} }
} }

View File

@@ -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) );
} }
} }

View File

@@ -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) );
} }
} }

View File

@@ -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) );
} }

View File

@@ -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) );
} }
} }

View File

@@ -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.0123132f));
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());
// }
})); }));
} }

View File

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