Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Zorbatron committed Dec 18, 2024
2 parents f31704a + 1bede2b commit 04f4d6c
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 10 deletions.
23 changes: 21 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,16 @@ Ported the following multiblocks from GT:NH:
- Precise Assembler (PRASS)
- Component Assembly Line (CoAL)
- YOTTank and YOTHatch
- Compact™ Fusion Reactors
- Zyngen
- Circuit Assembly Line

My multiblocks:
- Quad EBF (qEBF)
- Queezer (quad EBF)
- Queezer (quad vacuum freezer)
- Quacker (quad oil cracker)
- GCYM Air Collector
- GCYM Rock Breaker

### Images (_In order with the above list_):
![](images/mega_ebf.png)
Expand All @@ -41,11 +47,17 @@ My multiblocks:
![](images/coal.png)
![](images/yottank.png)
![](images/yothatch.png)
![](images/compact_fusion.png)
![](images/zyngen.png)
![](images/cal.png)

<br></br>
### My multiblocks:
![](images/quad_ebf.png)
![](images/queezer.png)
![](images/quacker.png)
![](images/large_air_collector.png)
![](images/large_rock_breaker.png)

### Multiblock Parts:

Expand Down Expand Up @@ -100,9 +112,16 @@ Air Intake Hatch
Single Item Input Bus
- Functionally identical to a ULV input bus, but it has a max stack size of 1.

Larger parallel hatch
- The same as normal GCYM parallel hatches, but with much larger values!
- Will turn your Ticks Per Second into Seconds Per Tick if used when doing recipes with chanced outputs! :troll:

Dropper Cover
- Is placed on any gregtech block that accepts covers and will drop items from its inventory.


## Credited Works
- [GT:NH](https://github.com/GTNewHorizons/) for many of it's multiblocks.
- [GT:NH](https://github.com/GTNewHorizons/) for many of its multiblocks.
- Ursamina for the dual cover textures and the icon! :heart:
- [Synthitic](https://github.com/Synthitic/) for porting GT:NH's CoAL to [GCYL: CEu](https://github.com/Synthitic/GCYL-CEu), which I more or less directly copied.
- [GT:CEu](https://github.com/GregTechCEu/GregTech) for much code inspiration.
Expand Down
Binary file added images/cal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/compact_fusion.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/large_air_collector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/large_rock_breaker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/quacker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/zyngen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 33 additions & 8 deletions src/main/java/com/zorbatron/zbgt/common/items/ZBGTMetaItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -291,23 +291,48 @@ public void registerSubItems() {
ZBGT_ITEM = addItem(116, "zbgt").setInvisible();

// Dropper Covers 117-129
DROPPER_COVER_LV = addItem(117, "cover.cover_dropper.lv");
DROPPER_COVER_MV = addItem(118, "cover.cover_dropper.mv");
DROPPER_COVER_HV = addItem(119, "cover.cover_dropper.hv");
DROPPER_COVER_EV = addItem(120, "cover.cover_dropper.ev");
DROPPER_COVER_IV = addItem(121, "cover.cover_dropper.iv");
DROPPER_COVER_LuV = addItem(122, "cover.cover_dropper.luv");
DROPPER_COVER_ZPM = addItem(123, "cover.cover_dropper.zpm");
DROPPER_COVER_UV = addItem(124, "cover.cover_dropper.uv");
DROPPER_COVER_LV = addItem(117, "cover.cover_dropper.lv")
.addComponents(new TooltipBehavior(list -> list.add(I18n.format("cover.cover_dropper.tooltip", 8))));
DROPPER_COVER_MV = addItem(118, "cover.cover_dropper.mv")
.addComponents(
new TooltipBehavior(list -> list.add(I18n.format("cover.cover_dropper.tooltip", 8 * 2))));
DROPPER_COVER_HV = addItem(119, "cover.cover_dropper.hv")
.addComponents(
new TooltipBehavior(list -> list.add(I18n.format("cover.cover_dropper.tooltip", 8 * 4))));
DROPPER_COVER_EV = addItem(120, "cover.cover_dropper.ev")
.addComponents(
new TooltipBehavior(list -> list.add(I18n.format("cover.cover_dropper.tooltip", 8 * 8))));
DROPPER_COVER_IV = addItem(121, "cover.cover_dropper.iv")
.addComponents(
new TooltipBehavior(list -> list.add(I18n.format("cover.cover_dropper.tooltip", 8 * 16))));
DROPPER_COVER_LuV = addItem(122, "cover.cover_dropper.luv")
.addComponents(
new TooltipBehavior(list -> list.add(I18n.format("cover.cover_dropper.tooltip", 8 * 32))));
DROPPER_COVER_ZPM = addItem(123, "cover.cover_dropper.zpm")
.addComponents(
new TooltipBehavior(list -> list.add(I18n.format("cover.cover_dropper.tooltip", 8 * 64))));
DROPPER_COVER_UV = addItem(124, "cover.cover_dropper.uv")
.addComponents(
new TooltipBehavior(list -> list.add(I18n.format("cover.cover_dropper.tooltip", 8 * 128))));
DROPPER_COVER_UHV = addItem(125, "cover.cover_dropper.uhv")
.addComponents(
new TooltipBehavior(list -> list.add(I18n.format("cover.cover_dropper.tooltip", 8 * 256))))
.setInvisibleIf(!GregTechAPI.isHighTier());
DROPPER_COVER_UEV = addItem(126, "cover.cover_dropper.uev")
.addComponents(
new TooltipBehavior(list -> list.add(I18n.format("cover.cover_dropper.tooltip", 8 * 512))))
.setInvisibleIf(!GregTechAPI.isHighTier());
DROPPER_COVER_UIV = addItem(127, "cover.cover_dropper.uiv")
.addComponents(
new TooltipBehavior(list -> list.add(I18n.format("cover.cover_dropper.tooltip", 8 * 1024))))
.setInvisibleIf(!GregTechAPI.isHighTier());
DROPPER_COVER_UXV = addItem(128, "cover.cover_dropper.uxv")
.addComponents(
new TooltipBehavior(list -> list.add(I18n.format("cover.cover_dropper.tooltip", 8 * 2048))))
.setInvisibleIf(!GregTechAPI.isHighTier());
DROPPER_COVER_OpV = addItem(129, "cover.cover_dropper.opv")
.addComponents(
new TooltipBehavior(list -> list.add(I18n.format("cover.cover_dropper.tooltip", 8 * 4096))))
.setInvisibleIf(!GregTechAPI.isHighTier());
}
}
1 change: 1 addition & 0 deletions src/main/resources/assets/zbgt/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ cover.cover_dropper.update_rate_label.2=Drop every tick
cover.cover_dropper.update_rate.1=Dropping every
cover.cover_dropper.update_rate.2=ticks
cover.cover_dropper.update_rate.3=Dropping every tick
cover.cover_dropper.tooltip=Can drop up to §f%,d items/s§7


# Items
Expand Down

0 comments on commit 04f4d6c

Please sign in to comment.