mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-10 12:33:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup and get ready to merge

Browse Source
This commit is contained in:
JozsefA 2021-06-22 21:09:32 -07:00
parent aeff644cc3
commit dd63c6c4e3
8 changed files with 8 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -3,7 +3,7 @@
<a href="https://www.patreon.com/simibubi"><img src="https://img.shields.io/badge/Supporters-80-ff5733" alt="Patreon"></a>
<a href="https://www.curseforge.com/minecraft/mc-mods/create/files"><img src="https://img.shields.io/badge/Available%20for-MC%201.14,%201.15,%201.16-c70039" alt="Supported Versions"></a>
<a href="https://github.com/Creators-of-Create/Create/blob/master/LICENSE"><img src="https://img.shields.io/github/license/Creators-of-Create/Create?style=flat&color=900c3f" alt="License"></a>
<a href="https://discord.gg/hmaD7Se"><img src="https://img.shields.io/discord/620934202875183104?color=844685&label=Feedback%20%26%20Help&style=flat" alt="Discord"></a>
<a href="https://discord.gg/hmaD7Se"><img src="https://img.shields.io/discord/620934202875183104?color=5865f2&label=Feedback%20%26%20Help&style=flat" alt="Discord"></a>
<a href="https://www.curseforge.com/minecraft/mc-mods/create"><img src="http://cf.way2muchnoise.eu/short_create.svg" alt="Curseforge Downloads"></a><br><br>
</h1>

6
build.gradle
View File

@ -134,7 +134,11 @@ dependencies {
// at runtime, use the full JEI jar
runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:${jei_version}")
compile fg.deobf("curse.maven:flywheel-486392:3357100") // cursemaven for now
if (findProject(':Flywheel') != null) {
compile project(':Flywheel') // jozu: I use a gradle workspace with both projects
} else {
compile fg.deobf("com.jozufozu.flywheel:Flywheel:1.16-0.0.2.7")
}
// implementation fg.deobf("curse.maven:druidcraft-340991:3101903")

7
src/main/java/com/simibubi/create/AllBlocks.java
View File

@ -1301,13 +1301,6 @@ public class AllBlocks {
})
.register();
public static final BlockEntry<ChromaticProjectorBlock> CHROMATIC_PROJECTOR =
REGISTRATE.block("chromatic_projector", ChromaticProjectorBlock::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.item()
.build()
.register();
// Materials
static {

6
src/main/java/com/simibubi/create/AllTileEntities.java
View File

@ -665,11 +665,5 @@ public class AllTileEntities {
.renderer(() -> CopperBacktankRenderer::new)
.register();
public static final TileEntityEntry<ChromaticProjectorTileEntity> CHROMATIC_PROJECTOR =Create.registrate()
.tileEntity("chromatic_projector", ChromaticProjectorTileEntity::new)
.instance(() -> ChromaticProjectorInstance::new)
.validBlocks(AllBlocks.CHROMATIC_PROJECTOR)
.register();
public static void register() {}
}

2
src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorBlock.java
View File

@ -54,7 +54,7 @@ public class ChromaticProjectorBlock extends Block implements ITE<ChromaticProje
@Nullable
@Override
public TileEntity createTileEntity(BlockState state, IBlockReader world) {
return AllTileEntities.CHROMATIC_PROJECTOR.create();
return null;//AllTileEntities.CHROMATIC_PROJECTOR.create();
}
@Override

2
src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorScreen.java
View File

@ -23,7 +23,7 @@ import net.minecraft.util.text.StringTextComponent;
public class ChromaticProjectorScreen extends AbstractSimiScreen {
private final ItemStack renderedItem = AllBlocks.CHROMATIC_PROJECTOR.asStack();
private final ItemStack renderedItem = ItemStack.EMPTY;//AllBlocks.CHROMATIC_PROJECTOR.asStack();
private final AllGuiTextures background = AllGuiTextures.PROJECTOR;
private final int guiBottom = guiTop + background.height;
private final int guiRight = guiLeft + background.width;

35
src/main/java/com/simibubi/create/foundation/mixin/ChromaticProjectorHooksMixin.java
View File

@ -1,35 +0,0 @@
package com.simibubi.create.foundation.mixin;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import com.simibubi.create.foundation.render.effects.EffectsHandler;
import net.minecraft.client.renderer.ActiveRenderInfo;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.util.math.vector.Matrix4f;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
@Mixin(WorldRenderer.class)
public class ChromaticProjectorHooksMixin {
@Inject(method = "render", at = @At(value = "INVOKE", ordinal = 1, target = "Lnet/minecraft/client/shader/ShaderGroup;render(F)V"))
private void disableTransparencyShaderDepth(MatrixStack p_228426_1_, float p_228426_2_, long p_228426_3_, boolean p_228426_5_, ActiveRenderInfo p_228426_6_, GameRenderer p_228426_7_, LightTexture p_228426_8_, Matrix4f p_228426_9_, CallbackInfo ci) {
GlStateManager.depthMask(false);
}
@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/WorldRenderer;renderChunkDebugInfo(Lnet/minecraft/client/renderer/ActiveRenderInfo;)V"))
private void applyFilters(MatrixStack stack, float p_228426_2_, long p_228426_3_, boolean p_228426_5_, ActiveRenderInfo p_228426_6_, GameRenderer p_228426_7_, LightTexture p_228426_8_, Matrix4f p_228426_9_, CallbackInfo ci) {
EffectsHandler instance = EffectsHandler.getInstance();
if (instance != null)
instance.render(stack.peek().getModel());
}
}

1
src/main/resources/create.mixins.json
View File

@ -8,7 +8,6 @@
],
"client": [
"BreakProgressMixin",
"ChromaticProjectorHooksMixin",
"EntityContraptionInteractionMixin",
"FixNormalScalingMixin",
"HeavyBootsOnPlayerMixin",