Skip to content

Commit

Permalink
Laser Engraver Multi. (#2223) - fix conflict
Browse files Browse the repository at this point in the history
* saving.............

* clean up

* savin

* Small fixes + Adding back stuff, Crashes you and spams logs.

* fix stack overflow

* Fixes

* Fixes

---------

Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>
  • Loading branch information
TheEpicGamer274 and BlueWeabo committed Dec 27, 2023
1 parent 268b884 commit c7cd235
Show file tree
Hide file tree
Showing 16 changed files with 356 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/main/java/gregtech/api/enums/GT_Values.java
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,7 @@ public static final class NBT {
+ "minecraft7771";

public static final String AuthorQuerns = "Author: " + EnumChatFormatting.RED + "Querns";
public static final String AuthorTheEpicGamer274 = "Author: " + "TheEpicGamer274";

// 7.5F comes from GT_Tool_Turbine_Large#getBaseDamage() given huge turbines are the most efficient now.
public static double getMaxPlasmaTurbineEfficiencyFromMaterial(Materials material) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ public enum GT_MultiTileCasing {
Chemical(1),
Distillation(2),
Macerator(18000),
LaserEngraver(4),
Mirror(5),
BlackLaserEngraverCasing(6),
LaserEngraverUpgrade1(7),
LaserEngraverUpgrade2(8),
LaserEngraverUpgrade3(9),
LaserEngraverUpgrade4(10),
NONE(GT_Values.W);

private final int meta;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@ public PowerLogic getPowerLogic() {
return null;
}

return powerLogicHost.getPowerLogic();
return powerLogicHost.getPowerLogic(ForgeDirection.UNKNOWN);
}

// #endregion Energy
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import gregtech.common.tileentities.machines.multiblock.AdvChemicalProcessor;
import gregtech.common.tileentities.machines.multiblock.CokeOven;
import gregtech.common.tileentities.machines.multiblock.DistillationTower;
import gregtech.common.tileentities.machines.multiblock.LaserEngraver;
import gregtech.common.tileentities.machines.multiblock.LayeredCokeBattery;
import gregtech.common.tileentities.machines.multiblock.Macerator;

Expand Down Expand Up @@ -127,6 +128,15 @@ private static void registerMachines() {
.inputInventorySize(16)
.outputInventorySize(16)
.register();
MACHINE_REGISTRY.create(4, LaserEngraver.class)
.name("Big Laser Engraver")
.category("Multiblock Controller")
.setBlock(MACHINE_BLOCK)
.textureFolder("BigLaserEngraver")
.inputInventorySize(16)
.outputInventorySize(16)
.tankCapacity(128000L)
.register();
}

private static void registerCasings() {
Expand Down Expand Up @@ -156,6 +166,48 @@ private static void registerCasings() {
.material(Materials.Cobalt)
.textureFolder("macerator")
.register();
CASING_REGISTRY.create(LaserEngraver.getId(), BasicCasing.class)
.name("Laser Engraver Casing")
.category("MultiBlock Casing")
.setBlock(CASING_BLOCK)
.textureFolder("BigLaserEngraver")
.register();
CASING_REGISTRY.create(Mirror.getId(), BasicCasing.class)
.name("Mirror")
.category("MultiBlock Casing")
.setBlock(CASING_BLOCK)
.textureFolder("Laserblock")
.register();
CASING_REGISTRY.create(BlackLaserEngraverCasing.getId(), BasicCasing.class)
.name("Black Laser Engraver Casing")
.category("MultiBlock Casing")
.setBlock(CASING_BLOCK)
.textureFolder("BlackLaserEngraver")
.register();
CASING_REGISTRY.create(LaserEngraverUpgrade1.getId(), BasicCasing.class)
.name("Crude Laser Engraving Casing")
.category("MultiBlock Casing")
.setBlock(CASING_BLOCK)
.textureFolder("laserengraverupgrade1")
.register();
CASING_REGISTRY.create(LaserEngraverUpgrade2.getId(), BasicCasing.class)
.name("Advanced Laser Engraving Casing")
.category("MultiBlock Casing")
.setBlock(CASING_BLOCK)
.textureFolder("laserengraverupgrade2")
.register();
CASING_REGISTRY.create(LaserEngraverUpgrade3.getId(), BasicCasing.class)
.name("Ultimate Laser Engraving Casing")
.category("MultiBlock Casing")
.setBlock(CASING_BLOCK)
.textureFolder("laserengraverupgrade3")
.register();
CASING_REGISTRY.create(LaserEngraverUpgrade4.getId(), BasicCasing.class)
.name("Superb Laser Engraving Casing")
.category("MultiBlock Casing")
.setBlock(CASING_BLOCK)
.textureFolder("laserengraverupgrade4")
.register();

}

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c7cd235

Please sign in to comment.