tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Well oiled machine

Browse source 
- Fixed Display links no longer accepting any blocks as valid source
- Temporarily merged creative tabs until a fix in registrate
This commit is contained in:
simibubi 2022-07-12 03:00:39 +02:00
parent 9e10a2486c
commit eebbe14a73
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/simibubi/create/Create.java
View file

@ -20,7 +20,6 @@ import com.simibubi.create.content.logistics.block.display.AllDisplayBehaviours;
import com.simibubi.create.content.logistics.block.mechanicalArm.AllArmInteractionPointTypes;
import com.simibubi.create.content.logistics.trains.GlobalRailwayManager;
import com.simibubi.create.content.palettes.AllPaletteBlocks;
import com.simibubi.create.content.palettes.PalettesItemGroup;
import com.simibubi.create.content.schematics.SchematicProcessor;
import com.simibubi.create.content.schematics.ServerSchematicLoader;
import com.simibubi.create.content.schematics.filtering.SchematicInstances;
@ -73,7 +72,7 @@ public class Create {
.create();
public static final CreativeModeTab BASE_CREATIVE_TAB = new CreateItemGroup();
public static final CreativeModeTab PALETTES_CREATIVE_TAB = new PalettesItemGroup();
// public static final CreativeModeTab PALETTES_CREATIVE_TAB = new PalettesItemGroup();
public static final ServerSchematicLoader SCHEMATIC_RECEIVER = new ServerSchematicLoader();
public static final RedstoneLinkNetworkHandler REDSTONE_LINK_NETWORK_HANDLER = new RedstoneLinkNetworkHandler();

4
src/main/java/com/simibubi/create/content/logistics/block/display/AllDisplayBehaviours.java
View file

@ -108,7 +108,7 @@ public class AllDisplayBehaviours {
//
public static List<DisplaySource> sourcesOf(Block block) {
return SOURCES_BY_BLOCK.getOrDefault(block.getRegistryName(), Collections.emptyList());
return SOURCES_BY_BLOCK.getOrDefault(block.delegate, Collections.emptyList());
}
public static List<DisplaySource> sourcesOf(BlockState state) {
@ -116,7 +116,7 @@ public class AllDisplayBehaviours {
}
public static List<DisplaySource> sourcesOf(BlockEntityType<?> tileEntityType) {
return SOURCES_BY_TILE.getOrDefault(tileEntityType, Collections.emptyList());
return SOURCES_BY_TILE.getOrDefault(tileEntityType.delegate, Collections.emptyList());
}
public static List<DisplaySource> sourcesOf(BlockEntity tileEntity) {

2
src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java
View file

@ -31,7 +31,7 @@ import net.minecraftforge.common.Tags;
public class AllPaletteBlocks {
private static final CreateRegistrate REGISTRATE = Create.registrate()
.creativeModeTab(() -> Create.PALETTES_CREATIVE_TAB)
.creativeModeTab(() -> Create.BASE_CREATIVE_TAB) // Change back when creative tabs in Registrate are fixed
.startSection(AllSections.PALETTES);
// Windows and Glass