Skip to content

Commit

Permalink
Try to backport the oversize interface. [1.0.8]
Browse files Browse the repository at this point in the history
  • Loading branch information
LittleCircleOO committed Sep 8, 2024
1 parent f1ddffa commit 4b13e10
Show file tree
Hide file tree
Showing 42 changed files with 555 additions and 11 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ yarn_mappings=1.20.1+build.10
loader_version=0.14.21

# Mod Properties
mod_version=1.20-1.0.7-fabric
mod_version=1.20-1.0.8-fabric
maven_group=com.github.glodblock.extendedae
archives_base_name=ExtendedAE

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// 1.20.1 2024-09-07T23:54:45.3912302 ExtendedAE/Block Loot Tables
// 1.20.1 2024-09-08T20:03:51.2074034 ExtendedAE/Block Loot Tables
b88aff654e2b52c77d3a954b0a40624ba2b7d94c data\extendedae\loot_tables\blocks\ex_pattern_provider.json
3855267e2e58227693d65f91662ca45ee47a9d44 data\extendedae\loot_tables\blocks\oversize_interface.json
06cd161fbcac8e01ff365488afdb95c66ddbcf26 data\extendedae\loot_tables\blocks\ex_drive.json
19d659c4dcf2e05ad65727c6e22a95e22e1887b6 data\extendedae\loot_tables\blocks\ex_molecular_assembler.json
ddc5ded4cf2eb2f4ce138a6645ea33c4fc0d461e data\extendedae\loot_tables\blocks\fishbig.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.1 2024-09-07T23:54:45.3902289 ExtendedAE/Tags for minecraft:block
2fd5aa6a999f7838bf71b494ed89373756f8ce07 data\minecraft\tags\blocks\mineable\pickaxe.json
// 1.20.1 2024-09-08T20:03:51.2064051 ExtendedAE/Tags for minecraft:block
6f0fd48989e4f7d766f4ab6f585e115e25f261c8 data\minecraft\tags\blocks\mineable\pickaxe.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// 1.20.1 2024-09-07T23:54:45.3882283 ExtendedAE/Tags for minecraft:item
// 1.20.1 2024-09-08T20:03:51.2044035 ExtendedAE/Tags for minecraft:item
f0f5c97d76d0c8b6f0b4d386519c221e4091df9a data\extendedae\tags\items\oversize_interface.json
7166e4ff733ed79bf23e0d65e92ee77a5d2539a3 data\extendedae\tags\items\extended_pattern_provider.json
184f4dec1675439eb2fdc2dce8431ebe60fbaa7b data\extendedae\tags\items\extended_interface.json
f5b6762b70f5421d70e7e5820c3cf575d008304d data\c\tags\items\storage_blocks.json
Expand Down
14 changes: 10 additions & 4 deletions src/main/generated/.cache/eb4bb7bf118d6546ada756995518a81713c963f3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-09-07T23:54:45.3922273 ExtendedAE/Recipes
// 1.20.1 2024-09-08T20:03:51.208403 ExtendedAE/Recipes
346c455129e100f839b972c4c9b606ccef5ef905 data\extendedae\advancements\recipes\misc\silicon_decompress.json
f508e97befb44ee5bd19d9235e87cd6d6a325f0b data\extendedae\advancements\recipes\misc\ei.json
9e0d67229c13bf766210683126aeee19b529d9be data\extendedae\recipes\silicon_decompress.json
Expand All @@ -16,6 +16,8 @@ a8281b8747957085d28bbc23887fcccffea39229 data\extendedae\advancements\recipes\mi
d0c8ff587d0140cf44898a21ffa6c8bad08e75c5 data\extendedae\recipes\ei.json
d90d5dca824ca5d5a9ec3ea77745b27eb6fbafa0 data\extendedae\advancements\recipes\misc\epa_upgrade.json
9eebc3490a873ada398514259277b0d815ca0874 data\extendedae\advancements\recipes\misc\pre_bus.json
5277be560c4eb30506097e17e5e1ce9d8ebbb91b data\extendedae\recipes\oversize_interface_part.json
706577f9435ada433051c642420468721c86cfd7 data\extendedae\advancements\recipes\misc\oversize_interface_part.json
3c90b4f6157b28b70b8503929766d5fbc2f1d992 data\extendedae\advancements\recipes\misc\tape.json
f9a2039e9d7f4dc5123ad85bfb5d858be48abdbb data\extendedae\recipes\cutter\calculation_processor.json
b990c9992dc20e815e500ee898db8ef45a9790b2 data\extendedae\advancements\recipes\misc\ex_drive.json
Expand All @@ -37,22 +39,24 @@ de6eaf583206ca9c2e0790292b8bd8649ed5da2a data\extendedae\recipes\ex_drive_upgrad
396aa6147e7aa1363a4e8ce276b5165c52b816ac data\extendedae\recipes\caner.json
7c5d4fbfcba5cd27afaac59243a0edd855d73a9e data\extendedae\recipes\mod_storage_bus.json
a0bcd6db7590feaa0f8568977b322ef55459b79e data\extendedae\recipes\ex_inscriber.json
da83fa8bc42c1e1d256056f561f576cfc9d0c0af data\extendedae\recipes\oversize_interface_alt.json
936fb9f1a7f392b8a7328b1a7b71d03b189a3265 data\extendedae\recipes\ei_upgrade.json
8c350184b34ab81220ecbb6bbf5e8bba11bf679b data\extendedae\advancements\recipes\misc\epa.json
354ef0f35da2bb6b786590b8ba5ecb807111727e data\extendedae\advancements\recipes\misc\silicon_block.json
02b576b74866a4fa219ba5074e5cd56ed73b9131 data\extendedae\advancements\recipes\misc\pattern_modifier.json
9e2bdedee3d97d2b3a4316ccf0828f4fb7dd46dc data\extendedae\advancements\recipes\misc\precise_storage_bus.json
914a2d0cce72a6152f08322843f853538c325241 data\extendedae\recipes\cutter\engineering_processor.json
4aba396b0c6f8cd9b74e7360cfc83c05b325edc4 data\extendedae\recipes\oversize_interface.json
1faa2f305d08984545b99fa10be22969f681b39c data\extendedae\advancements\recipes\misc\wireless_tool.json
ff60b826b068699ba9e304440800eab9dc7df3bd data\extendedae\recipes\ex_molecular_assembler.json
85f4568082647e23482a8a8b029e75840ef92d37 data\extendedae\advancements\recipes\misc\epp_part.json
3f76c4c56c84fd2ffef500e70663ac756c2ca40d data\extendedae\recipes\threshold_export_bus.json
1d1abecf99c5b107562e937b391ca261d98ca6d0 data\extendedae\advancements\recipes\misc\mod_export_bus.json
c1d41ce0812c35f926a9b88270a38dffb3e9c430 data\extendedae\recipes\wireless_ex_pat.json
35af04c719a73464cf568997a71ede2ff2309859 data\extendedae\recipes\ebus_upgrade.json
415358cbfd6b40428a258d49152c2eef6c184079 data\extendedae\advancements\recipes\misc\wireless_connector.json
f645b7fa89e1d27fb9b869b345fc14d06e7d95b0 data\extendedae\advancements\recipes\misc\ebus_upgrade.json
9d1f3f206dc9d0953fdb65452fd67d32355872b1 data\extendedae\recipes\ebus_in.json
f645b7fa89e1d27fb9b869b345fc14d06e7d95b0 data\extendedae\advancements\recipes\misc\ebus_upgrade.json
415358cbfd6b40428a258d49152c2eef6c184079 data\extendedae\advancements\recipes\misc\wireless_connector.json
fa6d399c08bd02e53dfbad106c8848a7da2efa0e data\extendedae\recipes\circuit_cutter.json
27eb8f1f80f4e0227df222f5599eea8f737c3138 data\extendedae\recipes\wireless_tool.json
fd61a12d57e4bd4ad77c60425e3668de5975f824 data\extendedae\recipes\ebus_out.json
Expand All @@ -64,6 +68,7 @@ b7f44dfb90b9b92810d272b1d4780674ebfe913d data\extendedae\advancements\recipes\mi
a8b3761d9c91d9bcd0bc98492e8b9a5c9f3fd63d data\extendedae\advancements\recipes\misc\tag_export_bus.json
3c5e9bc0f27e8ac63672d69b64616dcfd10f319e data\extendedae\recipes\mod_export_bus.json
5355e5286d274a56e8e2f1296bbcb5a36f05d61f data\extendedae\recipes\cobblestone_cell.json
bb3b380ddd388b945fd874711cbb701098258c47 data\extendedae\advancements\recipes\misc\oversize_interface.json
0e1a5843a0c5273cfe0fc0577efbdb620d579e0a data\extendedae\recipes\pattern_modifier.json
525f231123ae54b6c26de87934836cae6bbd2cd0 data\extendedae\recipes\wireless_connector.json
396361180084444fd00c9b3bf440de7a2c52f0ff data\extendedae\advancements\recipes\misc\epp_alt.json
Expand All @@ -77,9 +82,10 @@ a6ee65b50356fb7d4f743c2bcd4ecfa5165a614c data\extendedae\advancements\recipes\mi
226415d068b01103e857383464da3bf45fa847b0 data\extendedae\advancements\recipes\misc\fishbig.json
de2cc74ae7419cbdad7713c6785bd1c0e06c2d2e data\extendedae\advancements\recipes\misc\epp_upgrade.json
95c601b7549668d291eb0f334592454ef3d0c9fb data\extendedae\recipes\ei_part.json
cc629dd912783b3611af0e87536d631ce6ea3581 data\extendedae\advancements\recipes\misc\tag_storage_bus.json
f40a8b738597c587ec19a3fa27f859572dde6a41 data\extendedae\recipes\epp_alt.json
cc629dd912783b3611af0e87536d631ce6ea3581 data\extendedae\advancements\recipes\misc\tag_storage_bus.json
557bd7b81c3b3b21b2580b0ba0fbbc1ba5d04a86 data\extendedae\recipes\silicon_block.json
d12192ac5fa986947c3f766abfc852780e3b5239 data\extendedae\advancements\recipes\misc\oversize_interface_alt.json
260aba7256141fbfa9d4c2cf0760b35e7e500da8 data\extendedae\advancements\recipes\misc\ingredient_buffer.json
6934a077604a55ff1c73d9a9b51001c30c8dbfb2 data\extendedae\recipes\fishbig.json
9ee547a12347275beea13b2fb68bb5f2a12a2d5a data\extendedae\recipes\ei_alt.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"extendedae:oversize_interface"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "extendedae:oversize_interface"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"extendedae:oversize_interface"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"extendedae:oversize_interface_part"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "extendedae:oversize_interface_alt"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"extendedae:oversize_interface_alt"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"extendedae:oversize_interface"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "extendedae:oversize_interface_part"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"extendedae:oversize_interface_part"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "extendedae:oversize_interface"
}
],
"rolls": 1.0
}
]
}
33 changes: 33 additions & 0 deletions src/main/generated/data/extendedae/recipes/oversize_interface.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"A": {
"item": "ae2:annihilation_core"
},
"B": {
"item": "extendedae:ingredient_buffer"
},
"C": {
"item": "ae2:capacity_card"
},
"F": {
"item": "ae2:formation_core"
},
"I": {
"item": "extendedae:ex_interface"
},
"P": {
"item": "ae2:calculation_processor"
}
},
"pattern": [
"BPB",
"AIF",
"ACF"
],
"result": {
"item": "extendedae:oversize_interface"
},
"show_notification": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "extendedae:oversize_interface_part"
}
],
"result": {
"item": "extendedae:oversize_interface"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "extendedae:oversize_interface"
}
],
"result": {
"item": "extendedae:oversize_interface_part"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"extendedae:oversize_interface_part",
"extendedae:oversize_interface"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"extendedae:crystal_fixer",
"extendedae:ex_io_port",
"extendedae:circuit_cutter",
"extendedae:oversize_interface",
"extendedae:fishbig",
"extendedae:silicon_block"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ private void registerGui() {
InitScreens.register(ContainerPreciseStorageBus.TYPE, GuiPreciseStorageBus::new, "/screens/precise_storage_bus.json");
InitScreens.register(ContainerThresholdExportBus.TYPE, GuiThresholdExportBus::new, "/screens/threshold_export_bus.json");
InitScreens.register(ContainerCircuitCutter.TYPE, GuiCircuitCutter::new, "/screens/circuit_cutter.json");
InitScreens.register(ContainerExInterface.TYPE_OVERSIZE, GuiExInterface::new, "/screens/oversize_interface.json");
MenuScreens.register(ContainerProcessingPattern.TYPE, GuiProcessingPattern::new);
MenuScreens.register(ContainerCraftingPattern.TYPE, GuiCraftingPattern::new);
MenuScreens.register(ContainerStonecuttingPattern.TYPE, GuiStonecuttingPattern::new);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.github.glodblock.extendedae.common.blocks.BlockExPatternProvider;
import com.github.glodblock.extendedae.common.blocks.BlockFishbig;
import com.github.glodblock.extendedae.common.blocks.BlockIngredientBuffer;
import com.github.glodblock.extendedae.common.blocks.BlockOversizeInterface;
import com.github.glodblock.extendedae.common.blocks.BlockWirelessConnector;
import com.github.glodblock.extendedae.common.items.InfinityCell;
import com.github.glodblock.extendedae.common.items.ItemDriveUpgrade;
Expand All @@ -35,6 +36,7 @@
import com.github.glodblock.extendedae.common.parts.PartExPatternProvider;
import com.github.glodblock.extendedae.common.parts.PartModExportBus;
import com.github.glodblock.extendedae.common.parts.PartModStorageBus;
import com.github.glodblock.extendedae.common.parts.PartOversizeInterface;
import com.github.glodblock.extendedae.common.parts.PartPreciseExportBus;
import com.github.glodblock.extendedae.common.parts.PartPreciseStorageBus;
import com.github.glodblock.extendedae.common.parts.PartTagExportBus;
Expand All @@ -52,6 +54,7 @@
import com.github.glodblock.extendedae.common.tileentities.TileExMolecularAssembler;
import com.github.glodblock.extendedae.common.tileentities.TileExPatternProvider;
import com.github.glodblock.extendedae.common.tileentities.TileIngredientBuffer;
import com.github.glodblock.extendedae.common.tileentities.TileOversizeInterface;
import com.github.glodblock.extendedae.common.tileentities.TileWirelessConnector;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
Expand Down Expand Up @@ -98,6 +101,8 @@ public class EAEItemAndBlock {
public static PartItem<PartPreciseStorageBus> PRECISE_STORAGE_BUS;
public static PartItem<PartThresholdExportBus> THRESHOLD_EXPORT_BUS;
public static BlockCircuitCutter CIRCUIT_CUTTER;
public static BlockOversizeInterface OVERSIZE_INTERFACE;
public static PartItem<PartOversizeInterface> OVERSIZE_INTERFACE_PART;
public static BlockFishbig FISHBIG;

public static void init(RegistryHandler regHandler) {
Expand Down Expand Up @@ -151,6 +156,8 @@ public static void init(RegistryHandler regHandler) {
FISHBIG = new BlockFishbig();
CIRCUIT_CUTTER = new BlockCircuitCutter();
SILICON_BLOCK = new Block(metalProps().requiresCorrectToolForDrops());
OVERSIZE_INTERFACE = new BlockOversizeInterface();
OVERSIZE_INTERFACE_PART = new PartItem<>(new Item.Properties(), PartOversizeInterface.class, PartOversizeInterface::new);
regHandler.block("ex_pattern_provider", EX_PATTERN_PROVIDER, TileExPatternProvider.class, TileExPatternProvider::new);
regHandler.block("ex_interface", EX_INTERFACE, TileExInterface.class, TileExInterface::new);
regHandler.block("wireless_connect", WIRELESS_CONNECTOR, TileWirelessConnector.class, TileWirelessConnector::new);
Expand All @@ -163,6 +170,7 @@ public static void init(RegistryHandler regHandler) {
regHandler.block("crystal_fixer", CRYSTAL_FIXER, TileCrystalFixer.class, TileCrystalFixer::new);
regHandler.block("ex_io_port", EX_IO_PORT, TileExIOPort.class, TileExIOPort::new);
regHandler.block("circuit_cutter", CIRCUIT_CUTTER, TileCircuitCutter.class, TileCircuitCutter::new);
regHandler.block("oversize_interface", OVERSIZE_INTERFACE, TileOversizeInterface.class, TileOversizeInterface::new);
regHandler.block("fishbig", FISHBIG);
regHandler.block("silicon_block", SILICON_BLOCK);
regHandler.item("ex_pattern_provider_part", EX_PATTERN_PROVIDER_PART);
Expand Down Expand Up @@ -190,6 +198,7 @@ public static void init(RegistryHandler regHandler) {
regHandler.item("precise_export_bus", PRECISE_EXPORT_BUS);
regHandler.item("precise_storage_bus", PRECISE_STORAGE_BUS);
regHandler.item("threshold_export_bus", THRESHOLD_EXPORT_BUS);
regHandler.item("oversize_interface_part", OVERSIZE_INTERFACE_PART);
}

}
Loading

0 comments on commit 4b13e10

Please sign in to comment.