Skip to content

Commit baee362

Browse files
Shadowbee27Shadowbee27
committed
fixed some issues
1 parent f829ccd commit baee362

12 files changed

+235
-240
lines changed

‎common/src/main/java/dev/felnull/imp/advancements/AddMusicTrigger.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,6 @@
1515
public class AddMusicTrigger extends SimpleCriterionTrigger<AddMusicTrigger.TriggerInstance> {
1616
private static final ResourceLocation ID = new ResourceLocation(IamMusicPlayer.MODID, "add_music");
1717

18-
/*
19-
* @Override
20-
* protected TriggerInstance createInstance(JsonObject jsonObject,
21-
* EntityPredicate.Composite composite, DeserializationContext
22-
* deserializationContext) {
23-
* return new TriggerInstance(composite);
24-
* }
25-
*/
26-
2718
@Override
2819
protected @NotNull TriggerInstance createInstance(JsonObject jsonObject, ContextAwarePredicate contextAwarePredicate,
2920
DeserializationContext deserializationContext) {

‎common/src/main/java/dev/felnull/imp/advancements/ListenToMusicTrigger.java‎

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,10 @@
1515
public class ListenToMusicTrigger extends SimpleCriterionTrigger<ListenToMusicTrigger.TriggerInstance> {
1616
private static final ResourceLocation ID = new ResourceLocation(IamMusicPlayer.MODID, "listen_to_music");
1717

18-
/*
19-
* @Override
20-
* protected TriggerInstance createInstance(JsonObject jo,
21-
* EntityPredicate.Composite composite, DeserializationContext
22-
* deserializationContext) {
23-
* boolean radio = jo.has("radio") && jo.get("radio").getAsBoolean();
24-
* boolean remote = jo.has("remote") && jo.get("remote").getAsBoolean();
25-
* boolean kamesuta = jo.has("kamesuta") && jo.get("kamesuta").getAsBoolean();
26-
* return new TriggerInstance(composite, radio, remote, kamesuta);
27-
* }
28-
*/
29-
3018
@Override
3119
protected @NotNull TriggerInstance createInstance(JsonObject jo,
32-
Optional<ContextAwarePredicate> contextAwarePredicate,
33-
@NotNull DeserializationContext deserializationContext) {
20+
Optional<ContextAwarePredicate> contextAwarePredicate,
21+
@NotNull DeserializationContext deserializationContext) {
3422
boolean radio = false;
3523
boolean remote = false;
3624
boolean kamesuta = false;
@@ -68,23 +56,13 @@ public static class TriggerInstance extends AbstractCriterionTriggerInstance {
6856
private final boolean kamesuta;
6957

7058
public TriggerInstance(ContextAwarePredicate contextAwarePredicate, boolean radio, boolean remote,
71-
boolean kamesuta) {
72-
super(ID, contextAwarePredicate);
59+
boolean kamesuta) {
60+
super(Optional.of(contextAwarePredicate));
7361
this.radio = radio;
7462
this.remote = remote;
7563
this.kamesuta = kamesuta;
7664
}
7765

78-
/*
79-
* public TriggerInstance(EntityPredicate.Composite composite, boolean radio,
80-
* boolean remote, boolean kamesuta) {
81-
* super(ID, composite);
82-
* this.radio = radio;
83-
* this.remote = remote;
84-
* this.kamesuta = kamesuta;
85-
* }
86-
*/
87-
8866
public boolean matches(boolean radio, boolean remote, boolean kamesuta) {
8967
if (this.radio && !radio)
9068
return false;

‎common/src/main/java/dev/felnull/imp/advancements/WriteCassetteTapeTrigger.java‎

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,51 @@
66
import net.minecraft.resources.ResourceLocation;
77
import net.minecraft.server.level.ServerPlayer;
88
import net.minecraft.world.item.ItemStack;
9-
import org.jetbrains.annotations.NotNull;
109

11-
public class WriteCassetteTapeTrigger extends SimpleCriterionTrigger<WriteCassetteTapeTrigger.TriggerInstance> {
12-
private static final ResourceLocation ID = new ResourceLocation(IamMusicPlayer.MODID, "write_cassette_tape");
10+
import java.util.Optional;
1311

14-
/*@Override
15-
protected TriggerInstance createInstance(JsonObject jsonObject, EntityPredicate.Composite composite, DeserializationContext deserializationContext) {
16-
ItemPredicate itemPredicate = ItemPredicate.fromJson(jsonObject.get("item"));
17-
return new TriggerInstance(composite, itemPredicate);
18-
}*/
19-
@Override
20-
protected @NotNull TriggerInstance createInstance(JsonObject jsonObject, ContextAwarePredicate contextAwarePredicate, DeserializationContext deserializationContext) {
21-
ItemPredicate itemPredicate = ItemPredicate.fromJson(jsonObject.get("item"));
22-
return new TriggerInstance(contextAwarePredicate, itemPredicate);
23-
}
12+
import org.jetbrains.annotations.NotNull;
2413

25-
public void trigger(ServerPlayer serverPlayer, ItemStack itemStack) {
26-
this.trigger(serverPlayer, (triggerInstance) -> triggerInstance.matches(itemStack));
27-
}
14+
public class WriteCassetteTapeTrigger extends SimpleCriterionTrigger<WriteCassetteTapeTrigger.TriggerInstance> {
15+
private static final ResourceLocation ID = new ResourceLocation(IamMusicPlayer.MODID, "write_cassette_tape");
2816

29-
public ResourceLocation getId() {
30-
return ID;
31-
}
17+
@Override
18+
protected @NotNull TriggerInstance createInstance(JsonObject jsonObject, ContextAwarePredicate contextAwarePredicate,
19+
DeserializationContext deserializationContext) {
20+
ItemPredicate itemPredicate = ItemPredicate.fromJson(jsonObject.get("item"));
21+
return new TriggerInstance(contextAwarePredicate, itemPredicate);
22+
}
3223

24+
public void trigger(ServerPlayer serverPlayer, ItemStack itemStack) {
25+
this.trigger(serverPlayer, (triggerInstance) -> triggerInstance.matches(itemStack));
26+
}
3327

34-
public static class TriggerInstance extends AbstractCriterionTriggerInstance {
35-
private final ItemPredicate item;
28+
public ResourceLocation getId() {
29+
return ID;
30+
}
3631

37-
public TriggerInstance(ContextAwarePredicate contextAwarePredicate, ItemPredicate itemPredicat) {
38-
super(ID, contextAwarePredicate);
39-
this.item = itemPredicat;
40-
}
32+
public static class TriggerInstance extends AbstractCriterionTriggerInstance {
33+
private final ItemPredicate item;
4134

35+
public TriggerInstance(ContextAwarePredicate contextAwarePredicate, ItemPredicate itemPredicat) {
36+
super(Optional.of(contextAwarePredicate));
37+
this.item = itemPredicat;
38+
}
4239

43-
public boolean matches(ItemStack itemStack) {
44-
return item.matches(itemStack);
45-
}
40+
public boolean matches(ItemStack itemStack) {
41+
return item.matches(itemStack);
42+
}
4643

47-
@Override
48-
public JsonObject serializeToJson(SerializationContext serializationContext) {
49-
JsonObject jsonObject = super.serializeToJson(serializationContext);
50-
if (this.item != null)
51-
jsonObject.add("item", this.item.serializeToJson());
52-
return jsonObject;
53-
}
44+
@Override
45+
public JsonObject serializeToJson() {
46+
JsonObject jsonObject = new JsonObject();
47+
if (this.item != null)
48+
jsonObject.add("item", this.item.serializeToJson());
49+
return jsonObject;
50+
}
5451

55-
public static TriggerInstance writeCassetteTape() {
56-
return new TriggerInstance(ContextAwarePredicate.ANY, null);
57-
}
52+
public static TriggerInstance writeCassetteTape() {
53+
return new TriggerInstance(ContextAwarePredicate.ANY, null);
5854
}
55+
}
5956
}

‎common/src/main/java/dev/felnull/imp/data/IMPRecipeProviderWrapper.java‎

Lines changed: 78 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -19,88 +19,90 @@
1919

2020
public class IMPRecipeProviderWrapper extends RecipeProviderWrapper {
2121

22-
public IMPRecipeProviderWrapper(PackOutput packOutput, CrossDataGeneratorAccess crossDataGeneratorAccess) {
23-
super(packOutput, crossDataGeneratorAccess);
24-
}
22+
public IMPRecipeProviderWrapper(PackOutput packOutput, CrossDataGeneratorAccess crossDataGeneratorAccess) {
23+
super(packOutput, crossDataGeneratorAccess);
24+
}
2525

26-
@Override
27-
public void generateRecipe(Consumer<FinishedRecipe> exporter, RecipeProviderAccess providerAccess) {
28-
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, IMPItems.MANUAL.get())
29-
.requires(Items.BOOK)
30-
.requires(IMPItemTags.CASSETTE_TAPE)
31-
.unlockedBy(providerAccess.getHasName(Items.BOOK), providerAccess.has(Items.BOOK))
32-
.save(exporter);
26+
@Override
27+
public void generateRecipe(Consumer<FinishedRecipe> exporter, RecipeProviderAccess providerAccess) {
28+
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, IMPItems.MANUAL.get())
29+
.requires(Items.BOOK)
30+
.requires(IMPItemTags.CASSETTE_TAPE)
31+
.unlockedBy(providerAccess.getHasName(Items.BOOK), providerAccess.has(Items.BOOK))
32+
.save(exporter);
3333

34-
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, IMPItems.CASSETTE_TAPE.get())
35-
.requires(PlatformItemTags.ironNuggets().getKey())
36-
.requires(PlatformItemTags.stone().getKey())
37-
.requires(PlatformItemTags.redstoneDusts())
38-
.requires(Items.DRIED_KELP)
39-
.unlockedBy(providerAccess.getHasName(Items.DRIED_KELP), providerAccess.has(Items.DRIED_KELP))
40-
.save(exporter);
34+
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, IMPItems.CASSETTE_TAPE.get())
35+
.requires(PlatformItemTags.ironNuggets().getKey())
36+
.requires(PlatformItemTags.stone().getKey())
37+
.requires(PlatformItemTags.redstoneDusts())
38+
.requires(Items.DRIED_KELP)
39+
.unlockedBy(providerAccess.getHasName(Items.DRIED_KELP), providerAccess.has(Items.DRIED_KELP))
40+
.save(exporter);
4141

42-
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, IMPItems.CASSETTE_TAPE_GLASS.get())
43-
.requires(PlatformItemTags.ironNuggets().getKey())
44-
.requires(PlatformItemTags.glassBlocks())
45-
.requires(PlatformItemTags.redstoneDusts())
46-
.requires(Items.DRIED_KELP)
47-
.unlockedBy(providerAccess.getHasName(Items.DRIED_KELP), providerAccess.has(Items.DRIED_KELP))
48-
.save(exporter);
42+
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, IMPItems.CASSETTE_TAPE_GLASS.get())
43+
.requires(PlatformItemTags.ironNuggets().getKey())
44+
.requires(PlatformItemTags.glassBlocks())
45+
.requires(PlatformItemTags.redstoneDusts())
46+
.requires(Items.DRIED_KELP)
47+
.unlockedBy(providerAccess.getHasName(Items.DRIED_KELP), providerAccess.has(Items.DRIED_KELP))
48+
.save(exporter);
4949

50-
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, IMPItems.RADIO_ANTENNA.get())
51-
.define('E', PlatformItemTags.enderPearls().getKey())
52-
.define('I', PlatformItemTags.ironIngots())
53-
.pattern("E")
54-
.pattern("I")
55-
.pattern("I")
56-
.group("antenna")
57-
.unlockedBy(providerAccess.getHasName(Items.ENDER_PEARL), providerAccess.has(PlatformItemTags.enderPearls().getKey()))
58-
.save(exporter);
50+
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, IMPItems.RADIO_ANTENNA.get())
51+
.define('E', PlatformItemTags.enderPearls().getKey())
52+
.define('I', PlatformItemTags.ironIngots())
53+
.pattern("E")
54+
.pattern("I")
55+
.pattern("I")
56+
.group("antenna")
57+
.unlockedBy(providerAccess.getHasName(Items.ENDER_PEARL),
58+
providerAccess.has(PlatformItemTags.enderPearls().getKey()))
59+
.save(exporter);
5960

60-
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, IMPItems.PARABOLIC_ANTENNA.get())
61-
.define('E', PlatformItemTags.enderPearls().getKey())
62-
.define('I', PlatformItemTags.ironIngots())
63-
.define('B', Blocks.IRON_BLOCK)
64-
.pattern("IEI")
65-
.pattern("I I")
66-
.pattern(" B ")
67-
.group("antenna")
68-
.unlockedBy(providerAccess.getHasName(Items.ENDER_PEARL), providerAccess.has(PlatformItemTags.enderPearls().getKey()))
69-
.save(exporter);
61+
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, IMPItems.PARABOLIC_ANTENNA.get())
62+
.define('E', PlatformItemTags.enderPearls().getKey())
63+
.define('I', PlatformItemTags.ironIngots())
64+
.define('B', Blocks.IRON_BLOCK)
65+
.pattern("IEI")
66+
.pattern("I I")
67+
.pattern(" B ")
68+
.group("antenna")
69+
.unlockedBy(providerAccess.getHasName(Items.ENDER_PEARL),
70+
providerAccess.has(PlatformItemTags.enderPearls().getKey()))
71+
.save(exporter);
7072

71-
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, IMPBlocks.BOOMBOX.get())
72-
.define('T', PlatformItemTags.ironNuggets().getKey())
73-
.define('I', PlatformItemTags.ironIngots())
74-
.define('N', Items.NOTE_BLOCK)
75-
.define('J', Items.JUKEBOX)
76-
.define('B', ItemTags.BUTTONS)
77-
.pattern("TBT")
78-
.pattern("NJN")
79-
.pattern("III")
80-
.unlockedBy(providerAccess.getHasName(Items.JUKEBOX), providerAccess.has(Items.JUKEBOX))
81-
.save(exporter);
73+
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, IMPBlocks.BOOMBOX.get())
74+
.define('T', PlatformItemTags.ironNuggets().getKey())
75+
.define('I', PlatformItemTags.ironIngots())
76+
.define('N', Items.NOTE_BLOCK)
77+
.define('J', Items.JUKEBOX)
78+
.define('B', ItemTags.BUTTONS)
79+
.pattern("TBT")
80+
.pattern("NJN")
81+
.pattern("III")
82+
.unlockedBy(providerAccess.getHasName(Items.JUKEBOX), providerAccess.has(Items.JUKEBOX))
83+
.save(exporter);
8284

83-
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, IMPBlocks.CASSETTE_DECK.get())
84-
.define('R', PlatformItemTags.redstoneDusts())
85-
.define('I', PlatformItemTags.ironIngots())
86-
.define('N', Items.NOTE_BLOCK)
87-
.define('J', Items.JUKEBOX)
88-
.pattern("IRI")
89-
.pattern("NJN")
90-
.pattern("III")
91-
.unlockedBy(providerAccess.getHasName(Items.JUKEBOX), providerAccess.has(Items.JUKEBOX))
92-
.save(exporter);
85+
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, IMPBlocks.CASSETTE_DECK.get())
86+
.define('R', PlatformItemTags.redstoneDusts())
87+
.define('I', PlatformItemTags.ironIngots())
88+
.define('N', Items.NOTE_BLOCK)
89+
.define('J', Items.JUKEBOX)
90+
.pattern("IRI")
91+
.pattern("NJN")
92+
.pattern("III")
93+
.unlockedBy(providerAccess.getHasName(Items.JUKEBOX), providerAccess.has(Items.JUKEBOX))
94+
.save(exporter);
9395

94-
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, IMPBlocks.MUSIC_MANAGER.get())
95-
.define('D', PlatformItemTags.diamonds())
96-
.define('I', PlatformItemTags.ironIngots())
97-
.define('G', PlatformItemTags.glassPanes())
98-
.define('R', PlatformItemTags.redstoneDusts())
99-
.define('B', PlatformItemTags.diamonds())
100-
.pattern("III")
101-
.pattern("DGR")
102-
.pattern("BII")
103-
.unlockedBy(providerAccess.getHasName(Items.DIAMOND), providerAccess.has(Items.DIAMOND))
104-
.save(exporter);
105-
}
96+
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, IMPBlocks.MUSIC_MANAGER.get())
97+
.define('D', PlatformItemTags.diamonds())
98+
.define('I', PlatformItemTags.ironIngots())
99+
.define('G', PlatformItemTags.glassPanes())
100+
.define('R', PlatformItemTags.redstoneDusts())
101+
.define('B', PlatformItemTags.diamonds())
102+
.pattern("III")
103+
.pattern("DGR")
104+
.pattern("BII")
105+
.unlockedBy(providerAccess.getHasName(Items.DIAMOND), providerAccess.has(Items.DIAMOND))
106+
.save(exporter);
107+
}
106108
}

0 commit comments

Comments
 (0)