fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The Great Renamening of 2020

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-22 12:14:54 +02:00
parent abe3334488
commit b4471b1abb
441 changed files with 3395 additions and 3468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/integration/modules/jei/CondenserCategory.java
+2 -2
View File
@@ -47,7 +47,7 @@ import appeng.api.definitions.IMaterials;
import appeng.api.implementations.items.IStorageComponent;
import appeng.core.Api;
import appeng.core.AppEng;
import appeng.tile.misc.TileCondenser;
import appeng.tile.misc.CondenserTileEntity;
class CondenserCategory implements IRecipeCategory<CondenserOutput> {
@@ -177,7 +177,7 @@ class CondenserCategory implements IRecipeCategory<CondenserOutput> {
private void addViableComponent(CondenserOutput condenserOutput, List<ItemStack> viableComponents,
ItemStack itemStack) {
IStorageComponent comp = (IStorageComponent) itemStack.getItem();
int storage = comp.getBytes(itemStack) * TileCondenser.BYTE_MULTIPLIER;
int storage = comp.getBytes(itemStack) * CondenserTileEntity.BYTE_MULTIPLIER;
if (storage >= condenserOutput.requiredPower) {
viableComponents.add(itemStack);
}
src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java
+6 -6
View File
@@ -33,7 +33,7 @@ import mezz.jei.api.recipe.advanced.IRecipeManagerPlugin;
import mezz.jei.api.recipe.category.IRecipeCategory;
import appeng.core.AppEng;
import appeng.items.parts.ItemFacade;
import appeng.items.parts.FacadeItem;
/**
* This plugin will dynamically add facade recipes for any item that can be
@@ -41,11 +41,11 @@ import appeng.items.parts.ItemFacade;
*/
class FacadeRegistryPlugin implements IRecipeManagerPlugin {
private final ItemFacade itemFacade;
private final FacadeItem itemFacade;
private final ItemStack cableAnchor;
FacadeRegistryPlugin(ItemFacade itemFacade, ItemStack cableAnchor) {
FacadeRegistryPlugin(FacadeItem itemFacade, ItemStack cableAnchor) {
this.itemFacade = itemFacade;
this.cableAnchor = cableAnchor;
}
@@ -55,7 +55,7 @@ class FacadeRegistryPlugin implements IRecipeManagerPlugin {
if (focus.getMode() == IFocus.Mode.OUTPUT && focus.getValue() instanceof ItemStack) {
// Looking up how a certain facade is crafted
ItemStack itemStack = (ItemStack) focus.getValue();
if (itemStack.getItem() instanceof ItemFacade) {
if (itemStack.getItem() instanceof FacadeItem) {
return Collections.singletonList(VanillaRecipeCategoryUid.CRAFTING);
}
} else if (focus.getMode() == IFocus.Mode.INPUT && focus.getValue() instanceof ItemStack) {
@@ -80,8 +80,8 @@ class FacadeRegistryPlugin implements IRecipeManagerPlugin {
if (focus.getMode() == IFocus.Mode.OUTPUT && focus.getValue() instanceof ItemStack) {
// Looking up how a certain facade is crafted
ItemStack itemStack = (ItemStack) focus.getValue();
if (itemStack.getItem() instanceof ItemFacade) {
ItemFacade facadeItem = (ItemFacade) itemStack.getItem();
if (itemStack.getItem() instanceof FacadeItem) {
FacadeItem facadeItem = (FacadeItem) itemStack.getItem();
ItemStack textureItem = facadeItem.getTextureItem(itemStack);
return Collections.singletonList((T) make(textureItem, this.cableAnchor, itemStack));
}
src/main/java/appeng/integration/modules/jei/JEIPlugin.java
+6 -6
View File
@@ -41,13 +41,13 @@ import appeng.api.definitions.IDefinitions;
import appeng.api.definitions.IItemDefinition;
import appeng.api.definitions.IMaterials;
import appeng.api.features.AEFeature;
import appeng.container.implementations.ContainerCraftingTerm;
import appeng.container.implementations.ContainerPatternTerm;
import appeng.container.implementations.CraftingTermContainer;
import appeng.container.implementations.PatternTermContainer;
import appeng.core.AEConfig;
import appeng.core.AppEng;
import appeng.core.localization.GuiText;
import appeng.integration.abstraction.JEIFacade;
import appeng.items.parts.ItemFacade;
import appeng.items.parts.FacadeItem;
import appeng.recipes.handlers.GrinderRecipe;
import appeng.recipes.handlers.InscriberRecipe;
@@ -76,9 +76,9 @@ public class JEIPlugin implements IModPlugin {
@Override
public void registerRecipeTransferHandlers(IRecipeTransferRegistration registration) {
// Allow recipe transfer from JEI to crafting and pattern terminal
registration.addRecipeTransferHandler(new RecipeTransferHandler<>(ContainerCraftingTerm.class),
registration.addRecipeTransferHandler(new RecipeTransferHandler<>(CraftingTermContainer.class),
VanillaRecipeCategoryUid.CRAFTING);
registration.addRecipeTransferHandler(new RecipeTransferHandler<>(ContainerPatternTerm.class),
registration.addRecipeTransferHandler(new RecipeTransferHandler<>(PatternTermContainer.class),
VanillaRecipeCategoryUid.CRAFTING);
}
@@ -160,7 +160,7 @@ public class JEIPlugin implements IModPlugin {
IDefinitions definitions = AEApi.instance().definitions();
if (AEConfig.instance().isFeatureEnabled(AEFeature.ENABLE_FACADE_CRAFTING)) {
ItemFacade itemFacade = (ItemFacade) definitions.items().facade().item();
FacadeItem itemFacade = (FacadeItem) definitions.items().facade().item();
ItemStack cableAnchor = definitions.parts().cableAnchor().stack(1);
registration.addRecipeManagerPlugin(new FacadeRegistryPlugin(itemFacade, cableAnchor));
}
src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java
+5 -5
View File
@@ -36,10 +36,10 @@ import mezz.jei.api.gui.ingredient.IGuiIngredient;
import mezz.jei.api.recipe.transfer.IRecipeTransferError;
import mezz.jei.api.recipe.transfer.IRecipeTransferHandler;
import appeng.container.slot.SlotCraftingMatrix;
import appeng.container.slot.SlotFakeCraftingMatrix;
import appeng.container.slot.CraftingMatrixSlot;
import appeng.container.slot.FakeCraftingMatrixSlot;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketJEIRecipe;
import appeng.core.sync.packets.JEIRecipePacket;
import appeng.util.Platform;
class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandler<T> {
@@ -76,7 +76,7 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
}
for (final Slot slot : container.inventorySlots) {
if (slot instanceof SlotCraftingMatrix || slot instanceof SlotFakeCraftingMatrix) {
if (slot instanceof CraftingMatrixSlot || slot instanceof FakeCraftingMatrixSlot) {
if (slot.getSlotIndex() == slotIndex) {
final ListNBT tags = new ListNBT();
final List<ItemStack> list = new ArrayList<>();
@@ -111,7 +111,7 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
slotIndex++;
}
NetworkHandler.instance().sendToServer(new PacketJEIRecipe(recipe));
NetworkHandler.instance().sendToServer(new JEIRecipePacket(recipe));
return null;
}