mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-11-14 22:44:07 +01:00
068b7c0c37
- Chassis blocks now visualize their range blocks when selected with a wrench - Fixed Bearings and other actors selecting moved blocks as if they were being pushed in a direction - Fixed Radial chassis not connecting to each other consistently - Added Powered Latch and Powered Toggle Latch (Redstone circuits) - Window-logging now works with modded glass panes, that do not have the tag on their item, but the block only - Chassis can now be edited in bulk by holding down Ctrl - Chained block movement no longer marks blocks for movement if they are in front of a block breaker - Making a chassis sticky no longer uses up slime balls - Chassis can now be made sticky on all sides if a sticky side is clicked once again - Fixed linear chassis picking up blocks attached to other chassis' lines, even if not sticky - Fixed horizontal rotation and mirroring of chassis blocks and their sticky sides - Structures rotated in a Contraption now try to rotate themselves and their blocks toward the nearest axis-alinged direction when disassembled - Fans no longer shoot testing rays if the target block shape is completely filled or empty (trivial case) - Fans can now blow through iron bars again - Fixed crash when adjusting motors - Fixed missing icons in blockzapper & schematicannon interface - Reworked the drill model - Added more tags to #windowable - Leather horse armor no longer crushes into iron nuggets
168 lines
6.6 KiB
Java
168 lines
6.6 KiB
Java
package com.simibubi.create;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.function.Function;
|
|
|
|
import com.simibubi.create.foundation.block.IHaveCustomBlockModel;
|
|
import com.simibubi.create.foundation.block.connected.IHaveConnectedTextures;
|
|
import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
|
|
import com.simibubi.create.foundation.item.IHaveCustomItemModel;
|
|
import com.simibubi.create.foundation.utility.SuperByteBufferCache;
|
|
import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer;
|
|
import com.simibubi.create.modules.contraptions.components.contraptions.ChassisRangeDisplay;
|
|
import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionRenderer;
|
|
import com.simibubi.create.modules.schematics.ClientSchematicLoader;
|
|
import com.simibubi.create.modules.schematics.client.SchematicAndQuillHandler;
|
|
import com.simibubi.create.modules.schematics.client.SchematicHandler;
|
|
import com.simibubi.create.modules.schematics.client.SchematicHologram;
|
|
|
|
import net.minecraft.block.Block;
|
|
import net.minecraft.client.Minecraft;
|
|
import net.minecraft.client.renderer.BlockModelShapes;
|
|
import net.minecraft.client.renderer.model.IBakedModel;
|
|
import net.minecraft.client.renderer.model.ModelResourceLocation;
|
|
import net.minecraft.resources.IReloadableResourceManager;
|
|
import net.minecraft.resources.IResourceManager;
|
|
import net.minecraft.util.ResourceLocation;
|
|
import net.minecraftforge.api.distmarker.Dist;
|
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
|
import net.minecraftforge.client.event.ModelBakeEvent;
|
|
import net.minecraftforge.client.event.ModelRegistryEvent;
|
|
import net.minecraftforge.client.event.TextureStitchEvent;
|
|
import net.minecraftforge.client.model.ModelLoader;
|
|
import net.minecraftforge.eventbus.api.IEventBus;
|
|
import net.minecraftforge.fml.DistExecutor;
|
|
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
|
|
|
|
public class CreateClient {
|
|
|
|
public static ClientSchematicLoader schematicSender;
|
|
public static SchematicHandler schematicHandler;
|
|
public static SchematicHologram schematicHologram;
|
|
public static SchematicAndQuillHandler schematicAndQuillHandler;
|
|
public static SuperByteBufferCache bufferCache;
|
|
public static int renderTicks;
|
|
|
|
public static void addListeners(IEventBus modEventBus) {
|
|
DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> {
|
|
modEventBus.addListener(CreateClient::clientInit);
|
|
modEventBus.addListener(CreateClient::onModelBake);
|
|
modEventBus.addListener(CreateClient::onModelRegistry);
|
|
modEventBus.addListener(CreateClient::onTextureStitch);
|
|
modEventBus.addListener(AllParticles::registerFactories);
|
|
});
|
|
}
|
|
|
|
public static void clientInit(FMLClientSetupEvent event) {
|
|
schematicSender = new ClientSchematicLoader();
|
|
schematicHandler = new SchematicHandler();
|
|
schematicHologram = new SchematicHologram();
|
|
schematicAndQuillHandler = new SchematicAndQuillHandler();
|
|
|
|
bufferCache = new SuperByteBufferCache();
|
|
bufferCache.registerCompartment(KineticTileEntityRenderer.KINETIC_TILE);
|
|
bufferCache.registerCompartment(ContraptionRenderer.CONTRAPTION, 20);
|
|
|
|
AllKeys.register();
|
|
AllContainers.registerScreenFactories();
|
|
AllTileEntities.registerRenderers();
|
|
AllItems.registerColorHandlers();
|
|
AllBlocks.registerColorHandlers();
|
|
AllEntities.registerRenderers();
|
|
|
|
IResourceManager resourceManager = Minecraft.getInstance().getResourceManager();
|
|
if (resourceManager instanceof IReloadableResourceManager)
|
|
((IReloadableResourceManager) resourceManager).addReloadListener(new ResourceReloadHandler());
|
|
}
|
|
|
|
public static void gameTick() {
|
|
schematicSender.tick();
|
|
schematicAndQuillHandler.tick();
|
|
schematicHandler.tick();
|
|
schematicHologram.tick();
|
|
ChassisRangeDisplay.clientTick();
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
public static void onTextureStitch(TextureStitchEvent.Pre event) {
|
|
if (!event.getMap().getBasePath().equals("textures"))
|
|
return;
|
|
|
|
event.addSprite(new ResourceLocation(Create.ID, "block/belt_animated"));
|
|
for (AllBlocks allBlocks : AllBlocks.values()) {
|
|
Block block = allBlocks.get();
|
|
if (block instanceof IHaveConnectedTextures)
|
|
for (SpriteShiftEntry spriteShiftEntry : ((IHaveConnectedTextures) block).getBehaviour()
|
|
.getAllCTShifts())
|
|
event.addSprite(spriteShiftEntry.getTargetResourceLocation());
|
|
}
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
public static void onModelBake(ModelBakeEvent event) {
|
|
Map<ResourceLocation, IBakedModel> modelRegistry = event.getModelRegistry();
|
|
AllBlockPartials.onModelBake(event);
|
|
|
|
for (AllBlocks allBlocks : AllBlocks.values()) {
|
|
Block block = allBlocks.get();
|
|
if (block instanceof IHaveCustomBlockModel)
|
|
swapModels(modelRegistry, getAllBlockStateModelLocations(allBlocks),
|
|
((IHaveCustomBlockModel) block)::createModel);
|
|
}
|
|
|
|
for (AllItems item : AllItems.values()) {
|
|
if (item.get() instanceof IHaveCustomItemModel)
|
|
swapModels(modelRegistry, getItemModelLocation(item),
|
|
m -> ((IHaveCustomItemModel) item.get()).createModel(m).loadPartials(event));
|
|
}
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
public static void onModelRegistry(ModelRegistryEvent event) {
|
|
AllBlockPartials.onModelRegistry(event);
|
|
|
|
// Register submodels for custom rendered item models
|
|
for (AllItems item : AllItems.values()) {
|
|
if (item.get() instanceof IHaveCustomItemModel)
|
|
((IHaveCustomItemModel) item.get()).createModel(null).getModelLocations()
|
|
.forEach(ModelLoader::addSpecialModel);
|
|
}
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
protected static ModelResourceLocation getItemModelLocation(AllItems item) {
|
|
return new ModelResourceLocation(item.get().getRegistryName(), "inventory");
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
protected static List<ModelResourceLocation> getAllBlockStateModelLocations(AllBlocks block) {
|
|
List<ModelResourceLocation> models = new ArrayList<>();
|
|
block.get().getStateContainer().getValidStates().forEach(state -> {
|
|
models.add(getBlockModelLocation(block, BlockModelShapes.getPropertyMapString(state.getValues())));
|
|
});
|
|
return models;
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
protected static ModelResourceLocation getBlockModelLocation(AllBlocks block, String suffix) {
|
|
return new ModelResourceLocation(block.block.getRegistryName(), suffix);
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
protected static <T extends IBakedModel> void swapModels(Map<ResourceLocation, IBakedModel> modelRegistry,
|
|
ModelResourceLocation location, Function<IBakedModel, T> factory) {
|
|
modelRegistry.put(location, factory.apply(modelRegistry.get(location)));
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
protected static <T extends IBakedModel> void swapModels(Map<ResourceLocation, IBakedModel> modelRegistry,
|
|
List<ModelResourceLocation> locations, Function<IBakedModel, T> factory) {
|
|
locations.forEach(location -> {
|
|
swapModels(modelRegistry, location, factory);
|
|
});
|
|
}
|
|
|
|
}
|