mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2025-01-26 04:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Removed old block reference holder

Browse source
This commit is contained in:
simibubi 2020-05-22 20:08:02 +02:00
parent 785c79786d
commit fda3c4760c
6 changed files with 25 additions and 520 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

416
src/main/java/com/simibubi/create/AllBlocks.java
View file

@ -1,416 +0,0 @@
package com.simibubi.create;
import javax.annotation.Nonnull;
import org.apache.commons.lang3.ArrayUtils;
import com.google.common.collect.ImmutableList;
import com.simibubi.create.foundation.block.IHaveColorHandler;
import com.simibubi.create.foundation.block.ProperStairsBlock;
import com.simibubi.create.foundation.utility.Lang;
import com.simibubi.create.foundation.utility.data.ITaggable;
import com.simibubi.create.modules.Sections;
import com.tterrag.registrate.builders.BlockBuilder;
import com.tterrag.registrate.builders.ItemBuilder;
import com.tterrag.registrate.providers.ProviderType;
import com.tterrag.registrate.util.entry.BlockEntry;
import com.tterrag.registrate.util.entry.RegistryEntry;
import com.tterrag.registrate.util.nullness.NonNullBiConsumer;
import com.tterrag.registrate.util.nullness.NonNullBiFunction;
import com.tterrag.registrate.util.nullness.NonNullFunction;
import com.tterrag.registrate.util.nullness.NonNullSupplier;
import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.FenceBlock;
import net.minecraft.block.FenceGateBlock;
import net.minecraft.block.SlabBlock;
import net.minecraft.block.WallBlock;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.color.BlockColors;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.Tag;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
public enum AllBlocks implements NonNullSupplier<Block> {
_1_(Sections.KINETICS),
// SHAFT(() -> new ShaftBlock(Properties.from(Blocks.ANDESITE))),
// COGWHEEL(() -> new CogWheelBlock(false), (b, p) -> new CogwheelBlockItem(b, p, false)),
// LARGE_COGWHEEL(() -> new CogWheelBlock(true), (b, p) -> new CogwheelBlockItem(b, p, true)),
// ENCASED_SHAFT(EncasedShaftBlock::new),
// GEARBOX(GearboxBlock::new),
// CLUTCH(ClutchBlock::new),
// GEARSHIFT(GearshiftBlock::new),
// ENCASED_BELT(EncasedBeltBlock::new),
// ADJUSTABLE_PULLEY(AdjustablePulleyBlock::new),
// BELT(BeltBlock::new, ComesWith.NO_BLOCKITEM),
// CREATIVE_MOTOR(MotorBlock::new),
// WATER_WHEEL(WaterWheelBlock::new),
// ENCASED_FAN(EncasedFanBlock::new),
// NOZZLE(NozzleBlock::new),
// TURNTABLE(TurntableBlock::new),
// HAND_CRANK(HandCrankBlock::new),
// CUCKOO_CLOCK(() -> new CuckooClockBlock(false)),
// MYSTERIOUS_CUCKOO_CLOCK(() -> new CuckooClockBlock(true)),
// MILLSTONE(MillstoneBlock::new),
// CRUSHING_WHEEL(CrushingWheelBlock::new),
// CRUSHING_WHEEL_CONTROLLER(CrushingWheelControllerBlock::new, ComesWith.NO_BLOCKITEM),
// MECHANICAL_PRESS(MechanicalPressBlock::new, BasinOperatorBlockItem::new),
// MECHANICAL_MIXER(MechanicalMixerBlock::new, BasinOperatorBlockItem::new),
// BASIN(BasinBlock::new),
// SPEED_GAUGE(() -> new GaugeBlock(GaugeBlock.Type.SPEED)),
// STRESS_GAUGE(() -> new GaugeBlock(GaugeBlock.Type.STRESS)),
// MECHANICAL_PISTON(() -> new MechanicalPistonBlock(false)),
// STICKY_MECHANICAL_PISTON(() -> new MechanicalPistonBlock(true)),
// MECHANICAL_PISTON_HEAD(MechanicalPistonHeadBlock::new, ComesWith.NO_BLOCKITEM),
// PISTON_POLE(PistonPoleBlock::new),
// MECHANICAL_BEARING(MechanicalBearingBlock::new),
// CLOCKWORK_BEARING(ClockworkBearingBlock::new),
// ROPE_PULLEY(PulleyBlock::new),
// ROPE(PulleyBlock.RopeBlock::new, ComesWith.NO_BLOCKITEM),
// PULLEY_MAGNET(PulleyBlock.MagnetBlock::new, ComesWith.NO_BLOCKITEM),
// CART_ASSEMBLER(CartAssemblerBlock::new, ITaggable.create()
// .withVanillaTags(ITaggable.BLOCK, "rails")),
// MINECART_ANCHOR(MinecartAnchorBlock::new, ComesWith.NO_BLOCKITEM),
// TRANSLATION_CHASSIS(LinearChassisBlock::new),
// TRANSLATION_CHASSIS_SECONDARY(LinearChassisBlock::new),
// ROTATION_CHASSIS(RadialChassisBlock::new),
// DRILL(DrillBlock::new),
// SAW(SawBlock::new),
// DEPLOYER(DeployerBlock::new),
// PORTABLE_STORAGE_INTERFACE(PortableStorageInterfaceBlock::new),
// HARVESTER(HarvesterBlock::new),
// PLOUGH(PloughBlock::new),
// ANDESITE_CASING(() -> new CasingBlock(Properties.from(Blocks.ANDESITE))),
// COPPER_CASING(() -> new CasingBlock(Properties.from(Blocks.ANDESITE))),
// BRASS_CASING(() -> new CasingBlock(Properties.from(Blocks.ANDESITE))),
// MECHANICAL_CRAFTER(MechanicalCrafterBlock::new),
// SEQUENCED_GEARSHIFT(SequencedGearshiftBlock::new),
// FLYWHEEL(FlywheelBlock::new),
// FURNACE_ENGINE(FurnaceEngineBlock::new),
// ROTATION_SPEED_CONTROLLER(SpeedControllerBlock::new),
_2_(Sections.LOGISTICS),
// CONTACT(ContactBlock::new),
// REDSTONE_BRIDGE(RedstoneLinkBlock::new),
// STOCKSWITCH(StockpileSwitchBlock::new),
// FLEXCRATE(FlexcrateBlock::new),
// CREATIVE_CRATE(() -> new CreativeCrateBlock(Properties.from(Blocks.CHEST))),
// EXTRACTOR(ExtractorBlock::new),
// VERTICAL_EXTRACTOR(ExtractorBlock.Vertical::new, ComesWith.NO_BLOCKITEM),
// LINKED_EXTRACTOR(LinkedExtractorBlock::new),
// VERTICAL_LINKED_EXTRACTOR(LinkedExtractorBlock.Vertical::new, ComesWith.NO_BLOCKITEM),
// TRANSPOSER(TransposerBlock::new),
// VERTICAL_TRANSPOSER(TransposerBlock.Vertical::new, ComesWith.NO_BLOCKITEM),
// LINKED_TRANSPOSER(LinkedTransposerBlock::new),
// VERTICAL_LINKED_TRANSPOSER(LinkedTransposerBlock.Vertical::new, ComesWith.NO_BLOCKITEM),
// BELT_FUNNEL(FunnelBlock::new),
// VERTICAL_FUNNEL(FunnelBlock.Vertical::new, ComesWith.NO_BLOCKITEM),
// BELT_TUNNEL(BeltTunnelBlock::new),
// ENTITY_DETECTOR(BeltObserverBlock::new),
// ANALOG_LEVER(AnalogLeverBlock::new),
// PULSE_REPEATER(PulseRepeaterBlock::new),
// FLEXPEATER(FlexpeaterBlock::new),
// FLEXPULSEPEATER(FlexpeaterBlock::new),
// REDSTONE_LATCH(LatchBlock::new),
// TOGGLE_LATCH(ToggleLatchBlock::new),
_3_(Sections.MATERIALS),
// COPPER_ORE(() -> new OxidizingBlock(Properties.from(Blocks.IRON_ORE), 1), ITaggable.create()
// .withForgeTags("ores/copper")),
// ZINC_ORE(() -> new Block(Properties.from(Blocks.GOLD_ORE)
// .harvestLevel(2)
// .harvestTool(ToolType.PICKAXE)), ITaggable.create()
// .withForgeTags("ores/zinc")),
// COPPER_BLOCK(() -> new OxidizingBlock(Properties.from(Blocks.IRON_BLOCK), 1 / 32f), ITaggable.create()
// .withForgeTags("storage_blocks/copper")),
// COPPER_SHINGLES(() -> new OxidizingBlock(Properties.from(Blocks.IRON_BLOCK), 1 / 32f)),
// ZINC_BLOCK(() -> new Block(Properties.from(Blocks.IRON_BLOCK)), ITaggable.create()
// .withForgeTags("storage_blocks/zinc")),
// BRASS_BLOCK(() -> new Block(Properties.from(Blocks.IRON_BLOCK)), ITaggable.create()
// .withForgeTags("storage_blocks/brass")),
_4_(Sections.CURIOSITIES),
// SYMMETRY_PLANE(PlaneSymmetryBlock::new, ComesWith.NO_BLOCKITEM),
// SYMMETRY_CROSSPLANE(CrossPlaneSymmetryBlock::new, ComesWith.NO_BLOCKITEM),
// SYMMETRY_TRIPLEPLANE(TriplePlaneSymmetryBlock::new, ComesWith.NO_BLOCKITEM),
_5_(Sections.SCHEMATICS),
// SCHEMATICANNON(SchematicannonBlock::new),
// CREATIVE_CRATE(CreativeCrateBlock::new),
// SCHEMATIC_TABLE(SchematicTableBlock::new),
_6_(Sections.PALETTES),
// TILED_GLASS(() -> new GlassBlock(Properties.from(Blocks.GLASS)), ITaggable.create()
// .withVanillaTags(ITaggable.BLOCK, "impermeable")
// .withForgeTags("glass")),
// FRAMED_GLASS(() -> new CTGlassBlock(AllCTs.FRAMED_GLASS, false)),
// HORIZONTAL_FRAMED_GLASS(
// () -> new HorizontalCTGlassBlock(AllCTs.HORIZONTAL_FRAMED_GLASS, AllCTs.FRAMED_GLASS, false)),
// VERTICAL_FRAMED_GLASS(() -> new VerticalCTGlassBlock(AllCTs.VERTICAL_FRAMED_GLASS, false)),
//
// OAK_GLASS(() -> new CTWindowBlock(AllCTs.OAK_GLASS, false)),
// SPRUCE_GLASS(() -> new CTWindowBlock(AllCTs.SPRUCE_GLASS, false)),
// BIRCH_GLASS(() -> new CTWindowBlock(AllCTs.BIRCH_GLASS, true)),
// JUNGLE_GLASS(() -> new CTWindowBlock(AllCTs.JUNGLE_GLASS, false)),
// DARK_OAK_GLASS(() -> new CTWindowBlock(AllCTs.DARK_OAK_GLASS, false)),
// ACACIA_GLASS(() -> new CTWindowBlock(AllCTs.ACACIA_GLASS, false)),
// IRON_GLASS(() -> new CTWindowBlock(AllCTs.IRON_GLASS, false)),
//
// TILED_GLASS_PANE(() -> new GlassPaneBlock(Properties.from(Blocks.GLASS)), ITaggable.create()
// .withForgeTags("glass_panes")),
// FRAMED_GLASS_PANE(() -> new CTGlassPaneBlock(FRAMED_GLASS.get())),
// HORIZONTAL_FRAMED_GLASS_PANE(() -> new CTGlassPaneBlock(HORIZONTAL_FRAMED_GLASS.get())),
// VERTICAL_FRAMED_GLASS_PANE(() -> new CTGlassPaneBlock(VERTICAL_FRAMED_GLASS.get())),
// OAK_GLASS_PANE(() -> new CTGlassPaneBlock(OAK_GLASS.get())),
// SPRUCE_GLASS_PANE(() -> new CTGlassPaneBlock(SPRUCE_GLASS.get())),
// BIRCH_GLASS_PANE(() -> new CTGlassPaneBlock(BIRCH_GLASS.get())),
// JUNGLE_GLASS_PANE(() -> new CTGlassPaneBlock(JUNGLE_GLASS.get())),
// DARK_OAK_GLASS_PANE(() -> new CTGlassPaneBlock(DARK_OAK_GLASS.get())),
// ACACIA_GLASS_PANE(() -> new CTGlassPaneBlock(ACACIA_GLASS.get())),
// IRON_GLASS_PANE(() -> new CTGlassPaneBlock(IRON_GLASS.get())),
// GRANITE_BRICKS(() -> new Block(Properties.from(Blocks.GRANITE))),
// GRANITE_LAYERS(
// () -> new LayeredCTBlock(Properties.from(Blocks.GRANITE), AllCTs.GRANITE_LAYERS, AllCTs.POLISHED_GRANITE)),
// DIORITE_BRICKS(() -> new Block(Properties.from(Blocks.DIORITE))),
// DIORITE_LAYERS(
// () -> new LayeredCTBlock(Properties.from(Blocks.DIORITE), AllCTs.DIORITE_LAYERS, AllCTs.POLISHED_DIORITE)),
// ANDESITE_BRICKS(() -> new Block(Properties.from(Blocks.ANDESITE))),
// ANDESITE_LAYERS(() -> new LayeredCTBlock(Properties.from(Blocks.ANDESITE), AllCTs.ANDESITE_LAYERS,
// AllCTs.POLISHED_ANDESITE)),
//
// GABBRO(() -> new Block(Properties.from(Blocks.GRANITE)), ITaggable.create().withForgeTags("stone"),
// ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
// POLISHED_GABBRO(() -> new Block(Properties.from(GABBRO.get())), ITaggable.create().withForgeTags("stone")),
// GABBRO_BRICKS(() -> new Block(Properties.from(GABBRO.get())), ComesWith.STAIRS, ComesWith.WALL),
// PAVED_GABBRO_BRICKS(() -> new Block(Properties.from(GABBRO.get())), ComesWith.SLAB),
// INDENTED_GABBRO(() -> new Block(Properties.from(GABBRO.get())), ComesWith.SLAB),
// SLIGHTLY_MOSSY_GABBRO_BRICKS(() -> new Block(Properties.from(GABBRO.get()))),
// MOSSY_GABBRO_BRICKS(() -> new Block(Properties.from(GABBRO.get()))),
// GABBRO_LAYERS(
// () -> new LayeredCTBlock(Properties.from(GABBRO.get()), AllCTs.GABBRO_LAYERS, AllCTs.POLISHED_GABBRO)),
//
// DOLOMITE(() -> new Block(Properties.from(Blocks.QUARTZ_BLOCK)), ITaggable.create().withForgeTags("stone"),
// ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
// DOLOMITE_BRICKS(() -> new Block(Properties.from(DOLOMITE.get()))),
// POLISHED_DOLOMITE(() -> new Block(Properties.from(DOLOMITE.get())), ITaggable.create().withForgeTags("stone")),
// DOLOMITE_PILLAR(() -> new RotatedPillarBlock(Properties.from(DOLOMITE.get()))),
// DOLOMITE_LAYERS(() -> new LayeredCTBlock(Properties.from(DOLOMITE.get()), AllCTs.DOLOMITE_LAYERS,
// AllCTs.POLISHED_DOLOMITE)),
// LIMESAND(() -> new FallingBlock(Properties.from(Blocks.SAND))),
// LIMESTONE(() -> new Block(Properties.from(Blocks.SANDSTONE)), ITaggable.create().withForgeTags("stone"),
// ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
// LIMESTONE_BRICKS(() -> new Block(Properties.from(LIMESTONE.get())), ComesWith.STAIRS, ComesWith.SLAB,
// ComesWith.WALL),
// POLISHED_LIMESTONE(() -> new Block(Properties.from(LIMESTONE.get())), ITaggable.create().withForgeTags("stone"),
// ComesWith.SLAB),
// LIMESTONE_PILLAR(() -> new RotatedPillarBlock(Properties.from(LIMESTONE.get()))),
// LIMESTONE_LAYERS(() -> new LayeredCTBlock(Properties.from(LIMESTONE.get()), AllCTs.LIMESTONE_LAYERS,
// AllCTs.POLISHED_LIMESTONE)),
// WEATHERED_LIMESTONE(() -> new Block(Properties.from(Blocks.ANDESITE)), ITaggable.create().withForgeTags("stone"),
// ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
// WEATHERED_LIMESTONE_BRICKS(() -> new Block(Properties.from(WEATHERED_LIMESTONE.get())), ComesWith.STAIRS,
// ComesWith.SLAB, ComesWith.WALL),
// POLISHED_WEATHERED_LIMESTONE(() -> new Block(Properties.from(WEATHERED_LIMESTONE.get())),
// ITaggable.create().withForgeTags("stone"), ComesWith.SLAB),
// WEATHERED_LIMESTONE_PILLAR(() -> new RotatedPillarBlock(Properties.from(WEATHERED_LIMESTONE.get()))),
// WEATHERED_LIMESTONE_LAYERS(() -> new LayeredCTBlock(Properties.from(WEATHERED_LIMESTONE.get()),
// AllCTs.WEATHERED_LIMESTONE_LAYERS, AllCTs.POLISHED_WEATHERED_LIMESTONE)),
//
// NATURAL_SCORIA(ScoriaBlock::new),
// SCORIA(() -> new Block(Properties.from(Blocks.ANDESITE)), ITaggable.create().withForgeTags("stone"),
// ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
// POLISHED_SCORIA(() -> new Block(Properties.from(SCORIA.get())), ITaggable.create().withForgeTags("stone"),
// ComesWith.SLAB),
// SCORIA_BRICKS(() -> new Block(Properties.from(SCORIA.get()))),
// SCORIA_LAYERS(
// () -> new LayeredCTBlock(Properties.from(SCORIA.get()), AllCTs.SCORIA_LAYERS, AllCTs.POLISHED_SCORIA)),
// SCORIA_PILLAR(() -> new RotatedPillarBlock(Properties.from(SCORIA.get()))),
//
// DARK_SCORIA(() -> new Block(Properties.from(Blocks.ANDESITE))),
// POLISHED_DARK_SCORIA(() -> new Block(Properties.from(DARK_SCORIA.get()))),
// DARK_SCORIA_TILES(() -> new Block(Properties.from(DARK_SCORIA.get())), ComesWith.STAIRS, ComesWith.SLAB),
// DARK_SCORIA_BRICKS(() -> new Block(Properties.from(DARK_SCORIA.get())), ComesWith.STAIRS, ComesWith.SLAB,
// ComesWith.WALL),
;
private enum ComesWith {
NO_BLOCKITEM, WALL, FENCE, FENCE_GATE, SLAB, STAIRS
}
public final BlockEntry<? extends Block> block;
public final ImmutableList<BlockEntry<? extends Block>> alsoRegistered;
public final Sections section;
AllBlocks(Sections section) {
Create.registrate()
.startSection(section);
this.block = null;
this.alsoRegistered = ImmutableList.of();
this.section = Create.registrate()
.currentSection();
}
AllBlocks(NonNullSupplier<? extends Block> block, ComesWith... comesWith) {
this(block, ITaggable.create(), comesWith);
}
AllBlocks(NonNullSupplier<? extends Block> block,
NonNullBiFunction<? super Block, Item.Properties, ? extends BlockItem> customItemCreator,
ComesWith... comesWith) {
this(block, customItemCreator, ITaggable.create(), comesWith);
}
AllBlocks(NonNullSupplier<? extends Block> block, ITaggable<?> tags, ComesWith... comesWith) {
this(block, null, tags, comesWith);
}
AllBlocks(NonNullSupplier<? extends Block> block,
NonNullBiFunction<? super Block, Item.Properties, ? extends BlockItem> customItemCreator, ITaggable<?> tags,
ComesWith... comesWith) {
this.section = Create.registrate()
.currentSection();
this.block = Create.registrate()
.block(Lang.asId(name()), $ -> block.get()) // TODO take properties as input
.blockstate(NonNullBiConsumer.noop()) // TODO
.transform(b -> ArrayUtils.contains(comesWith, ComesWith.NO_BLOCKITEM) ? b.loot(NonNullBiConsumer.noop()) : b) // TODO
.setData(ProviderType.LANG, NonNullBiConsumer.noop()) // TODO
.transform(applyTags(tags))
.transform(b -> registerItemBlock(b, customItemCreator, comesWith))
.register();
ImmutableList.Builder<BlockEntry<? extends Block>> alsoRegistered = ImmutableList.builder();
for (ComesWith with : comesWith) {
if (with != ComesWith.NO_BLOCKITEM) {
alsoRegistered.add(makeRelatedBlock(this.block, with));
}
}
this.alsoRegistered = alsoRegistered.build();
}
public static void register() {}
public <B extends Block, P> BlockBuilder<B, P> registerItemBlock(BlockBuilder<B, P> builder,
NonNullBiFunction<? super B, Item.Properties, ? extends BlockItem> customItemCreator,
ComesWith... comesWith) {
if (ArrayUtils.contains(comesWith, ComesWith.NO_BLOCKITEM)) {
return builder;
}
return registerAsItem(builder, customItemCreator);
}
private <B extends Block, P> BlockBuilder<B, P> registerAsItem(BlockBuilder<B, P> builder,
NonNullBiFunction<? super B, Item.Properties, ? extends BlockItem> customItemCreator) {
ItemBuilder<? extends BlockItem, BlockBuilder<B, P>> itemBuilder =
customItemCreator == null ? builder.item() : builder.item(customItemCreator);
return itemBuilder.model(NonNullBiConsumer.noop()) // TODO
.properties($ -> AllItems.includeInItemGroup())
.build();
}
@Override
public @Nonnull Block get() {
return block == null ? Blocks.AIR : block.get();
}
public BlockState getDefault() {
return get().getDefaultState();
}
public boolean typeOf(BlockState state) {
return state.getBlock() == get();
}
private BlockEntry<? extends Block> makeRelatedBlock(RegistryEntry<? extends Block> block, ComesWith feature) {
NonNullFunction<Block.Properties, ? extends Block> creator;
final Tag<Block> tag;
switch (feature) {
case FENCE:
creator = FenceBlock::new;
tag = BlockTags.FENCES;
break;
case SLAB:
creator = SlabBlock::new;
tag = BlockTags.SLABS;
break;
case STAIRS:
creator = p -> new ProperStairsBlock(block.get());
tag = BlockTags.STAIRS;
break;
case WALL:
creator = WallBlock::new;
tag = BlockTags.WALLS;
break;
case FENCE_GATE:
creator = FenceGateBlock::new;
tag = null;
break;
default:
throw new IllegalArgumentException("Unknown ComesWith type?");
}
return Create.registrate()
.block(block.getId()
.getPath() + "_" + Lang.asId(feature.name()), creator)
.blockstate(NonNullBiConsumer.noop()) // TODO
.defaultLoot()
// .loot(NonNullBiConsumer.noop()) // TODO
.item()
.model(NonNullBiConsumer.noop()) // TODO
.build()
.transform(b -> tag != null ? b.tag(tag) : b)
.register();
}
private <B extends Block, P> NonNullUnaryOperator<BlockBuilder<B, P>> applyTags(ITaggable<?> tags) {
return b -> {
tags.getDataTags(ITaggable.BLOCK)
.forEach(b::tag);
return b;
};
}
//TODO better place for block color handlers + item colors
@OnlyIn(Dist.CLIENT)
public static void registerColorHandlers() {
BlockColors blockColors = Minecraft.getInstance()
.getBlockColors();
for (AllBlocks block : values())
if (block.get() instanceof IHaveColorHandler)
blockColors.register(((IHaveColorHandler) block.get()).getColorHandler(), block.get());
for (RegistryEntry<Block> registryEntry : Create.registrate()
.getAll(Block.class)) {
Block blockEntry = registryEntry.get();
if (blockEntry instanceof IHaveColorHandler) {
blockColors.register(((IHaveColorHandler) blockEntry).getColorHandler(), blockEntry);
}
}
}
}

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

@ -58,7 +58,6 @@ public class Create {
AllBlocksNew.register(); AllBlocksNew.register();
AllPaletteBlocks.register(); AllPaletteBlocks.register();
AllBlocks.register();
// modEventBus.addGenericListener(Block.class, AllBlocks::register); // modEventBus.addGenericListener(Block.class, AllBlocks::register);
modEventBus.addGenericListener(Item.class, AllItems::register); modEventBus.addGenericListener(Item.class, AllItems::register);
modEventBus.addGenericListener(IRecipeSerializer.class, AllRecipes::register); modEventBus.addGenericListener(IRecipeSerializer.class, AllRecipes::register);

18
src/main/java/com/simibubi/create/CreateClient.java
View file

@ -8,6 +8,7 @@ import java.util.function.Function;
import com.simibubi.create.foundation.behaviour.filtering.FilteringRenderer; import com.simibubi.create.foundation.behaviour.filtering.FilteringRenderer;
import com.simibubi.create.foundation.behaviour.linked.LinkRenderer; import com.simibubi.create.foundation.behaviour.linked.LinkRenderer;
import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueRenderer; import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueRenderer;
import com.simibubi.create.foundation.block.IHaveColorHandler;
import com.simibubi.create.foundation.block.render.CustomBlockModels; import com.simibubi.create.foundation.block.render.CustomBlockModels;
import com.simibubi.create.foundation.block.render.SpriteShifter; import com.simibubi.create.foundation.block.render.SpriteShifter;
import com.simibubi.create.foundation.item.IHaveCustomItemModel; import com.simibubi.create.foundation.item.IHaveCustomItemModel;
@ -19,10 +20,12 @@ import com.simibubi.create.modules.contraptions.components.contraptions.Contrapt
import com.simibubi.create.modules.schematics.ClientSchematicLoader; import com.simibubi.create.modules.schematics.ClientSchematicLoader;
import com.simibubi.create.modules.schematics.client.SchematicAndQuillHandler; import com.simibubi.create.modules.schematics.client.SchematicAndQuillHandler;
import com.simibubi.create.modules.schematics.client.SchematicHandler; import com.simibubi.create.modules.schematics.client.SchematicHandler;
import com.tterrag.registrate.util.entry.RegistryEntry;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BlockModelShapes; import net.minecraft.client.renderer.BlockModelShapes;
import net.minecraft.client.renderer.color.BlockColors;
import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.inventory.container.PlayerContainer; import net.minecraft.inventory.container.PlayerContainer;
@ -72,8 +75,8 @@ public class CreateClient {
AllContainers.registerScreenFactories(); AllContainers.registerScreenFactories();
AllTileEntities.registerRenderers(); AllTileEntities.registerRenderers();
AllItems.registerColorHandlers(); AllItems.registerColorHandlers();
AllBlocks.registerColorHandlers();
AllEntities.registerRenderers(); AllEntities.registerRenderers();
registerColorHandlers();
IResourceManager resourceManager = Minecraft.getInstance() IResourceManager resourceManager = Minecraft.getInstance()
.getResourceManager(); .getResourceManager();
@ -167,6 +170,19 @@ public class CreateClient {
swapModels(modelRegistry, location, factory); swapModels(modelRegistry, location, factory);
}); });
} }
@OnlyIn(Dist.CLIENT)
protected static void registerColorHandlers() {
BlockColors blockColors = Minecraft.getInstance()
.getBlockColors();
for (RegistryEntry<Block> registryEntry : Create.registrate()
.getAll(Block.class)) {
Block blockEntry = registryEntry.get();
if (blockEntry instanceof IHaveColorHandler) {
blockColors.register(((IHaveColorHandler) blockEntry).getColorHandler(), blockEntry);
}
}
}
public static CustomBlockModels getCustomBlockModels() { public static CustomBlockModels getCustomBlockModels() {
if (customBlockModels == null) if (customBlockModels == null)

51
src/main/java/com/simibubi/create/config/CStress.java
View file

@ -3,14 +3,8 @@ package com.simibubi.create.config;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.foundation.utility.Lang;
import com.simibubi.create.modules.contraptions.base.KineticBlock;
import com.simibubi.create.modules.contraptions.components.flywheel.engine.EngineBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.ForgeConfigSpec;
import net.minecraftforge.common.ForgeConfigSpec.Builder; import net.minecraftforge.common.ForgeConfigSpec.Builder;
import net.minecraftforge.common.ForgeConfigSpec.ConfigValue; import net.minecraftforge.common.ForgeConfigSpec.ConfigValue;
@ -23,25 +17,12 @@ public class CStress extends ConfigBase {
protected void registerAll(Builder builder) { protected void registerAll(Builder builder) {
builder.comment("", Comments.su, Comments.impact) builder.comment("", Comments.su, Comments.impact)
.push("impact"); .push("impact");
StressConfigDefaults.registeredDefaultImpacts
// old .forEach((r, i) -> getImpacts().put(r, builder.define(r.getPath(), i)));
for (AllBlocks block : AllBlocks.values())
if (block.get() instanceof KineticBlock)
initStressEntry(block, builder);
//
StressConfigDefaults.registeredDefaultImpacts.forEach((r, i) -> getImpacts().put(r, builder.define(r.getPath(), i)));
builder.pop(); builder.pop();
builder.comment("", Comments.su, Comments.capacity) builder.comment("", Comments.su, Comments.capacity)
.push("capacity"); .push("capacity");
// old
for (AllBlocks block : AllBlocks.values())
if (block.get() instanceof KineticBlock || block.get() instanceof EngineBlock)
initStressCapacityEntry(block, builder);
//
StressConfigDefaults.registeredDefaultCapacities StressConfigDefaults.registeredDefaultCapacities
.forEach((r, i) -> getCapacities().put(r, builder.define(r.getPath(), i))); .forEach((r, i) -> getCapacities().put(r, builder.define(r.getPath(), i)));
builder.pop(); builder.pop();
@ -49,30 +30,14 @@ public class CStress extends ConfigBase {
public double getImpactOf(Block block) { public double getImpactOf(Block block) {
ResourceLocation key = block.getRegistryName(); ResourceLocation key = block.getRegistryName();
return getImpacts().containsKey(key) ? getImpacts().get(key).get() : 0; return getImpacts().containsKey(key) ? getImpacts().get(key)
} .get() : 0;
public double getCapacityOf(Block block) {
ResourceLocation key = block.getRegistryName();
return getCapacities().containsKey(key) ? getCapacities().get(key).get() : 0;
}
@Deprecated
private void initStressEntry(AllBlocks block, final ForgeConfigSpec.Builder builder) {
String name = Lang.asId(block.name());
double defaultStressImpact = StressConfigDefaults.getDefaultStressImpact(block);
getImpacts().put(block.get()
.getRegistryName(), builder.define(name, defaultStressImpact));
} }
@Deprecated public double getCapacityOf(Block block) {
private void initStressCapacityEntry(AllBlocks block, final ForgeConfigSpec.Builder builder) { ResourceLocation key = block.getRegistryName();
double defaultStressCapacity = StressConfigDefaults.getDefaultStressCapacity(block); return getCapacities().containsKey(key) ? getCapacities().get(key)
if (defaultStressCapacity == -1) .get() : 0;
return;
String name = Lang.asId(block.name());
getCapacities().put(block.get()
.getRegistryName(), builder.define(name, defaultStressCapacity));
} }
@Override @Override

55
src/main/java/com/simibubi/create/config/StressConfigDefaults.java
View file

@ -3,7 +3,6 @@ package com.simibubi.create.config;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.Create; import com.simibubi.create.Create;
import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.builders.BlockBuilder;
import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
@ -37,58 +36,4 @@ public class StressConfigDefaults {
}; };
} }
@Deprecated
public static double getDefaultStressCapacity(AllBlocks block) {
switch (block) {
// case CREATIVE_MOTOR:
// return 2048;
// case FURNACE_ENGINE:
// return 1024;
// case MECHANICAL_BEARING:
// return 512;
// case ENCASED_FAN:
// case HAND_CRANK:
// return 32;
// case WATER_WHEEL:
// return 8;
default:
return -1;
}
}
@Deprecated
public static double getDefaultStressImpact(AllBlocks block) {
switch (block) {
// case CRUSHING_WHEEL:
// case MECHANICAL_PRESS:
// return 8;
// case DRILL:
// case SAW:
// case DEPLOYER:
// case MECHANICAL_MIXER:
// case MILLSTONE:
// return 4;
// case MECHANICAL_CRAFTER:
// case TURNTABLE:
// case MECHANICAL_PISTON:
// case MECHANICAL_BEARING:
// case CLOCKWORK_BEARING:
// case ROPE_PULLEY:
// case STICKY_MECHANICAL_PISTON:
// return 2;
// case BELT:
// case ENCASED_FAN:
// case CUCKOO_CLOCK:
// return 1;
default:
return 0;
}
}
} }

4
src/main/java/com/simibubi/create/modules/Sections.java
View file

@ -1,6 +1,5 @@
package com.simibubi.create.modules; package com.simibubi.create.modules;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
import com.simibubi.create.Create; import com.simibubi.create.Create;
import com.simibubi.create.foundation.item.ItemDescription.Palette; import com.simibubi.create.foundation.item.ItemDescription.Palette;
@ -60,9 +59,6 @@ public enum Sections {
} }
static Sections ofBlock(Block block) { static Sections ofBlock(Block block) {
for (AllBlocks allBlocks : AllBlocks.values())
if (allBlocks.get() == block)
return allBlocks.section;
return Create.registrate().getSection(block); return Create.registrate().getSection(block);
} }