-
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Vendor Improvements
- Loading branch information
Showing
45 changed files
with
1,227 additions
and
159 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
common/src/generated/resources/.cache/630af4bded938901e0e1fd57c58a2ac245292828
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
common/src/generated/resources/.cache/6ba62358bf8e130d42215f5f9edbedd611809677
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
common/src/generated/resources/.cache/816056b233c115f7af92c9ed2c207f096721f5cf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| // 1.20.1 2024-07-24T07:41:10.61410668 Create: Numismatics/Numismatics EMI excluded tags | ||
| b57edab6f7e7a6e1b1211daa4c3b217ffd09ce62 assets/emi/tag/exclusions/numismatics.json |
2 changes: 1 addition & 1 deletion
2
common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| // 1.20.1 2024-07-21T07:28:28.810455961 Create: Numismatics/Numismatics' Sequenced Assembly Recipes | ||
| // 1.20.1 2024-07-24T07:41:10.619204352 Create: Numismatics/Numismatics' Sequenced Assembly Recipes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
common/src/generated/resources/assets/emi/tag/exclusions/numismatics.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| { | ||
| "block": [ | ||
| "numismatics:internal/relocation_not_supported" | ||
| ], | ||
| "item": [ | ||
| "numismatics:internal/string", | ||
| "numismatics:internal/nuggets/iron_nuggets", | ||
| "numismatics:internal/nuggets/zinc_nuggets", | ||
| "numismatics:internal/nuggets/brass_nuggets", | ||
| "numismatics:internal/plates/iron_plates", | ||
| "numismatics:internal/plates/gold_plates", | ||
| "numismatics:internal/ingots/copper_ingots", | ||
| "numismatics:internal/ingots/iron_ingots", | ||
| "numismatics:internal/dyes/white_dyes", | ||
| "numismatics:internal/dyes/orange_dyes", | ||
| "numismatics:internal/dyes/magenta_dyes", | ||
| "numismatics:internal/dyes/light_blue_dyes", | ||
| "numismatics:internal/dyes/yellow_dyes", | ||
| "numismatics:internal/dyes/lime_dyes", | ||
| "numismatics:internal/dyes/pink_dyes", | ||
| "numismatics:internal/dyes/gray_dyes", | ||
| "numismatics:internal/dyes/light_gray_dyes", | ||
| "numismatics:internal/dyes/cyan_dyes", | ||
| "numismatics:internal/dyes/purple_dyes", | ||
| "numismatics:internal/dyes/blue_dyes", | ||
| "numismatics:internal/dyes/brown_dyes", | ||
| "numismatics:internal/dyes/green_dyes", | ||
| "numismatics:internal/dyes/red_dyes", | ||
| "numismatics:internal/dyes/black_dyes" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
common/src/main/java/dev/ithundxr/createnumismatics/base/data/emi/EmiExcludedTagGen.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Steam 'n' Rails | ||
| * Copyright (c) 2022-2024 The Railways Team | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package dev.ithundxr.createnumismatics.base.data.emi; | ||
|
|
||
| import com.google.gson.JsonArray; | ||
| import com.google.gson.JsonElement; | ||
| import com.google.gson.JsonObject; | ||
| import dev.ithundxr.createnumismatics.multiloader.CommonTag; | ||
| import dev.ithundxr.createnumismatics.multiloader.CommonTags; | ||
| import net.minecraft.data.CachedOutput; | ||
| import net.minecraft.data.DataProvider; | ||
| import net.minecraft.data.PackOutput; | ||
| import net.minecraft.world.item.Item; | ||
| import net.minecraft.world.level.block.Block; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import java.nio.file.Path; | ||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| public class EmiExcludedTagGen implements DataProvider { | ||
| private static final String INDENT = " "; | ||
| private final PackOutput packOutput; | ||
|
|
||
| public EmiExcludedTagGen(PackOutput packOutput) { | ||
| this.packOutput = packOutput; | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull CompletableFuture<?> run(@NotNull CachedOutput output) { | ||
| Path path = this.packOutput.getOutputFolder() | ||
| .resolve("assets/emi/tag/exclusions/numismatics.json"); | ||
|
|
||
| return DataProvider.saveStable(output, run(), path); | ||
| } | ||
|
|
||
| private JsonElement run() { | ||
| JsonObject object = new JsonObject(); | ||
| { | ||
| JsonArray item = new JsonArray(); | ||
| // fill in items | ||
| for (CommonTag<Item> itemTag : CommonTags.ALL_ITEMS) { | ||
| item.add(itemTag.tag.location().toString()); | ||
| } | ||
| object.add("item", item); | ||
| } | ||
| { | ||
| JsonArray block = new JsonArray(); | ||
| // fill in blocks | ||
| for (CommonTag<Block> blockTag : CommonTags.ALL_BLOCKS) { | ||
| block.add(blockTag.tag.location().toString()); | ||
| } | ||
| object.add("block", block); | ||
| } | ||
| return object; | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return "Numismatics EMI excluded tags"; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
common/src/main/java/dev/ithundxr/createnumismatics/content/backend/IGhostItemMenu.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* | ||
| * Numismatics | ||
| * Copyright (c) 2024 The Railways Team | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package dev.ithundxr.createnumismatics.content.backend; | ||
|
|
||
| import net.minecraft.world.item.ItemStack; | ||
|
|
||
| public interface IGhostItemMenu { | ||
| void setGhostStackInSlot(int slotID, ItemStack stack); | ||
| boolean isSlotGhost(int slotID); | ||
| default boolean shouldGhostApplyEnchantsAndDye(int slotID) { | ||
| return true; | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
common/src/main/java/dev/ithundxr/createnumismatics/content/backend/IScrollableSlotMenu.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| /* | ||
| * Numismatics | ||
| * Copyright (c) 2024 The Railways Team | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package dev.ithundxr.createnumismatics.content.backend; | ||
|
|
||
| public interface IScrollableSlotMenu { | ||
| void scrollSlot(int slotID, double delta, boolean shiftHeld); | ||
| } |
Oops, something went wrong.