Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patch found issues #291

Merged
merged 3 commits into from
Jan 4, 2025
+664 −603
Merged

patch found issues #291

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5caf9e3
add fluids and gases to JEI menu
skiprocks999 Jan 4, 2025
dfcf35a
fix gas tags
skiprocks999 Jan 4, 2025
d4e2d0e
jei cleanup
skiprocks999 Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
jei cleanup
@skiprocks999
skiprocks999 committed Jan 4, 2025
commit d4e2d0e7c63284a05ac27bf267bf9674de941e7d
2 changes: 1 addition & 1 deletion runs/client/usercache.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-04 13:18:50 -0600"}]
[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-04 13:58:10 -0600"}]
4 changes: 2 additions & 2 deletions src/main/java/electrodynamics/common/item/gear/armor/types/ItemServoLeggings.java
View file
Original file line number Diff line number Diff line change
@@ -160,7 +160,7 @@ protected static void wearingTick(ItemStack stack, Level world, Player player) {
break;
case 3:
stack.set(ElectrodynamicsDataComponentTypes.SUCESS, false);
if (!stack.set(ElectrodynamicsDataComponentTypes.RESET, false)) {
if (!stack.getOrDefault(ElectrodynamicsDataComponentTypes.RESET, false)) {
player.getAttribute(Attributes.STEP_HEIGHT).removeModifier(ElectrodynamicsAttributeModifiers.SERVO_LEGGINGS_STEP);
}
break;
@@ -169,7 +169,7 @@ protected static void wearingTick(ItemStack stack, Level world, Player player) {
}
} else {
stack.set(ElectrodynamicsDataComponentTypes.SUCESS, false);
if (!stack.set(ElectrodynamicsDataComponentTypes.RESET, false)) {
if (!stack.getOrDefault(ElectrodynamicsDataComponentTypes.RESET, false)) {
player.getAttribute(Attributes.STEP_HEIGHT).removeModifier(ElectrodynamicsAttributeModifiers.SERVO_LEGGINGS_STEP);

}
2 changes: 2 additions & 0 deletions src/main/java/electrodynamics/compatibility/jei/ElectrodynamicsJEIPlugin.java
View file
Original file line number Diff line number Diff line change
@@ -110,7 +110,9 @@ public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) {
registration.addRecipeCatalyst(ReinforcedAlloyerRecipeCategory.INPUT_MACHINE, ReinforcedAlloyerRecipeCategory.RECIPE_TYPE);
registration.addRecipeCatalyst(ElectrolyticSeparatorRecipeCategory.INPUT_MACHINE, ElectrolyticSeparatorRecipeCategory.RECIPE_TYPE);
registration.addRecipeCatalyst(CondensingGasRecipeCategory.INPUT_MACHINE, CondensingGasRecipeCategory.RECIPE_TYPE);
registration.addRecipeCatalyst(new ItemStack(ElectrodynamicsBlocks.BLOCK_ADVANCED_THERMOELECTRICMANIPULATOR.get()), CondensingGasRecipeCategory.RECIPE_TYPE);
registration.addRecipeCatalyst(EvaporatingFluidRecipeCategory.INPUT_MACHINE, EvaporatingFluidRecipeCategory.RECIPE_TYPE);
registration.addRecipeCatalyst(new ItemStack(ElectrodynamicsBlocks.BLOCK_ADVANCED_THERMOELECTRICMANIPULATOR.get()), EvaporatingFluidRecipeCategory.RECIPE_TYPE);
registration.addRecipeCatalyst(ChemicalReactorRecipeCategory.INPUT_MACHINE, ChemicalReactorRecipeCategory.RECIPE_TYPE);
registration.addRecipeCatalyst(GasCollectorRecipeCategory.INPUT_MACHINE, GasCollectorRecipeCategory.RECIPE_TYPE);
registration.addRecipeCatalyst(ElectrolosisChamberRecipeCategory.INPUT_MACHINE, ElectrolosisChamberRecipeCategory.RECIPE_TYPE);
3 changes: 3 additions & 0 deletions .../compatibility/jei/recipecategories/utils/psuedorecipes/ElectrodynamicsPsuedoRecipes.java
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,9 @@ public class ElectrodynamicsPsuedoRecipes {

public static void initRecipes() {

EVAPORATION_RECIPES.clear();
CONDENSATION_RECIPES.clear();

for (Gas gas : ElectrodynamicsGases.GAS_REGISTRY.stream().toList()) {

if (gas.isEmpty()) {