-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Disable custom baked block models for modules if Sodium is present.
It completely replaces the render pipeline but does not re-implement FabricBakedModel facilities, so these cannot work. Means we also have to disable the facade module. It gets hidden in the creative tab and in REI via a plugin. See #171.
- Loading branch information
Showing
10 changed files
with
87 additions
and
4 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
18 changes: 18 additions & 0 deletions
18
.../src/main/java/li/cil/tis3d/client/integration/roughlyenoughitems/ModREIClientPlugin.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,18 @@ | ||
package li.cil.tis3d.client.integration.roughlyenoughitems; | ||
|
||
import li.cil.tis3d.common.item.Items; | ||
import me.shedaniel.rei.api.client.entry.filtering.base.BasicFilteringRule; | ||
import me.shedaniel.rei.api.client.plugins.REIClientPlugin; | ||
import me.shedaniel.rei.api.common.util.EntryStacks; | ||
import net.fabricmc.loader.api.FabricLoader; | ||
|
||
import java.util.Collections; | ||
|
||
public final class ModREIClientPlugin implements REIClientPlugin { | ||
@Override | ||
public void registerBasicEntryFiltering(final BasicFilteringRule<?> rule) { | ||
if (FabricLoader.getInstance().isModLoaded("sodium")) { | ||
rule.hide(() -> Collections.singleton(EntryStacks.of(Items.FACADE_MODULE.get()))); | ||
} | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
fabric/src/main/java/li/cil/tis3d/client/integration/roughlyenoughitems/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,7 @@ | ||
@ParametersAreNonnullByDefault | ||
@MethodsReturnNonnullByDefault | ||
package li.cil.tis3d.client.integration.roughlyenoughitems; | ||
|
||
import net.minecraft.MethodsReturnNonnullByDefault; | ||
|
||
import javax.annotation.ParametersAreNonnullByDefault; |
14 changes: 14 additions & 0 deletions
14
fabric/src/main/java/li/cil/tis3d/common/item/fabric/ModCreativeTabsImpl.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 li.cil.tis3d.common.item.fabric; | ||
|
||
import li.cil.tis3d.common.item.Items; | ||
import net.fabricmc.loader.api.FabricLoader; | ||
import net.minecraft.world.item.Item; | ||
|
||
public final class ModCreativeTabsImpl { | ||
public static boolean isItemEnabled(final Item item) { | ||
if (FabricLoader.getInstance().isModLoaded("sodium") && item == Items.FACADE_MODULE.get()) { | ||
return false; | ||
} | ||
return true; | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
fabric/src/main/java/li/cil/tis3d/common/item/fabric/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,7 @@ | ||
@ParametersAreNonnullByDefault | ||
@MethodsReturnNonnullByDefault | ||
package li.cil.tis3d.common.item.fabric; | ||
|
||
import net.minecraft.MethodsReturnNonnullByDefault; | ||
|
||
import javax.annotation.ParametersAreNonnullByDefault; |
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
9 changes: 9 additions & 0 deletions
9
forge/src/main/java/li/cil/tis3d/common/item/forge/ModCreativeTabsImpl.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,9 @@ | ||
package li.cil.tis3d.common.item.forge; | ||
|
||
import net.minecraft.world.item.Item; | ||
|
||
public final class ModCreativeTabsImpl { | ||
public static boolean isItemEnabled(final Item item) { | ||
return true; | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
forge/src/main/java/li/cil/tis3d/common/item/forge/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,7 @@ | ||
@ParametersAreNonnullByDefault | ||
@MethodsReturnNonnullByDefault | ||
package li.cil.tis3d.common.item.forge; | ||
|
||
import net.minecraft.MethodsReturnNonnullByDefault; | ||
|
||
import javax.annotation.ParametersAreNonnullByDefault; |