Skip to content

Commit

Permalink
port to 1.20.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@gottsch
gottsch committed Jan 6, 2025
1 parent 36b258b commit 171b635
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 50 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ org.gradle.parallel=true

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.3
minecraft_version=1.20.6
yarn_mappings=1.20.6+build.3
loader_version=0.16.9

# Mod Properties
Expand All @@ -14,7 +14,7 @@ maven_group = gottsch
archives_base_name = mageflame-fabric

# Dependencies
fabric_version=0.97.2+1.20.4
fabric_version=0.100.8+1.20.6

# https://maven.wispforest.io/io/wispforest/owo-lib/
owo_version=0.12.6+1.20.3
owo_version=0.12.9+1.20.5
6 changes: 3 additions & 3 deletions src/main/java/mod/gottsch/fabric/mageflame/core/entity/creature/SummonFlameBaseEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ public static DefaultAttributeContainer.Builder createAttributes() {
}

@Override
protected void initDataTracker() {
super.initDataTracker();
this.dataTracker.startTracking(DATA_OWNER_UUID, Optional.empty());
protected void initDataTracker(DataTracker.Builder builder) {
super.initDataTracker(builder);
builder.add(DATA_OWNER_UUID, Optional.empty());
}

@Override
Expand Down
10 changes: 4 additions & 6 deletions src/main/java/mod/gottsch/fabric/mageflame/core/item/GreaterFlameScroll.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@

import mod.gottsch.fabric.mageflame.core.setup.Registration;
import mod.gottsch.fabric.mageflame.core.util.LangUtil;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.client.item.TooltipType;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.mob.MobEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;

import java.util.List;

Expand All @@ -49,7 +47,7 @@ public EntityType<? extends MobEntity> getSummonFlameEntity() {
}

@Override
public void appendBaseText(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
public void appendBaseText(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {

tooltip.add(Text.translatable(LangUtil.tooltip("greater_revelation.desc")).formatted(Formatting.YELLOW));
tooltip.add(Text.literal(" "));
Expand All @@ -58,7 +56,7 @@ public void appendBaseText(ItemStack stack, @Nullable World world, List<Text> to
}

@Override
public void appendAdvancedText(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
appendLore(stack, world, tooltip, context, "greater_revelation.lore");
public void appendAdvancedText(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
appendLore(stack, context, tooltip, "greater_revelation.lore");
}
}
10 changes: 4 additions & 6 deletions src/main/java/mod/gottsch/fabric/mageflame/core/item/LesserFlameScroll.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@

import mod.gottsch.fabric.mageflame.core.setup.Registration;
import mod.gottsch.fabric.mageflame.core.util.LangUtil;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.client.item.TooltipType;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.mob.MobEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;

import java.util.List;

Expand All @@ -49,7 +47,7 @@ public EntityType<? extends MobEntity> getSummonFlameEntity() {
}

@Override
public void appendBaseText(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
public void appendBaseText(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {

tooltip.add(Text.translatable(LangUtil.tooltip("lesser_revelation.desc")).formatted(Formatting.YELLOW));
tooltip.add(Text.literal(" "));
Expand All @@ -58,7 +56,7 @@ public void appendBaseText(ItemStack stack, @Nullable World world, List<Text> to
}

@Override
public void appendAdvancedText(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
appendLore(stack, world, tooltip, context, "lesser_revelation.lore");
public void appendAdvancedText(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
appendLore(stack, context, tooltip, "lesser_revelation.lore");
}
}
10 changes: 4 additions & 6 deletions src/main/java/mod/gottsch/fabric/mageflame/core/item/MageFlameScroll.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@

import mod.gottsch.fabric.mageflame.core.setup.Registration;
import mod.gottsch.fabric.mageflame.core.util.LangUtil;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.client.item.TooltipType;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.mob.MobEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;

import java.util.List;

Expand All @@ -48,7 +46,7 @@ public EntityType<? extends MobEntity> getSummonFlameEntity() {
}

@Override
public void appendBaseText(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
public void appendBaseText(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {

tooltip.add(Text.translatable(LangUtil.tooltip("mage_flame.desc")).formatted(Formatting.YELLOW));
tooltip.add(Text.literal(" "));
Expand All @@ -57,7 +55,7 @@ public void appendBaseText(ItemStack stack, @Nullable World world, List<Text> to
}

@Override
public void appendAdvancedText(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
appendLore(stack, world, tooltip, context, "mage_flame.lore");
public void appendAdvancedText(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
appendLore(stack, context, tooltip,"mage_flame.lore");
}
}
21 changes: 10 additions & 11 deletions src/main/java/mod/gottsch/fabric/mageflame/core/item/SummonFlameBaseItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
package mod.gottsch.fabric.mageflame.core.item;

import mod.gottsch.fabric.mageflame.core.util.LangUtil;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.client.item.TooltipType;
import net.minecraft.entity.mob.MobEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.*;
import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.util.Hand;
import net.minecraft.util.TypedActionResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;

import java.util.List;
import java.util.Optional;
Expand All @@ -56,25 +56,24 @@ public SummonFlameBaseItem(Settings properties) {
public Text getName() {
return Text.literal(this.getTranslationKey()).formatted(Formatting.AQUA);
}

@Override
public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
// public void appendHoverText(ItemStack stack, World level, List<Component> tooltip, TooltipFlag flag) {
appendBaseText(stack, world, tooltip, context);
public void appendTooltip(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
appendBaseText(stack, context, tooltip, type);
LangUtil.appendAdvancedHoverText(tooltip, tt -> {
appendAdvancedText(stack, world, tooltip, context);
appendAdvancedText(stack, context, tooltip, type);
});
}

public void appendBaseText(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
public void appendBaseText(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {

}

public void appendAdvancedText(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
public void appendAdvancedText(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {

}

public void appendLore(ItemStack stack, World level, List<Text> tooltip, TooltipContext flag, String key) {
public void appendLore(ItemStack stack, TooltipContext context, List<Text> tooltip, String key) {
MutableText lore = Text.translatable(LangUtil.tooltip(key));
tooltip.add(Text.literal(" "));
for (String s : lore.getString().split("~")) {
Expand Down
10 changes: 4 additions & 6 deletions src/main/java/mod/gottsch/fabric/mageflame/core/item/WingedTorchScroll.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@

import mod.gottsch.fabric.mageflame.core.setup.Registration;
import mod.gottsch.fabric.mageflame.core.util.LangUtil;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.client.item.TooltipType;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.mob.MobEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;

import java.util.List;

Expand All @@ -49,15 +47,15 @@ public EntityType<? extends MobEntity> getSummonFlameEntity() {
}

@Override
public void appendBaseText(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
public void appendBaseText(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {

tooltip.add(Text.translatable(LangUtil.tooltip("winged_torch.desc")).formatted(Formatting.YELLOW));
tooltip.add(Text.literal(" "));
tooltip.add(Text.translatable(LangUtil.tooltip("light_level"), Registration.GREATER_REVELATION_BLOCK.getDefaultState().getLuminance()));
}

@Override
public void appendAdvancedText(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
appendLore(stack, world, tooltip, context, "winged_torch.lore");
public void appendAdvancedText(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
appendLore(stack, context, tooltip, "winged_torch.lore");
}
}
14 changes: 6 additions & 8 deletions src/main/java/mod/gottsch/fabric/mageflame/core/setup/Registration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@
import mod.gottsch.fabric.mageflame.core.item.MageFlameScroll;
import mod.gottsch.fabric.mageflame.core.item.WingedTorchScroll;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerEntityEvents;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes;
Expand All @@ -43,7 +41,7 @@
import net.minecraft.entity.SpawnGroup;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroups;
import net.minecraft.particle.DefaultParticleType;
import net.minecraft.particle.SimpleParticleType;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.util.Identifier;
Expand Down Expand Up @@ -92,10 +90,10 @@ public class Registration {
}));

// items
public static final Item MAGE_FLAME_SCROLL = new MageFlameScroll(new FabricItemSettings());
public static final Item LESSER_REVELATION_SCROLL = new LesserFlameScroll(new FabricItemSettings());
public static final Item GREATER_REVELATION_SCROLL = new GreaterFlameScroll(new FabricItemSettings());
public static final Item WINGED_TORCH_SCROLL = new WingedTorchScroll(new FabricItemSettings());
public static final Item MAGE_FLAME_SCROLL = new MageFlameScroll(new Item.Settings());
public static final Item LESSER_REVELATION_SCROLL = new LesserFlameScroll(new Item.Settings());
public static final Item GREATER_REVELATION_SCROLL = new GreaterFlameScroll(new Item.Settings());
public static final Item WINGED_TORCH_SCROLL = new WingedTorchScroll(new Item.Settings());

// entities
public static final EntityType<MageFlameEntity> MAGE_FLAME_ENTITY = Registry.register(
Expand Down Expand Up @@ -135,7 +133,7 @@ public class Registration {
);

// particles
public static final DefaultParticleType REVELATION_PARTICLE = FabricParticleTypes.simple();
public static final SimpleParticleType REVELATION_PARTICLE = FabricParticleTypes.simple();

/**
*
Expand Down

0 comments on commit 171b635

Please sign in to comment.