Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.20' into 1.20
Browse files Browse the repository at this point in the history
  • Loading branch information
@yuesha-yc
yuesha-yc committed Dec 6, 2024
2 parents f902d17 + 20b385d commit dd97b63
Show file tree
Hide file tree
Showing 30 changed files with 280 additions and 103 deletions.
25 changes: 0 additions & 25 deletions src/main/java/com/teammoeg/frostedheart/FHTextIcon.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/com/teammoeg/frostedheart/content/research/FHResearch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public static Research load(Research r) {

Research.CODEC.parse(JsonOps.INSTANCE, je).resultOrPartial(FHMain.LOGGER::error).map(o -> {
o.setId(r.getId());
System.out.println(o);
//System.out.println(o);
return o;
}).ifPresent(researches::replace);
;
Expand Down
25 changes: 13 additions & 12 deletions src/main/java/com/teammoeg/frostedheart/content/research/gui/FHIcons.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import com.teammoeg.frostedheart.util.lang.Lang;
import net.minecraft.client.gui.GuiGraphics;
import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.teammoeg.frostedheart.content.research.gui.editor.BaseEditDialog;
import com.teammoeg.frostedheart.content.research.gui.editor.EditListDialog;
Expand Down Expand Up @@ -66,15 +67,15 @@ public class FHIcons {
private static final TypedCodecRegistry<FHIcon> serializers = new TypedCodecRegistry<>();
public static final Codec<FHIcon> CODEC=new AlternativeCodecBuilder<FHIcon>(FHIcon.class)
.fallback(()->FHNopIcon.INSTANCE)
.addSaveOnly(FHNopIcon.class ,FHNopIcon.CODEC)
.addSaveOnly(FHNopIcon.class ,FHNopIcon.CODEC.codec())
.add(FHItemIcon.class, FHItemIcon.ICON_CODEC)
.add(FHItemIcon.class,FHItemIcon.CODEC)
.add(FHItemIcon.class,FHItemIcon.CODEC.codec())
.add(FHAnimatedIcon.class,FHAnimatedIcon.ICON_CODEC)
.add(serializers.codec())
.add(FHNopIcon.CODEC)
.add(FHNopIcon.CODEC.codec())
.build();
private static class FHAnimatedIcon extends FHIcon {
private static final Codec<FHAnimatedIcon> CODEC=RecordCodecBuilder.create(t->t.group(
private static final MapCodec<FHAnimatedIcon> CODEC=RecordCodecBuilder.mapCodec(t->t.group(
Codec.list(FHIcons.CODEC).fieldOf("icons").forGetter(o->o.icons)
).apply(t, FHAnimatedIcon::new));
private static final Codec<FHAnimatedIcon> ICON_CODEC=Codec.list(FHIcons.CODEC).xmap(FHAnimatedIcon::new, o->o.icons);
Expand Down Expand Up @@ -104,7 +105,7 @@ public void draw(GuiGraphics ms, int x, int y, int w, int h) {
}

private static class FHCombinedIcon extends FHIcon {
private static final Codec<FHCombinedIcon> CODEC=RecordCodecBuilder.create(t->t.group(
private static final MapCodec<FHCombinedIcon> CODEC=RecordCodecBuilder.mapCodec(t->t.group(
FHIcons.CODEC.fieldOf("base").forGetter(o->o.large),
FHIcons.CODEC.fieldOf("small").forGetter(o->o.small)
).apply(t, FHCombinedIcon::new));
Expand All @@ -131,7 +132,7 @@ public void draw(GuiGraphics ms, int x, int y, int w, int h) {
}

private static class FHDelegateIcon extends FHIcon {
private static final Codec<FHDelegateIcon> CODEC=RecordCodecBuilder.create(t->t.group(
private static final MapCodec<FHDelegateIcon> CODEC=RecordCodecBuilder.mapCodec(t->t.group(
Codec.STRING.fieldOf("name").forGetter(o->o.name)
).apply(t, FHDelegateIcon::new));
String name;
Expand Down Expand Up @@ -187,7 +188,7 @@ public Icon asFtbIcon() {
}

private static class FHIngredientIcon extends FHAnimatedIcon {
private static final Codec<FHIngredientIcon> CODEC=RecordCodecBuilder.create(t->t.group(
private static final MapCodec<FHIngredientIcon> CODEC=RecordCodecBuilder.mapCodec(t->t.group(
CodecUtil.INGREDIENT_CODEC.fieldOf("ingredient").forGetter(o->o.igd)
).apply(t, FHIngredientIcon::new));
Ingredient igd;
Expand All @@ -204,7 +205,7 @@ public FHIngredientIcon(JsonElement elm) {
}

private static class FHItemIcon extends FHIcon {
private static final Codec<FHItemIcon> CODEC=RecordCodecBuilder.create(t->t.group(
private static final MapCodec<FHItemIcon> CODEC=RecordCodecBuilder.mapCodec(t->t.group(
CodecUtil.ITEMSTACK_CODEC.fieldOf("item").forGetter(o->o.stack)
).apply(t, FHItemIcon::new));
private static final Codec<FHItemIcon> ICON_CODEC=
Expand Down Expand Up @@ -247,7 +248,7 @@ public void draw(GuiGraphics matrixStack, int x, int y, int w, int h) {
private static class FHNopIcon extends FHIcon {

public static final FHNopIcon INSTANCE = new FHNopIcon();
private static final Codec<FHNopIcon> CODEC=new NopCodec<>(INSTANCE);
private static final MapCodec<FHNopIcon> CODEC=MapCodec.unit(INSTANCE);


private FHNopIcon() {
Expand All @@ -261,7 +262,7 @@ public void draw(GuiGraphics ms, int x, int y, int w, int h) {
}

private static class FHTextIcon extends FHIcon {
private static final Codec<FHTextIcon> CODEC=RecordCodecBuilder.create(t->t.group(
private static final MapCodec<FHTextIcon> CODEC=RecordCodecBuilder.mapCodec(t->t.group(
Codec.STRING.fieldOf("text").forGetter(o->o.text)
).apply(t, FHTextIcon::new));
String text;
Expand Down Expand Up @@ -290,7 +291,7 @@ public void draw(GuiGraphics ms, int x, int y, int w, int h) {
}

private static class FHTextureIcon extends FHIcon {
private static final Codec<FHTextureIcon> CODEC=RecordCodecBuilder.create(t->t.group(
private static final MapCodec<FHTextureIcon> CODEC=RecordCodecBuilder.mapCodec(t->t.group(
ResourceLocation.CODEC.fieldOf("location").forGetter(o->o.rl)
).apply(t, FHTextureIcon::new));
Icon nested;
Expand All @@ -310,7 +311,7 @@ public void draw(GuiGraphics ms, int x, int y, int w, int h) {
}

private static class FHTextureUVIcon extends FHIcon {
private static final Codec<FHTextureUVIcon> CODEC=RecordCodecBuilder.create(t->t.group(
private static final MapCodec<FHTextureUVIcon> CODEC=RecordCodecBuilder.mapCodec(t->t.group(
ResourceLocation.CODEC.fieldOf("location").forGetter(o->o.rl),
Codec.INT.fieldOf("x") .forGetter(o->o.x),
Codec.INT.fieldOf("y") .forGetter(o->o.y),
Expand Down
13 changes: 6 additions & 7 deletions ...ain/java/com/teammoeg/frostedheart/content/research/gui/editor/SelectItemStackDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,24 +279,24 @@ public boolean shouldAdd(String search, String mod) {

@Override
public Collection<ItemStack> getAllResources() {
return RegistryUtils.getItems().stream().map(ItemStack::new).collect(Collectors.toList());
return RegistryUtils.getItems().stream().filter(t->t!=null&&t!=Items.AIR).map(ItemStack::new).collect(Collectors.toList());
}

@Override
public MutableComponent getDisplayName() {
return Lang.str("ALL");
return Lang.translateKey("ftblibrary.select_item.list_mode.all");
}

@Override
public Icon getIcon() {
return ItemIcon.getItemIcon(Blocks.STONE.asItem());
return Icons.COMPASS;
}
});
modes.add(new ResourceSearchMode() {

@Override
public Collection<ItemStack> getAllResources() {
return ClientUtils.getPlayer().getInventory().items.stream().map(ItemStack::copy).collect(Collectors.toList());
return ClientUtils.getPlayer().getInventory().items.stream().filter(t->t!=null&&!t.isEmpty()).map(ItemStack::copy).collect(Collectors.toList());
}

@Override
Expand All @@ -306,14 +306,14 @@ public MutableComponent getDisplayName() {

@Override
public Icon getIcon() {
return ItemIcon.getItemIcon(Blocks.STONE.asItem());
return ItemIcon.getItemIcon(Items.CHEST);
}
});
modes.add(new ResourceSearchMode() {

@Override
public Collection<ItemStack> getAllResources() {
return RegistryUtils.getBlocks().stream().map(Block::asItem).filter(Objects::nonNull).map(ItemStack::new).collect(Collectors.toList());
return RegistryUtils.getBlocks().stream().map(Block::asItem).filter(Objects::nonNull).filter(t->t!=Items.AIR).map(ItemStack::new).collect(Collectors.toList());
}

@Override
Expand Down Expand Up @@ -485,7 +485,6 @@ public List<Widget> getItems(String search, Panel panel) {
List<Widget> widgets = new ArrayList<>(search.isEmpty() ? items.size() + 1 : 64);

String mod = "";

if (search.startsWith("@")) {
mod = search.substring(1);
}
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/com/teammoeg/frostedheart/content/research/gui/tech/ResearchHierarchyPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ public void onClicked(MouseButton mouseButton) {
Research r = researchPanel.selectedResearch;
ResearchEditorDialog.RESEARCH_LIST.open(this, "Edit parents", r.getParents(), s -> {
try {
System.out.println(s);
//System.out.println(s);
r.setParents(s.stream().map(Research::getId).collect(Collectors.toList()));
FHResearch.reindex();
EditUtils.saveResearch(r);
Expand Down Expand Up @@ -311,7 +311,7 @@ public void onClicked(MouseButton mouseButton) {
x = ButtonPos[4] + (k - 4) * 32;
} else
x = ButtonPos[k];
System.out.println(parent);
//System.out.println(parent);
ResearchSimpleButton parentButton = new ResearchSimpleButton(this, parent);
add(parentButton);
parentButton.setPos(x, 16);
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/teammoeg/frostedheart/content/research/network/FHResearchSyncPacket.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,12 @@ public FHResearchSyncPacket(FriendlyByteBuf buffer) {

public void encode(FriendlyByteBuf buffer) {
ObjectWriter.writeObject(buffer, data);
System.out.println("encoded "+data);
buffer.writeUtf(key);
}

public void handle(Supplier<NetworkEvent.Context> context) {
System.out.println("decoded "+data);
context.get().enqueueWork(() -> FHResearch.readOne(key,CodecUtil.decodeOrThrow(Research.CODEC.decode(DataOps.COMPRESSED, data))));
context.get().setPacketHandled(true);
}
Expand Down
12 changes: 8 additions & 4 deletions src/main/java/com/teammoeg/frostedheart/content/research/research/Research.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -69,7 +70,7 @@ public class Research implements FHRegisteredItem {
Codec.list(Codec.STRING).optionalFieldOf("parents",Arrays.asList()).forGetter(o->new ArrayList<>(o.parents)),
Codec.list(Clue.CODEC).optionalFieldOf("clues",Arrays.asList()).forGetter(o->o.clues),
Codec.list(CodecUtil.INGREDIENT_SIZE_CODEC).optionalFieldOf("ingredients",Arrays.asList()).forGetter(o->o.requiredItems),
Codec.list(Effect.CODEC).optionalFieldOf("effects",Arrays.asList()).forGetter(o->o.effects),
Codec.list(Effect.CODEC).optionalFieldOf("effects").forGetter(o->o.effects.size()>0?Optional.of(o.effects):Optional.empty()),
Codec.STRING.optionalFieldOf("name","").forGetter(o->o.name),
Codec.list(Codec.STRING).optionalFieldOf("desc",Arrays.asList()).forGetter(o->o.desc),
Codec.list(Codec.STRING).optionalFieldOf("descAlt",Arrays.asList()).forGetter(o->o.fdesc),
Expand Down Expand Up @@ -154,17 +155,19 @@ public Research() {
this.icon = FHIcons.nop();
}

public Research(FHIcon icon, ResearchCategory category, List<String> parents, List<Clue> clues, List<IngredientWithSize> requiredItems, List<Effect> effects, String name,
public Research(FHIcon icon, ResearchCategory category, List<String> parents, List<Clue> clues, List<IngredientWithSize> requiredItems, Optional<List<Effect>> effects, String name,
List<String> desc, List<String> fdesc, boolean[] flags, int points) {
super();
this.icon = icon;
this.category = category;
if(parents!=null)
this.parents.addAll(parents);
System.out.println(parents);
//System.out.println(parents);
this.clues.addAll(clues);

this.requiredItems.addAll(requiredItems);
this.effects.addAll(effects);
effects.ifPresent(this.effects::addAll);

this.name = name;
this.desc.addAll(desc);
this.fdesc.addAll(fdesc);
Expand All @@ -175,6 +178,7 @@ public Research(FHIcon icon, ResearchCategory category, List<String> parents, Li
this.alwaysShow = flags[4];
this.setInfinite(flags[5]);
this.points = points;
System.out.println(effects);
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/teammoeg/frostedheart/content/research/research/clues/AdvancementClue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package com.teammoeg.frostedheart.content.research.research.clues;

import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.teammoeg.frostedheart.FHMain;
import com.teammoeg.frostedheart.content.research.data.TeamResearchData;
Expand All @@ -37,7 +38,7 @@
import net.minecraft.network.chat.Component;

public class AdvancementClue extends TickListenerClue {
public static final Codec<AdvancementClue> CODEC=RecordCodecBuilder.create(t->t.group(
public static final MapCodec<AdvancementClue> CODEC=RecordCodecBuilder.mapCodec(t->t.group(
ListenerClue.BASE_CODEC.forGetter(o->o.getData()),
ResourceLocation.CODEC.fieldOf("advancement").forGetter(o->o.advancement),
CodecUtil.defaultValue(Codec.STRING, "").fieldOf("criterion").forGetter(o->o.criterion)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/teammoeg/frostedheart/content/research/research/clues/Clue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public BaseData(String name, String desc, String hint, String nonce, boolean req
register(KillClue.class, "kill", KillClue.CODEC);
register(MinigameClue.class, "game", MinigameClue.CODEC);
}
public static <T extends Clue> void register(Class<T> cls, String id, Codec<T> j) {
public static <T extends Clue> void register(Class<T> cls, String id, MapCodec<T> j) {
registry.register(cls, id, j);
}
public final static Codec<Clue> CODEC=registry.codec();
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/teammoeg/frostedheart/content/research/research/clues/CustomClue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package com.teammoeg.frostedheart.content.research.research.clues;

import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.teammoeg.frostedheart.base.team.TeamDataHolder;
import com.teammoeg.frostedheart.content.research.research.Research;
Expand All @@ -28,7 +29,7 @@
* Very Custom Clue trigger by code or manually.
*/
public class CustomClue extends Clue {
public static final Codec<CustomClue> CODEC=RecordCodecBuilder.create(t->t.group(
public static final MapCodec<CustomClue> CODEC=RecordCodecBuilder.mapCodec(t->t.group(
Clue.BASE_CODEC.forGetter(o->o.getData())
).apply(t,CustomClue::new));
public CustomClue() {
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/teammoeg/frostedheart/content/research/research/clues/ItemClue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package com.teammoeg.frostedheart.content.research.research.clues;

import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.teammoeg.frostedheart.FHMain;
import com.teammoeg.frostedheart.base.team.SpecialDataTypes;
Expand All @@ -34,7 +35,7 @@
import net.minecraft.network.chat.Component;

public class ItemClue extends Clue {
public static final Codec<ItemClue> CODEC=RecordCodecBuilder.create(t->t.group(
public static final MapCodec<ItemClue> CODEC=RecordCodecBuilder.mapCodec(t->t.group(
Clue.BASE_CODEC.forGetter(o->o.getData()),
CodecUtil.defaultValue(Codec.BOOL, false).fieldOf("consume").forGetter(o->o.consume),
CodecUtil.INGREDIENT_SIZE_CODEC.fieldOf("item").forGetter(o->o.stack)
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/teammoeg/frostedheart/content/research/research/clues/KillClue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package com.teammoeg.frostedheart.content.research.research.clues;

import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.teammoeg.frostedheart.FHMain;
import com.teammoeg.frostedheart.base.team.TeamDataHolder;
Expand All @@ -35,7 +36,7 @@
import net.minecraft.world.entity.LivingEntity;

public class KillClue extends ListenerClue {
public static final Codec<KillClue> CODEC=RecordCodecBuilder.create(t->t.group(
public static final MapCodec<KillClue> CODEC=RecordCodecBuilder.mapCodec(t->t.group(
ListenerClue.BASE_CODEC.forGetter(o->o.getData()),
CodecUtil.registryCodec(()->BuiltInRegistries.ENTITY_TYPE).fieldOf("entity").forGetter(o->o.type)
).apply(t,KillClue::new));
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/teammoeg/frostedheart/content/research/research/clues/MinigameClue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package com.teammoeg.frostedheart.content.research.research.clues;

import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.teammoeg.frostedheart.FHMain;
import com.teammoeg.frostedheart.content.research.research.Research;
Expand All @@ -28,7 +29,7 @@
import net.minecraft.network.chat.Component;

public class MinigameClue extends CustomClue {
public static final Codec<MinigameClue> CODEC=RecordCodecBuilder.create(t->t.group(
public static final MapCodec<MinigameClue> CODEC=RecordCodecBuilder.mapCodec(t->t.group(
Clue.BASE_CODEC.forGetter(o->o.getData()),
Codec.INT.fieldOf("level").forGetter(o->o.level)
).apply(t,MinigameClue::new));
Expand Down
Loading

0 comments on commit dd97b63

Please sign in to comment.