maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

19w34a

Browse source
This commit is contained in:
modmuss50 2019-08-27 23:58:42 +01:00
parent 09b59d6c87
commit 4a5fe76323
13 changed files with 62 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.conf
View file

@ -1,5 +1,5 @@
minecraftVersion="1.14.4,Fabric"
name="TechReborn-1.14.4"
minecraftVersion="1.15-Snapshot,Fabric"
name="TechReborn-1.15"
curseID="233564"
github-repo="TechReborn/TechReborn"
child-project="reborncore"

24
build.gradle
View file

@ -70,29 +70,27 @@ license {
group = 'TechReborn'
dependencies {
minecraft "com.mojang:minecraft:1.14.4"
mappings "net.fabricmc:yarn:1.14.4+build.2"
modCompile "net.fabricmc:fabric-loader:0.4.8+build.159"
minecraft "com.mojang:minecraft:19w34a"
mappings "net.fabricmc:yarn:19w34a+build.12"
modCompile "net.fabricmc:fabric-loader:0.6.0+build.163"
//Fabric api
modCompile "net.fabricmc.fabric-api:fabric-api:0.3.1+build.208"
modCompile "net.fabricmc.fabric-api:fabric-api:0.3.2+build.212-1.15"
modCompile "io.github.prospector:modmenu:1.7.7+build.116"
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.0-pre+build.1") {
modCompile ("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.14.4:+'
def rcVersion = 'RebornCore:RebornCore-1.15:+'
//Hopefully this doesnt break too much eek
if(Boolean.parseBoolean(System.getProperty("idea.sync.active", "false"))){
compile rcVersion
} else {
modCompile (rcVersion)
modCompile (rcVersion) {
transitive = false
}
compile 'org.spongepowered:configurate-hocon:3.6'
compile 'org.checkerframework:checker-qual:2.10.0'
compileOnly "com.google.code.findbugs:jsr305:+"

2
settings.gradle
View file

@ -1 +1 @@
rootProject.name = "TechReborn-1.14.4"
rootProject.name = "TechReborn-1.15"

8
src/main/java/techreborn/client/gui/GuiAESU.java
View file

@ -24,7 +24,7 @@
package techreborn.client.gui;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.containerBuilder.builder.BuiltContainer;
@ -62,12 +62,12 @@ public class GuiAESU extends GuiBase<BuiltContainer> {
final Layer layer = Layer.FOREGROUND;
if(GuiBase.slotConfigType == SlotConfigType.NONE){
GlStateManager.pushMatrix();
GlStateManager.scaled(0.6, 0.6, 1);
RenderSystem.pushMatrix();
RenderSystem.scaled(0.6, 0.6, 1);
drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getEnergy()) + "/"
+ PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getMaxPower()) + " "
+ PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer);
GlStateManager.popMatrix();
RenderSystem.popMatrix();
}
builder.drawMultiEnergyBar(this, 81, 28, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxPower(), mouseX, mouseY, 0, layer);

8
src/main/java/techreborn/client/gui/GuiBatbox.java
View file

@ -24,7 +24,7 @@
package techreborn.client.gui;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.gui.builder.GuiBase;
@ -55,10 +55,10 @@ public class GuiBatbox extends GuiBase<BuiltContainer> {
final Layer layer = Layer.FOREGROUND;
if(GuiBase.slotConfigType == SlotConfigType.NONE){
GlStateManager.pushMatrix();
GlStateManager.scaled(0.6, 0.6, 5);
RenderSystem.pushMatrix();
RenderSystem.scaled(0.6, 0.6, 5);
drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer);
GlStateManager.popMatrix();
RenderSystem.popMatrix();
}
builder.drawMultiEnergyBar(this, 81, 28, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxPower(), mouseX, mouseY, 0, layer);

4
src/main/java/techreborn/client/gui/GuiBlastFurnace.java
View file

@ -24,7 +24,7 @@
package techreborn.client.gui;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.math.BlockPos;
@ -62,7 +62,7 @@ public class GuiBlastFurnace extends GuiBase<BuiltContainer> {
super.drawBackground(f, mouseX, mouseY);
this.hasMultiBlock = this.blockEntity.getCachedHeat() != 0;
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
final GuiBase.Layer layer = Layer.BACKGROUND;
drawSlot(8, 72, layer);

4
src/main/java/techreborn/client/gui/GuiDistillationTower.java
View file

@ -24,7 +24,7 @@
package techreborn.client.gui;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.math.BlockPos;
@ -59,7 +59,7 @@ public class GuiDistillationTower extends GuiBase<BuiltContainer> {
protected void drawBackground(final float f, final int mouseX, final int mouseY) {
super.drawBackground(f, mouseX, mouseY);
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
final GuiBase.Layer layer = Layer.BACKGROUND;
// Battery slot
drawSlot(8, 72, layer);

8
src/main/java/techreborn/client/gui/GuiIDSU.java
View file

@ -24,7 +24,7 @@
package techreborn.client.gui;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.gui.builder.GuiBase;
@ -55,10 +55,10 @@ public class GuiIDSU extends GuiBase<BuiltContainer> {
super.drawForeground(mouseX, mouseY);
final Layer layer = Layer.FOREGROUND;
GlStateManager.pushMatrix();
GlStateManager.scaled(0.6, 0.6, 1);
RenderSystem.pushMatrix();
RenderSystem.scaled(0.6, 0.6, 1);
drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) idsu.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) idsu.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer);
GlStateManager.popMatrix();
RenderSystem.popMatrix();
builder.drawMultiEnergyBar(this, 81, 28, (int) idsu.getEnergy(), (int) idsu.getMaxPower(), mouseX, mouseY, 0, layer);
}

4
src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
View file

@ -24,7 +24,7 @@
package techreborn.client.gui;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.math.BlockPos;
@ -58,7 +58,7 @@ public class GuiImplosionCompressor extends GuiBase<BuiltContainer> {
protected void drawBackground(final float f, final int mouseX, final int mouseY) {
super.drawBackground(f, mouseX, mouseY);
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
final GuiBase.Layer layer = Layer.BACKGROUND;
drawSlot(8, 72, layer);

8
src/main/java/techreborn/client/gui/GuiLESU.java
View file

@ -24,7 +24,7 @@
package techreborn.client.gui;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.gui.builder.GuiBase;
@ -55,12 +55,12 @@ public class GuiLESU extends GuiBase<BuiltContainer> {
super.drawForeground(mouseX, mouseY);
final Layer layer = Layer.FOREGROUND;
GlStateManager.pushMatrix();
GlStateManager.scaled(0.6, 0.6, 1);
RenderSystem.pushMatrix();
RenderSystem.scaled(0.6, 0.6, 1);
drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getEnergy()) + "/"
+ PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getMaxPower()) + " "
+ PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer);
GlStateManager.popMatrix();
RenderSystem.popMatrix();
builder.drawMultiEnergyBar(this, 81, 28, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxPower(), mouseX, mouseY, 0, layer);
}

8
src/main/java/techreborn/client/gui/GuiMFE.java
View file

@ -24,7 +24,7 @@
package techreborn.client.gui;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.gui.builder.GuiBase;
@ -56,10 +56,10 @@ public class GuiMFE extends GuiBase<BuiltContainer> {
final Layer layer = Layer.FOREGROUND;
if(GuiBase.slotConfigType == SlotConfigType.NONE){
GlStateManager.pushMatrix();
GlStateManager.scaled(0.6, 0.6, 1);
RenderSystem.pushMatrix();
RenderSystem.scaled(0.6, 0.6, 1);
drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) mfe.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) mfe.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer);
GlStateManager.popMatrix();
RenderSystem.popMatrix();
}
builder.drawMultiEnergyBar(this, 81, 28, (int) mfe.getEnergy(), (int) mfe.getMaxPower(), mouseX, mouseY, 0, layer);

8
src/main/java/techreborn/client/gui/GuiMFSU.java
View file

@ -24,7 +24,7 @@
package techreborn.client.gui;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.gui.builder.GuiBase;
@ -55,10 +55,10 @@ public class GuiMFSU extends GuiBase<BuiltContainer> {
super.drawForeground(mouseX, mouseY);
final Layer layer = Layer.FOREGROUND;
GlStateManager.pushMatrix();
GlStateManager.scaled(0.6, 0.6, 1);
RenderSystem.pushMatrix();
RenderSystem.scaled(0.6, 0.6, 1);
drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) mfsu.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) mfsu.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer);
GlStateManager.popMatrix();
RenderSystem.popMatrix();
builder.drawMultiEnergyBar(this, 81, 28, (int) mfsu.getEnergy(), (int) mfsu.getMaxPower(), mouseX, mouseY, 0, layer);
}

36
src/main/java/techreborn/client/render/entitys/RenderNukePrimed.java
View file

@ -24,7 +24,7 @@
package techreborn.client.render.entitys;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.block.BlockRenderManager;
import net.minecraft.client.render.entity.EntityRenderDispatcher;
@ -57,37 +57,37 @@ public class RenderNukePrimed extends EntityRenderer<EntityNukePrimed> {
@Override
public void render(EntityNukePrimed entity, double x, double y, double z, float entityYaw, float partialTicks) {
BlockRenderManager blockrendererdispatcher = MinecraftClient.getInstance().getBlockRenderManager();
GlStateManager.pushMatrix();
GlStateManager.translatef((float) x, (float) y + 0.5F, (float) z);
RenderSystem.pushMatrix();
RenderSystem.translatef((float) x, (float) y + 0.5F, (float) z);
if ((float) entity.getFuseTimer() - partialTicks + 1.0F < 10.0F) {
float f = 1.0F - ((float) entity.getFuseTimer() - partialTicks + 1.0F) / 10.0F;
f = MathHelper.clamp(f, 0.0F, 1.0F);
f = f * f;
f = f * f;
float f1 = 1.0F + f * 0.3F;
GlStateManager.scalef(f1, f1, f1);
RenderSystem.scalef(f1, f1, f1);
}
this.bindEntityTexture(entity);
GlStateManager.translatef(-0.5F, -0.5F, 0.5F);
RenderSystem.translatef(-0.5F, -0.5F, 0.5F);
blockrendererdispatcher.renderDynamic(TRContent.NUKE.getDefaultState(),
entity.getBrightnessAtEyes());
GlStateManager.translatef(0.0F, 0.0F, 1.0F);
RenderSystem.translatef(0.0F, 0.0F, 1.0F);
if (entity.getFuseTimer() / 5 % 2 == 0) {
GlStateManager.disableLighting();
GlStateManager.enableBlend();
GlStateManager.blendFunc(770, 772);
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1F);
GlStateManager.polygonOffset(-3.0F, -3.0F);
GlStateManager.enablePolygonOffset();
RenderSystem.disableLighting();
RenderSystem.enableBlend();
RenderSystem.blendFunc(770, 772);
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1F);
RenderSystem.polygonOffset(-3.0F, -3.0F);
RenderSystem.enablePolygonOffset();
blockrendererdispatcher.renderDynamic(
TRContent.NUKE.getDefaultState().with(BlockNuke.OVERLAY, true), 1.0F);
GlStateManager.polygonOffset(0.0F, 0.0F);
GlStateManager.disablePolygonOffset();
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
GlStateManager.disableBlend();
GlStateManager.enableLighting();
RenderSystem.polygonOffset(0.0F, 0.0F);
RenderSystem.disablePolygonOffset();
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.disableBlend();
RenderSystem.enableLighting();
}
GlStateManager.popMatrix();
RenderSystem.popMatrix();
super.render(entity, x, y, z, entityYaw, partialTicks);
}