Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove creative chemical cell (AE2 has a universal creative cell now) #56

Merged
merged 1 commit into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/main/java/me/ramidzkh/mekae2/AMItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.registries.DeferredHolder;
import net.neoforged.neoforge.registries.DeferredItem;
Expand All @@ -22,7 +21,6 @@
import appeng.items.materials.MaterialItem;
import appeng.items.parts.PartItem;
import appeng.items.parts.PartModelsHelper;
import appeng.items.storage.CreativeCellItem;
import appeng.items.storage.StorageTier;

public class AMItems {
Expand Down Expand Up @@ -68,9 +66,6 @@ private static Item.Properties properties() {
public static final DeferredItem<Item> CHEMICAL_CELL_HOUSING = ITEMS.register("chemical_cell_housing",
AMItems::basic);

public static final DeferredItem<Item> CHEMICAL_CELL_CREATIVE = ITEMS.register("creative_chemical_cell",
() -> new CreativeCellItem(properties().stacksTo(1).rarity(Rarity.EPIC)));

public static final DeferredItem<Item> CHEMICAL_CELL_1K = ITEMS.register("chemical_storage_cell_1k",
() -> new ChemicalStorageCell(properties().stacksTo(1), StorageTier.SIZE_1K, CHEMICAL_CELL_HOUSING.get()));
public static final DeferredItem<Item> CHEMICAL_CELL_4K = ITEMS.register("chemical_storage_cell_4k",
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/me/ramidzkh/mekae2/AppliedMekanistics.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import appeng.api.storage.cells.ICellHandler;
import appeng.api.upgrades.Upgrades;
import appeng.capabilities.AppEngCapabilities;
import appeng.core.AppEng;
import appeng.core.definitions.AEItems;
import appeng.core.localization.GuiText;
import appeng.menu.MenuOpener;
Expand Down Expand Up @@ -138,9 +137,6 @@ public void openChestGui(Player player, IChestOrDrive chest, ICellHandler cellHa
}
});

StorageCellModels.registerModel(AMItems.CHEMICAL_CELL_CREATIVE::get,
AppEng.makeId("block/drive/cells/creative_cell"));

for (var tier : AMItems.Tier.values()) {
var cell = AMItems.get(tier);
var portable = AMItems.getPortableCell(tier);
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/me/ramidzkh/mekae2/data/ItemModelProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ protected void registerModels() {
var housing = AMItems.CHEMICAL_CELL_HOUSING;
flatSingleLayer(housing, "item/" + housing.getId().getPath());

var creative = AMItems.CHEMICAL_CELL_CREATIVE;
flatSingleLayer(creative, "item/" + creative.getId().getPath());

for (var tier : AMItems.Tier.values()) {
var cell = AMItems.get(tier);
var portableCell = AMItems.getPortableCell(tier);
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/appmek/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"text.appmek.qio_frequency": "QIO Frequency (%s)",

"item.appmek.chemical_cell_housing": "ME Chemical Cell Housing",
"item.appmek.creative_chemical_cell": "Creative ME Chemical Cell",

"item.appmek.chemical_storage_cell_1k": "1k ME Chemical Storage Cell",
"item.appmek.chemical_storage_cell_4k": "4k ME Chemical Storage Cell",
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/appmek/lang/ko_kr.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"text.appmek.qio_frequency": "QIO 주파수 (%s)",

"item.appmek.chemical_cell_housing": "빈 ME 화학 저장 셀",
"item.appmek.creative_chemical_cell": "크리에이티브 ME 화학 저장 셀",

"item.appmek.chemical_storage_cell_1k": "1k ME 화학 저장 셀",
"item.appmek.chemical_storage_cell_4k": "4k ME 화학 저장 셀",
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/appmek/lang/pt_br.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"text.appmek.qio_frequency": "OIQ Frequência (%s)",

"item.appmek.chemical_cell_housing": "Cápsula para Células de Armazenamento de Químicos",
"item.appmek.creative_chemical_cell": "Célula Criativa de Armazenamento de Químicos",

"item.appmek.chemical_storage_cell_1k": "Célula de Armazenamento de 1k para Químicos",
"item.appmek.chemical_storage_cell_4k": "Célula de Armazenamento de 4k para Químicos",
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/appmek/lang/ru_ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"text.appmek.qio_frequency": "Переодичность QIO (%s)",

"item.appmek.chemical_cell_housing": "Корпус химической ячейки ME",
"item.appmek.creative_chemical_cell": "Творческая химическая ячейка ME",

"item.appmek.chemical_storage_cell_1k": "Химическая ячейка памяти ME 1К",
"item.appmek.chemical_storage_cell_4k": "Химическая ячейка памяти ME 4К",
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/appmek/lang/zh_cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"text.appmek.qio_frequency": "QIO 频率 (%s)",

"item.appmek.chemical_cell_housing": "ME 化学品元件外壳",
"item.appmek.creative_chemical_cell": "创造 ME 化学品元件",

"item.appmek.chemical_storage_cell_1k": "1k ME 化学品存储元件",
"item.appmek.chemical_storage_cell_4k": "4k ME 化学品存储元件",
Expand Down
Binary file not shown.
Loading