Pre 4 mappings

This commit is contained in:
modmuss50 2019-12-04 16:49:53 +00:00
parent a0fbc1ccb3
commit e48d1f1184
8 changed files with 30 additions and 27 deletions

View file

@ -73,12 +73,12 @@ license {
group = 'TechReborn' group = 'TechReborn'
dependencies { dependencies {
minecraft "com.mojang:minecraft:1.15-pre2" minecraft "com.mojang:minecraft:1.15-pre4"
mappings "net.fabricmc:yarn:1.15-pre2+build.3:v2" mappings "net.fabricmc:yarn:1.15-pre4+build.1:v2"
modCompile "net.fabricmc:fabric-loader:0.7.1+build.173" modCompile "net.fabricmc:fabric-loader:0.7.2+build.174"
//Fabric api //Fabric api
modCompile "net.fabricmc.fabric-api:fabric-api:0.4.16+build.268-1.15" modCompile "net.fabricmc.fabric-api:fabric-api:0.4.19+build.272-1.15"
modCompileOnly "io.github.prospector:modmenu:1.7.9-unstable.19w34a+build.1" modCompileOnly "io.github.prospector:modmenu:1.7.9-unstable.19w34a+build.1"
modCompileOnly ("me.shedaniel:RoughlyEnoughItems:3.2.7-unstable.201911150440") modCompileOnly ("me.shedaniel:RoughlyEnoughItems:3.2.7-unstable.201911150440")

View file

@ -24,7 +24,11 @@
package techreborn.blocks.cable; package techreborn.blocks.cable;
import net.minecraft.block.*; import net.minecraft.block.Block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.BlockWithEntity;
import net.minecraft.block.Material;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityContext; import net.minecraft.entity.EntityContext;
@ -76,7 +80,7 @@ public class CableBlock extends BlockWithEntity {
public static final BooleanProperty UP = BooleanProperty.of("up"); public static final BooleanProperty UP = BooleanProperty.of("up");
public static final BooleanProperty DOWN = BooleanProperty.of("down"); public static final BooleanProperty DOWN = BooleanProperty.of("down");
public static final Map<Direction, BooleanProperty> PROPERTY_MAP = Util.create(new HashMap<>(), map -> { public static final Map<Direction, BooleanProperty> PROPERTY_MAP = Util.make(new HashMap<>(), map -> {
map.put(Direction.EAST, EAST); map.put(Direction.EAST, EAST);
map.put(Direction.WEST, WEST); map.put(Direction.WEST, WEST);
map.put(Direction.NORTH, NORTH); map.put(Direction.NORTH, NORTH);

View file

@ -33,8 +33,8 @@ import reborncore.client.gui.builder.widget.GuiButtonUpDown;
import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType;
import reborncore.common.network.NetworkManager; import reborncore.common.network.NetworkManager;
import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PowerSystem;
import techreborn.packets.ServerboundPackets;
import techreborn.blockentity.storage.AdjustableSUBlockEntity; import techreborn.blockentity.storage.AdjustableSUBlockEntity;
import techreborn.packets.ServerboundPackets;
public class GuiAESU extends GuiBase<BuiltContainer> { public class GuiAESU extends GuiBase<BuiltContainer> {
@ -48,10 +48,10 @@ public class GuiAESU extends GuiBase<BuiltContainer> {
@Override @Override
public void init() { public void init() {
super.init(); super.init();
addButton(new GuiButtonUpDown(left + 121, top + 79, this, b -> onClick(256), UpDownButtonType.FASTFORWARD)); addButton(new GuiButtonUpDown(x + 121, y + 79, this, b -> onClick(256), UpDownButtonType.FASTFORWARD));
addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, b -> onClick(64), UpDownButtonType.FORWARD)); addButton(new GuiButtonUpDown(x + 121 + 12, y + 79, this, b -> onClick(64), UpDownButtonType.FORWARD));
addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, b -> onClick(-64), UpDownButtonType.REWIND)); addButton(new GuiButtonUpDown(x + 121 + 24, y + 79, this, b -> onClick(-64), UpDownButtonType.REWIND));
addButton(new GuiButtonUpDown(left + 121 + 36, top + 79, this, b -> onClick(-256), UpDownButtonType.FASTREWIND)); addButton(new GuiButtonUpDown(x + 121 + 36, y + 79, this, b -> onClick(-256), UpDownButtonType.FASTREWIND));
} }
@Override @Override

View file

@ -46,12 +46,12 @@ public class GuiChunkLoader extends GuiBase<BuiltContainer> {
public void init() { public void init() {
super.init(); super.init();
addButton(new GuiButtonUpDown(left + 64, top + 40, this, b -> onClick(5), UpDownButtonType.FASTFORWARD)); addButton(new GuiButtonUpDown(x + 64, y + 40, this, b -> onClick(5), UpDownButtonType.FASTFORWARD));
addButton(new GuiButtonUpDown(left + 64 + 12, top + 40, this, b -> onClick(1), UpDownButtonType.FORWARD)); addButton(new GuiButtonUpDown(x + 64 + 12, y + 40, this, b -> onClick(1), UpDownButtonType.FORWARD));
addButton(new GuiButtonUpDown(left + 64 + 24, top + 40, this, b -> onClick(-1), UpDownButtonType.REWIND)); addButton(new GuiButtonUpDown(x + 64 + 24, y + 40, this, b -> onClick(-1), UpDownButtonType.REWIND));
addButton(new GuiButtonUpDown(left + 64 + 36, top + 40, this, b -> onClick(-5), UpDownButtonType.FASTREWIND)); addButton(new GuiButtonUpDown(x + 64 + 36, y + 40, this, b -> onClick(-5), UpDownButtonType.FASTREWIND));
addButton(new GuiButtonSimple(left + 10, top + 70, 155, 20, "Toggle Loaded Chunks", b -> ClientChunkManager.toggleLoadedChunks(blockEntity.getPos()))); addButton(new GuiButtonSimple(x + 10, y + 70, 155, 20, "Toggle Loaded Chunks", b -> ClientChunkManager.toggleLoadedChunks(blockEntity.getPos())));
} }
@Override @Override

View file

@ -55,11 +55,11 @@ public class GuiDigitalChest extends GuiBase<BuiltContainer> {
if (!blockEntity.storedItem.isEmpty() && blockEntity.inventory.getInvStack(1) != null) { if (!blockEntity.storedItem.isEmpty() && blockEntity.inventory.getInvStack(1) != null) {
builder.drawBigBlueBar(this, 31, 43, builder.drawBigBlueBar(this, 31, 43,
blockEntity.storedItem.getCount() + blockEntity.inventory.getInvStack(1).getCount(), blockEntity.storedItem.getCount() + blockEntity.inventory.getInvStack(1).getCount(),
blockEntity.maxCapacity, mouseX - left, mouseY - top, "Stored", layer); blockEntity.maxCapacity, mouseX - x, mouseY - y, "Stored", layer);
} }
if (blockEntity.storedItem.isEmpty() && blockEntity.inventory.getInvStack(1) != null) { if (blockEntity.storedItem.isEmpty() && blockEntity.inventory.getInvStack(1) != null) {
builder.drawBigBlueBar(this, 31, 43, blockEntity.inventory.getInvStack(1).getCount(), builder.drawBigBlueBar(this, 31, 43, blockEntity.inventory.getInvStack(1).getCount(),
blockEntity.maxCapacity, mouseX - left, mouseY - top, "Stored", layer); blockEntity.maxCapacity, mouseX - x, mouseY - y, "Stored", layer);
} }
} }
} }

View file

@ -29,7 +29,6 @@ import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import reborncore.RebornCoreClient;
import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.GuiBase;
import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.builder.widget.GuiButtonExtended;
@ -41,9 +40,9 @@ import reborncore.common.network.NetworkManager;
import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.util.Color; import reborncore.common.util.Color;
import reborncore.common.util.Torus; import reborncore.common.util.Torus;
import techreborn.blockentity.fusionReactor.FusionControlComputerBlockEntity;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import techreborn.packets.ServerboundPackets; import techreborn.packets.ServerboundPackets;
import techreborn.blockentity.fusionReactor.FusionControlComputerBlockEntity;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@ -59,10 +58,10 @@ public class GuiFusionReactor extends GuiBase<BuiltContainer> {
@Override @Override
public void init() { public void init() {
super.init(); super.init();
addButton(new GuiButtonUpDown(left + 121, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(5), UpDownButtonType.FASTFORWARD)); addButton(new GuiButtonUpDown(x + 121, y + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(5), UpDownButtonType.FASTFORWARD));
addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(1), UpDownButtonType.FORWARD)); addButton(new GuiButtonUpDown(x + 121 + 12, y + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(1), UpDownButtonType.FORWARD));
addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-5), UpDownButtonType.REWIND)); addButton(new GuiButtonUpDown(x + 121 + 24, y + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-5), UpDownButtonType.REWIND));
addButton(new GuiButtonUpDown(left + 121 + 36, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-1), UpDownButtonType.FASTREWIND)); addButton(new GuiButtonUpDown(x + 121 + 36, y + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-1), UpDownButtonType.FASTREWIND));
} }
@Override @Override

View file

@ -53,10 +53,10 @@ public class GuiQuantumChest extends GuiBase<BuiltContainer> {
final Layer layer = Layer.FOREGROUND; final Layer layer = Layer.FOREGROUND;
if (!this.quantumChest.storedItem.isEmpty() && !this.quantumChest.inventory.getInvStack(1).isEmpty()) { if (!this.quantumChest.storedItem.isEmpty() && !this.quantumChest.inventory.getInvStack(1).isEmpty()) {
this.builder.drawBigBlueBar(this, 31, 43, this.quantumChest.storedItem.getCount() + this.quantumChest.inventory.getInvStack(1).getCount(), this.quantumChest.maxCapacity, mouseX - this.left, mouseY - this.top, "Stored", layer); this.builder.drawBigBlueBar(this, 31, 43, this.quantumChest.storedItem.getCount() + this.quantumChest.inventory.getInvStack(1).getCount(), this.quantumChest.maxCapacity, mouseX - this.x, mouseY - this.y, "Stored", layer);
} }
if (this.quantumChest.storedItem.isEmpty() && !this.quantumChest.inventory.getInvStack(1).isEmpty()) { if (this.quantumChest.storedItem.isEmpty() && !this.quantumChest.inventory.getInvStack(1).isEmpty()) {
this.builder.drawBigBlueBar(this, 31, 43, this.quantumChest.inventory.getInvStack(1).getCount(), this.quantumChest.maxCapacity, mouseX - this.left, mouseY - this.top, "Stored", layer); this.builder.drawBigBlueBar(this, 31, 43, this.quantumChest.inventory.getInvStack(1).getCount(), this.quantumChest.maxCapacity, mouseX - this.x, mouseY - this.y, "Stored", layer);
} }
} }
} }

View file

@ -45,7 +45,7 @@ public class RenderNukePrimed extends EntityRenderer<EntityNukePrimed> {
public RenderNukePrimed(EntityRenderDispatcher renderManager) { public RenderNukePrimed(EntityRenderDispatcher renderManager) {
super(renderManager); super(renderManager);
this.field_4673 = 0.5F; this.shadowSize = 0.5F;
} }
@Nullable @Nullable