Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2025-02-02 23:31:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Delete unused fields and methods in recipe fixes

Browse Source
This commit is contained in:
FlorianMichael 2024-01-02 05:39:05 +01:00
parent 69df6e2ace
commit bfde0eac48
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
7 changed files with 24 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/florianmichael/viafabricplus/event/ChangeProtocolVersionCallback.java
View File

@ -36,4 +36,5 @@ public interface ChangeProtocolVersionCallback {
}); });
void onChangeProtocolVersion(final VersionEnum oldVersion, final VersionEnum newVersion); void onChangeProtocolVersion(final VersionEnum oldVersion, final VersionEnum newVersion);
} }

1
src/main/java/de/florianmichael/viafabricplus/event/LoadClassicProtocolExtensionCallback.java
View File

@ -35,4 +35,5 @@ public interface LoadClassicProtocolExtensionCallback {
}); });
void onLoadClassicProtocolExtension(final ClassicProtocolExtension classicProtocolExtension); void onLoadClassicProtocolExtension(final ClassicProtocolExtension classicProtocolExtension);
} }

1
src/main/java/de/florianmichael/viafabricplus/event/PostGameLoadCallback.java
View File

@ -34,4 +34,5 @@ public interface PostGameLoadCallback {
}); });
void postGameLoad(); void postGameLoad();
} }

1
src/main/java/de/florianmichael/viafabricplus/event/PostViaVersionLoadCallback.java
View File

@ -34,4 +34,5 @@ public interface PostViaVersionLoadCallback {
}); });
void onPostViaVersionLoad(); void onPostViaVersionLoad();
} }

1
src/main/java/de/florianmichael/viafabricplus/fixes/classic/GridItemSelectionScreen.java
View File

@ -82,7 +82,6 @@ public class GridItemSelectionScreen extends VFPScreen {
this.client.player.playerScreenHandler.sendContentUpdates(); this.client.player.playerScreenHandler.sendContentUpdates();
playClickSound(); playClickSound();
this.close(); this.close();
} }
return super.mouseClicked(mouseX, mouseY, button); return super.mouseClicked(mouseX, mouseY, button);

67
src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/RecipeInfo.java
View File

@ -36,30 +36,13 @@ import java.util.function.Supplier;
public final class RecipeInfo<T extends Recipe<?>> { public final class RecipeInfo<T extends Recipe<?>> {
private final Supplier<Recipe<?>> creator; private final Supplier<Recipe<?>> creator;
private final RecipeSerializer<T> recipeType;
private final ItemStack output;
private String distinguisher = "";
private RecipeInfo(Supplier<Recipe<?>> creator, RecipeSerializer<T> recipeType, ItemStack output) { private RecipeInfo(Supplier<Recipe<?>> creator) {
this.creator = creator; this.creator = creator;
this.recipeType = recipeType;
this.output = output;
} }
public static <T extends Recipe<?>> RecipeInfo<T> of(Supplier<Recipe<?>> creator, RecipeSerializer<T> recipeType, ItemStack output) { public static <T extends Recipe<?>> RecipeInfo<T> of(Supplier<Recipe<?>> creator) {
return new RecipeInfo<>(creator, recipeType, output); return new RecipeInfo<>(creator);
}
public static <T extends Recipe<?>> RecipeInfo<T> of(Supplier<Recipe<?>> creator, RecipeSerializer<T> recipeType, ItemConvertible output) {
return of(creator, recipeType, new ItemStack(output));
}
public static <T extends Recipe<?>> RecipeInfo<T> of(Supplier<Recipe<?>> creator, RecipeSerializer<T> recipeType, ItemConvertible output, int count) {
return of(creator, recipeType, new ItemStack(output, count));
}
public static RecipeInfo<ShapedRecipe> shaped(ItemStack output, Object... args) {
return shaped("", output, args);
} }
public static RecipeInfo<ShapedRecipe> shaped(ItemConvertible output, Object... args) { public static RecipeInfo<ShapedRecipe> shaped(ItemConvertible output, Object... args) {
@ -110,7 +93,7 @@ public final class RecipeInfo<T extends Recipe<?>> {
} }
final int width_f = width; final int width_f = width;
return new RecipeInfo<>(() -> new ShapedRecipe(group, CraftingRecipeCategory.MISC, new RawShapedRecipe(width_f, height, ingredients, Optional.empty()), output, false), RecipeSerializer.SHAPED, output); return new RecipeInfo<>(() -> new ShapedRecipe(group, CraftingRecipeCategory.MISC, new RawShapedRecipe(width_f, height, ingredients, Optional.empty()), output, false));
} }
public static RecipeInfo<ShapedRecipe> shaped(String group, ItemConvertible output, Object... args) { public static RecipeInfo<ShapedRecipe> shaped(String group, ItemConvertible output, Object... args) {
@ -123,8 +106,9 @@ public final class RecipeInfo<T extends Recipe<?>> {
public static RecipeInfo<ShapelessRecipe> shapeless(String group, ItemStack output, ItemConvertible... inputs) { public static RecipeInfo<ShapelessRecipe> shapeless(String group, ItemStack output, ItemConvertible... inputs) {
ItemConvertible[][] newInputs = new ItemConvertible[inputs.length][1]; ItemConvertible[][] newInputs = new ItemConvertible[inputs.length][1];
for (int i = 0; i < inputs.length; i++) for (int i = 0; i < inputs.length; i++) {
newInputs[i] = new ItemConvertible[]{inputs[i]}; newInputs[i] = new ItemConvertible[]{inputs[i]};
}
return shapeless(group, output, newInputs); return shapeless(group, output, newInputs);
} }
@ -141,21 +125,13 @@ public final class RecipeInfo<T extends Recipe<?>> {
for (ItemConvertible[] input : inputs) { for (ItemConvertible[] input : inputs) {
ingredients.add(Ingredient.ofItems(input)); ingredients.add(Ingredient.ofItems(input));
} }
return new RecipeInfo<>(() -> new ShapelessRecipe(group, CraftingRecipeCategory.MISC, output, ingredients), RecipeSerializer.SHAPELESS, output); return new RecipeInfo<>(() -> new ShapelessRecipe(group, CraftingRecipeCategory.MISC, output, ingredients));
}
public static RecipeInfo<ShapelessRecipe> shapeless(String group, ItemConvertible output, ItemConvertible[]... inputs) {
return shapeless(group, new ItemStack(output), inputs);
} }
public static RecipeInfo<ShapelessRecipe> shapeless(String group, int count, ItemConvertible output, ItemConvertible[]... inputs) { public static RecipeInfo<ShapelessRecipe> shapeless(String group, int count, ItemConvertible output, ItemConvertible[]... inputs) {
return shapeless(group, new ItemStack(output, count), inputs); return shapeless(group, new ItemStack(output, count), inputs);
} }
public static RecipeInfo<ShapelessRecipe> shapeless(ItemStack output, ItemConvertible... inputs) {
return shapeless("", output, inputs);
}
public static RecipeInfo<ShapelessRecipe> shapeless(ItemConvertible output, ItemConvertible... inputs) { public static RecipeInfo<ShapelessRecipe> shapeless(ItemConvertible output, ItemConvertible... inputs) {
return shapeless("", output, inputs); return shapeless("", output, inputs);
} }
@ -164,14 +140,6 @@ public final class RecipeInfo<T extends Recipe<?>> {
return shapeless("", count, output, inputs); return shapeless("", count, output, inputs);
} }
public static RecipeInfo<ShapelessRecipe> shapeless(ItemStack output, ItemConvertible[]... inputs) {
return shapeless("", output, inputs);
}
public static RecipeInfo<ShapelessRecipe> shapeless(ItemConvertible output, ItemConvertible[]... inputs) {
return shapeless("", output, inputs);
}
public static RecipeInfo<ShapelessRecipe> shapeless(int count, ItemConvertible output, ItemConvertible[]... inputs) { public static RecipeInfo<ShapelessRecipe> shapeless(int count, ItemConvertible output, ItemConvertible[]... inputs) {
return shapeless("", count, output, inputs); return shapeless("", count, output, inputs);
} }
@ -189,30 +157,11 @@ public final class RecipeInfo<T extends Recipe<?>> {
} }
public static RecipeInfo<SmeltingRecipe> smelting(ItemConvertible output, Ingredient input, float experience, int cookTime) { public static RecipeInfo<SmeltingRecipe> smelting(ItemConvertible output, Ingredient input, float experience, int cookTime) {
ItemStack outputStack = new ItemStack(output); return new RecipeInfo<>(() -> new SmeltingRecipe("", CookingRecipeCategory.MISC, input, new ItemStack(output), experience, cookTime));
return new RecipeInfo<>(() -> new SmeltingRecipe("", CookingRecipeCategory.MISC, input, outputStack, experience, cookTime), RecipeSerializer.SMELTING, outputStack);
} }
public RecipeInfo<T> distinguisher(String distinguisher) {
this.distinguisher = distinguisher;
return this;
}
public RecipeEntry<?> create(Identifier id) { public RecipeEntry<?> create(Identifier id) {
return new RecipeEntry<Recipe<?>>(id, this.creator.get()); return new RecipeEntry<Recipe<?>>(id, this.creator.get());
} }
public RecipeSerializer<T> getRecipeType() {
return this.recipeType;
}
public ItemStack getOutput() {
return this.output;
}
public String getDistinguisher() {
return this.distinguisher;
}
} }

24
src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/Recipes1_11_2.java
View File

@ -47,27 +47,27 @@ public class Recipes1_11_2 {
final List<RecipeInfo<?>> recipes = new ArrayList<>(); final List<RecipeInfo<?>> recipes = new ArrayList<>();
if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_4_2)) { if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_4_2)) {
recipes.add(RecipeInfo.of(() -> new ArmorDyeRecipe(CraftingRecipeCategory.MISC), RecipeSerializer.ARMOR_DYE, Items.LEATHER_HELMET)); recipes.add(RecipeInfo.of(() -> new ArmorDyeRecipe(CraftingRecipeCategory.MISC)));
recipes.add(RecipeInfo.of(() -> new MapCloningRecipe(CraftingRecipeCategory.MISC), RecipeSerializer.MAP_CLONING, Items.FILLED_MAP, 2)); recipes.add(RecipeInfo.of(() -> new MapCloningRecipe(CraftingRecipeCategory.MISC)));
recipes.add(RecipeInfo.of(() -> new MapExtendingRecipe(CraftingRecipeCategory.MISC), RecipeSerializer.MAP_EXTENDING, Items.FILLED_MAP)); recipes.add(RecipeInfo.of(() -> new MapExtendingRecipe(CraftingRecipeCategory.MISC)));
} }
if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_4_6tor1_4_7)) { if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_4_6tor1_4_7)) {
recipes.add(RecipeInfo.of(() -> new FireworkRocketRecipe(CraftingRecipeCategory.MISC), RecipeSerializer.FIREWORK_ROCKET, Items.FIREWORK_ROCKET)); recipes.add(RecipeInfo.of(() -> new FireworkRocketRecipe(CraftingRecipeCategory.MISC)));
} }
if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_11)) { if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_11)) {
recipes.add(RecipeInfo.of(() -> new ShulkerBoxColoringRecipe(CraftingRecipeCategory.MISC), RecipeSerializer.SHULKER_BOX, Items.WHITE_SHULKER_BOX)); recipes.add(RecipeInfo.of(() -> new ShulkerBoxColoringRecipe(CraftingRecipeCategory.MISC)));
} }
if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_9)) { if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_9)) {
recipes.add(RecipeInfo.of(() -> new TippedArrowRecipe(CraftingRecipeCategory.MISC), RecipeSerializer.TIPPED_ARROW, Items.TIPPED_ARROW)); recipes.add(RecipeInfo.of(() -> new TippedArrowRecipe(CraftingRecipeCategory.MISC)));
recipes.add(RecipeInfo.of(() -> new ShieldDecorationRecipe(CraftingRecipeCategory.MISC), RecipeSerializer.SHIELD_DECORATION, Items.SHIELD)); recipes.add(RecipeInfo.of(() -> new ShieldDecorationRecipe(CraftingRecipeCategory.MISC)));
} }
if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_8)) { if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_8)) {
recipes.add(RecipeInfo.of(() -> new RepairItemRecipe(CraftingRecipeCategory.MISC), RecipeSerializer.REPAIR_ITEM, Items.WOODEN_SWORD)); recipes.add(RecipeInfo.of(() -> new RepairItemRecipe(CraftingRecipeCategory.MISC)));
recipes.add(RecipeInfo.of(() -> new BannerDuplicateRecipe(CraftingRecipeCategory.MISC), RecipeSerializer.BANNER_DUPLICATE, Items.WHITE_BANNER, 2)); recipes.add(RecipeInfo.of(() -> new BannerDuplicateRecipe(CraftingRecipeCategory.MISC)));
recipes.add(RecipeInfo.of(() -> new AddBannerPatternRecipe(CraftingRecipeCategory.MISC), AddBannerPatternRecipe.SERIALIZER, Items.WHITE_BANNER)); recipes.add(RecipeInfo.of(() -> new AddBannerPatternRecipe(CraftingRecipeCategory.MISC)));
} }
if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_7_2tor1_7_5)) { if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_7_2tor1_7_5)) {
recipes.add(RecipeInfo.of(() -> new BookCloningRecipe(CraftingRecipeCategory.MISC), RecipeSerializer.BOOK_CLONING, Items.WRITABLE_BOOK, 2)); recipes.add(RecipeInfo.of(() -> new BookCloningRecipe(CraftingRecipeCategory.MISC)));
} }
recipes.add(RecipeInfo.shaped(Items.WOODEN_SWORD, "X", "X", "#", '#', Items.STICK, 'X', Blocks.OAK_PLANKS, Blocks.SPRUCE_PLANKS, Blocks.BIRCH_PLANKS, Blocks.JUNGLE_PLANKS, Blocks.ACACIA_PLANKS, Blocks.DARK_OAK_PLANKS)); recipes.add(RecipeInfo.shaped(Items.WOODEN_SWORD, "X", "X", "#", '#', Items.STICK, 'X', Blocks.OAK_PLANKS, Blocks.SPRUCE_PLANKS, Blocks.BIRCH_PLANKS, Blocks.JUNGLE_PLANKS, Blocks.ACACIA_PLANKS, Blocks.DARK_OAK_PLANKS));
@ -200,7 +200,7 @@ public class Recipes1_11_2 {
} }
if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_11_1to1_11_2)) { if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_11_1to1_11_2)) {
recipes.add(RecipeInfo.shaped(9, Items.IRON_NUGGET, "#", '#', Items.IRON_INGOT)); recipes.add(RecipeInfo.shaped(9, Items.IRON_NUGGET, "#", '#', Items.IRON_INGOT));
recipes.add(RecipeInfo.shaped("iron_ingot", Items.IRON_INGOT, "###", "###", "###", '#', Items.IRON_NUGGET).distinguisher("iron_nugget_to_ingot")); recipes.add(RecipeInfo.shaped("iron_ingot", Items.IRON_INGOT, "###", "###", "###", '#', Items.IRON_NUGGET));
} }
if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_11)) { if (targetVersion.isNewerThanOrEqualTo(VersionEnum.r1_11)) {
recipes.add(RecipeInfo.shaped(Blocks.OBSERVER, "###", "RRQ", "###", 'Q', Items.QUARTZ, 'R', Blocks.REDSTONE_WIRE, '#', Blocks.COBBLESTONE)); recipes.add(RecipeInfo.shaped(Blocks.OBSERVER, "###", "RRQ", "###", 'Q', Items.QUARTZ, 'R', Blocks.REDSTONE_WIRE, '#', Blocks.COBBLESTONE));