-
Notifications
You must be signed in to change notification settings - Fork 105
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev/1.20.1' into chore/code-health
- Loading branch information
Showing
11 changed files
with
106 additions
and
32 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
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
14 changes: 14 additions & 0 deletions
14
src/core/java/com/enderio/core/common/integration/AlmostUnifiedIntegration.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,14 @@ | ||
package com.enderio.core.common.integration; | ||
|
||
import com.almostreliable.unified.api.AlmostUnifiedLookup; | ||
import com.enderio.api.integration.Integration; | ||
import net.minecraft.tags.TagKey; | ||
import net.minecraft.world.item.Item; | ||
import org.jetbrains.annotations.Nullable; | ||
|
||
public class AlmostUnifiedIntegration implements Integration { | ||
@Nullable | ||
public Item getPreferredItemForTag(TagKey<Item> tagKey) { | ||
return AlmostUnifiedLookup.INSTANCE.getPreferredItemForTag(tagKey); | ||
} | ||
} |
12 changes: 12 additions & 0 deletions
12
src/core/java/com/enderio/core/common/integration/Integrations.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,12 @@ | ||
package com.enderio.core.common.integration; | ||
|
||
import com.enderio.api.integration.IntegrationManager; | ||
import com.enderio.api.integration.IntegrationWrapper; | ||
|
||
public class Integrations { | ||
|
||
public static final IntegrationWrapper<AlmostUnifiedIntegration> almostUnifiedIntegration = IntegrationManager.wrapper("almostunified", AlmostUnifiedIntegration::new); | ||
|
||
public static void register() { | ||
} | ||
} |
5 changes: 5 additions & 0 deletions
5
src/core/java/com/enderio/core/common/integration/package-info.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,5 @@ | ||
@javax.annotation.ParametersAreNonnullByDefault | ||
@net.minecraft.MethodsReturnNonnullByDefault | ||
@com.tterrag.registrate.util.nullness.FieldsAreNonnullByDefault | ||
|
||
package com.enderio.core.common.integration; |
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
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