This commit is contained in:
modmuss50 2019-09-21 13:01:38 +01:00
parent 2d8961589d
commit 3fe62e2c77
6 changed files with 19 additions and 26 deletions

View file

@ -68,21 +68,20 @@ license {
group = 'TechReborn'
dependencies {
minecraft "com.mojang:minecraft:19w37a"
mappings "net.fabricmc:yarn:19w37a+build.9"
modCompile "net.fabricmc:fabric-loader:0.6.0+build.163"
minecraft "com.mojang:minecraft:19w38b"
mappings "net.fabricmc:yarn:19w38b+build.4"
modCompile "net.fabricmc:fabric-loader:0.6.2+build.166"
//Fabric api
modCompile "net.fabricmc.fabric-api:fabric-api:0.3.2+build.227-1.15"
modCompile "net.fabricmc.fabric-api:fabric-api:0.3.2+build.232-1.15"
modCompile "io.github.prospector:modmenu:1.7.9-unstable.19w34a+build.1"
modCompile "io.github.prospector.silk:SilkAPI:1.2.4-43"
modCompile ("me.shedaniel:RoughlyEnoughItems:3.1-pre+build.4") {
modCompileOnly "io.github.prospector:modmenu:1.7.9-unstable.19w34a+build.1"
modCompileOnly ("me.shedaniel:RoughlyEnoughItems:3.1-pre+build.4") {
//Thanks for moving the project breaking gradle...
exclude group: 'io.github.prospector.modmenu', module: 'ModMenu'
}
def rcVersion = 'RebornCore:RebornCore-1.15:+'
def rcVersion = 'RebornCore:RebornCore-1.15:4.0.16+build.10'
modCompile (rcVersion) {
transitive = false
@ -90,7 +89,7 @@ dependencies {
compile 'org.checkerframework:checker-qual:2.10.0'
compile 'org.spongepowered:configurate-hocon:3.6'
compile 'org.checkerframework:checker-qual:2.10.0'
compileOnly "com.google.code.findbugs:jsr305:+"

View file

@ -25,7 +25,9 @@
package techreborn;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry;
import net.minecraft.block.BlockRenderLayer;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.ModelBakeSettings;
import net.minecraft.client.render.model.ModelLoader;
@ -47,9 +49,11 @@ import techreborn.items.ItemDynamicCell;
import techreborn.items.ItemFrequencyTransmitter;
import techreborn.utils.StackWIPHandler;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Function;
public class TechRebornClient implements ClientModInitializer {
@ -117,6 +121,12 @@ public class TechRebornClient implements ClientModInitializer {
GuiBase.fluidCellProvider = ItemDynamicCell::getCellWithFluid;
StackInfoHUD.registerElement(new ItemFrequencyTransmitter.StackInfoFreqTransmitter());
Arrays.stream(TRContent.Cables.values()).forEach(cable -> BlockRenderLayerMap.INSTANCE.putBlock(cable.block, BlockRenderLayer.field_9174));
BlockRenderLayerMap.INSTANCE.putBlock(TRContent.Machine.LAMP_INCANDESCENT.block, BlockRenderLayer.field_9174);
BlockRenderLayerMap.INSTANCE.putBlock(TRContent.Machine.LAMP_LED.block, BlockRenderLayer.field_9174);
BlockRenderLayerMap.INSTANCE.putBlock(TRContent.Machine.ALARM.block, BlockRenderLayer.field_9174);
}

View file

@ -153,11 +153,6 @@ public class BlockAlarm extends BaseBlockEntityProvider {
return BlockRenderType.MODEL;
}
@Override
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT;
}
@Override
public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, EntityContext entityContext) {

View file

@ -166,11 +166,6 @@ public class BlockCable extends BlockWithEntity {
return ourState.with(getProperty(ourFacing), value);
}
@Override
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT;
}
@Override
public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, EntityContext entityContext) {
if (type != null) {

View file

@ -130,12 +130,6 @@ public class BlockLamp extends BaseBlockEntityProvider {
public int getLuminance(BlockState state) {
return state.get(ACTIVE) ? brightness : 0;
}
@Override
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT;
}
@Override
public BlockRenderType getRenderType(BlockState state) {

View file

@ -85,7 +85,7 @@ public class GuiManual extends Screen {
@Override
public void render(int mouseX, int mouseY, float partialTicks) {
renderBackground();
minecraft.getTextureManager().bindTexture(GuiManual.texture);
minecraft.getTextureManager().method_22813(GuiManual.texture);
int centerX = (width / 2) - guiWidth / 2;
int centerY = (height / 2) - guiHeight / 2;
blit(centerX, centerY, 0, 0, guiWidth, guiHeight);