Merge remote-tracking branch 'remotes/origin/1.12' into 1.13

# Conflicts:
#	build.gradle
#	src/main/java/techreborn/Core.java
#	src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java
#	src/main/java/techreborn/api/recipe/recipes/BlastFurnaceRecipe.java
#	src/main/java/techreborn/blocks/BlockMachineCasing.java
#	src/main/java/techreborn/blocks/cable/EnumCableType.java
#	src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java
#	src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
#	src/main/java/techreborn/blocks/transformers/BlockTransformer.java
#	src/main/java/techreborn/client/gui/GuiAESU.java
#	src/main/java/techreborn/client/gui/GuiManual.java
#	src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
#	src/main/java/techreborn/command/TechRebornDevCommand.java
#	src/main/java/techreborn/compat/jei/RecipeUtil.java
#	src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
#	src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java
#	src/main/java/techreborn/config/ConfigTechReborn.java
#	src/main/java/techreborn/init/IC2Duplicates.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/init/OreDict.java
#	src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
#	src/main/java/techreborn/init/recipes/FusionReactorRecipes.java
#	src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java
#	src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java
#	src/main/java/techreborn/init/recipes/SmeltingRecipes.java
#	src/main/java/techreborn/items/ItemUpgrades.java
#	src/main/java/techreborn/items/ingredients/ItemParts.java
#	src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java
#	src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java
#	src/main/java/techreborn/items/tools/ItemWrench.java
#	src/main/java/techreborn/tiles/TileAlarm.java
#	src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java
#	src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java
#	src/main/java/techreborn/tiles/generator/TileLightningRod.java
#	src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java
#	src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java
#	src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java
#	src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java
#	src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java
#	src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java
#	src/main/java/techreborn/tiles/machine/tier3/TileMatterFabricator.java
#	src/main/java/techreborn/tiles/storage/TileAdjustableSU.java
#	src/main/java/techreborn/world/TechRebornRetroGen.java
#	src/main/resources/assets/techreborn/blockstates/items/materials/part.json
#	src/main/resources/assets/techreborn/blockstates/items/misc/upgrades.json
This commit is contained in:
modmuss50 2019-04-27 20:32:56 +01:00
commit 6ab23c4c64
32 changed files with 668 additions and 54 deletions

View file

@ -24,17 +24,27 @@
package techreborn.packets;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.network.NetworkEvent;
import reborncore.common.network.ExtendedPacketBuffer;
import reborncore.common.network.NetworkManager;
import reborncore.common.network.NetworkPacket;
import techreborn.init.TRContent;
import techreborn.items.ItemManual;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import techreborn.tiles.machine.tier1.TileAutoCraftingTable;
import techreborn.tiles.machine.tier1.TileRollingMachine;
import techreborn.tiles.storage.TileAdjustableSU;
import techreborn.tiles.storage.idsu.TileInterdimensionalSU;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
public class ServerboundPackets {
public static final ResourceLocation AESU = new ResourceLocation("techreborn", "aesu");
@ -42,6 +52,7 @@ public class ServerboundPackets {
public static final ResourceLocation ROLLING_MACHINE_LOCK = new ResourceLocation("techreborn", "rolling_machine_lock");
public static final ResourceLocation FUSION_CONTROL_SIZE = new ResourceLocation("techreborn", "fusion_control_size");
public static final ResourceLocation IDSU = new ResourceLocation("techreborn", "idsu");
public static final ResourceLocation REFUND = new ResourceLocation("techreborn", "refund");
public static void init() {
NetworkManager.registerPacketHandler(AESU, (extendedPacketBuffer, context) -> {
@ -50,7 +61,7 @@ public class ServerboundPackets {
context.enqueueWork(() -> {
TileEntity tile = context.getSender().world.getTileEntity(pos);
if (tile instanceof TileAdjustableSU) {
((TileAdjustableSU) tile).handleGuiInputFromClient(buttonID);
((TileAdjustableSU) tile).handleGuiInputFromClient(buttonID, false, false);
}
});
});
@ -98,6 +109,26 @@ public class ServerboundPackets {
}
});
});
NetworkManager.registerPacketHandler(REFUND, (extendedPacketBuffer, context) -> {
if(!ItemManual.allowRefund){
return;
}
context.enqueueWork(() -> {
EntityPlayerMP playerMP = context.getSender();
for (int i = 0; i < playerMP.inventory.getSizeInventory(); i++) {
ItemStack stack = playerMP.inventory.getStackInSlot(i);
if (stack.getItem() == TRContent.MANUAL) {
playerMP.inventory.removeStackFromSlot(i);
playerMP.inventory.addItemStackToInventory(new ItemStack(Items.BOOK));
//TODO 1.13
//playerMP.inventory.addItemStackToInventory(OreUtil.getStackFromName("ingotRefinedIron"));
return;
}
}
});
});
}
public static NetworkPacket createPacketAesu(int buttonID, TileAdjustableSU tile) {
@ -135,4 +166,10 @@ public class ServerboundPackets {
});
}
public static NetworkPacket createRefundPacket(){
return NetworkManager.createPacket(REFUND, extendedPacketBuffer -> {
});
}
}