Added spotless back and reformatted
This commit is contained in:
Sebastian Hartte
@@ -20,14 +20,14 @@ package appeng.hooks;
|
||||
|
||||
import net.minecraft.block.DispenserBlock;
|
||||
import net.minecraft.block.dispenser.ItemDispenserBehavior;
|
||||
import net.minecraft.util.math.BlockPointer;
|
||||
import net.minecraft.item.AutomaticItemPlacementContext;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemUsageContext;
|
||||
import net.minecraft.server.world.ServerWorld;
|
||||
import net.minecraft.util.math.BlockPointer;
|
||||
import net.minecraft.util.math.Direction;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.server.world.ServerWorld;
|
||||
|
||||
public final class BlockToolDispenseItemBehavior extends ItemDispenserBehavior {
|
||||
|
||||
@@ -40,8 +40,8 @@ public final class BlockToolDispenseItemBehavior extends ItemDispenserBehavior {
|
||||
|
||||
final World w = dispenser.getWorld();
|
||||
if (w instanceof ServerWorld) {
|
||||
ItemUsageContext context = new AutomaticItemPlacementContext(w, dispenser.getBlockPos().offset(direction),
|
||||
direction, dispensedItem, direction.getOpposite());
|
||||
ItemUsageContext context = new AutomaticItemPlacementContext(w,
|
||||
dispenser.getBlockPos().offset(direction), direction, dispensedItem, direction.getOpposite());
|
||||
tm.useOnBlock(context);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
package appeng.hooks;
|
||||
|
||||
import appeng.core.Api;
|
||||
import appeng.api.parts.CableRenderMode;
|
||||
import appeng.client.AppEngClient;
|
||||
import appeng.util.Platform;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import appeng.api.parts.CableRenderMode;
|
||||
import appeng.client.AppEngClient;
|
||||
import appeng.core.Api;
|
||||
import appeng.util.Platform;
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
public class ClientTickHandler extends TickHandler {
|
||||
|
||||
@@ -8,6 +8,7 @@ import net.minecraft.world.gen.chunk.ChunkGenerator;
|
||||
|
||||
public interface DynamicDimensions {
|
||||
|
||||
ServerWorld addWorld(RegistryKey<World> worldId, RegistryKey<DimensionType> dimensionTypeId, ChunkGenerator chunkGenerator);
|
||||
ServerWorld addWorld(RegistryKey<World> worldId, RegistryKey<DimensionType> dimensionTypeId,
|
||||
ChunkGenerator chunkGenerator);
|
||||
|
||||
}
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
package appeng.hooks;
|
||||
|
||||
import alexiil.mc.lib.attributes.fluid.FluidAttributes;
|
||||
import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
|
||||
import appeng.client.render.DummyFluidBakedModel;
|
||||
import appeng.fluids.items.FluidDummyItem;
|
||||
import appeng.items.misc.EncodedPatternItem;
|
||||
import appeng.mixins.ItemRendererAccessor;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.render.item.ItemRenderer;
|
||||
@@ -20,6 +15,14 @@ import net.minecraft.fluid.Fluids;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import alexiil.mc.lib.attributes.fluid.FluidAttributes;
|
||||
import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
|
||||
|
||||
import appeng.client.render.DummyFluidBakedModel;
|
||||
import appeng.fluids.items.FluidDummyItem;
|
||||
import appeng.items.misc.EncodedPatternItem;
|
||||
import appeng.mixins.ItemRendererAccessor;
|
||||
|
||||
public final class ItemRendererHooks {
|
||||
|
||||
// Prevents recursion in the hook below
|
||||
@@ -29,8 +32,8 @@ public final class ItemRendererHooks {
|
||||
}
|
||||
|
||||
/**
|
||||
* This hook will exchange the rendered item model for encoded patterns to the item being crafted by them
|
||||
* if shift is held.
|
||||
* This hook will exchange the rendered item model for encoded patterns to the
|
||||
* item being crafted by them if shift is held.
|
||||
*/
|
||||
public static boolean onRenderGuiItemModel(ItemRenderer renderer, ItemStack stack, int x, int y, BakedModel model) {
|
||||
if (OVERRIDING_FOR.get() == stack) {
|
||||
@@ -44,8 +47,7 @@ public final class ItemRendererHooks {
|
||||
EncodedPatternItem iep = (EncodedPatternItem) stack.getItem();
|
||||
ItemStack output = iep.getOutput(world, stack);
|
||||
if (!output.isEmpty()) {
|
||||
BakedModel realModel = MinecraftClient.getInstance().getItemRenderer().getModels()
|
||||
.getModel(output);
|
||||
BakedModel realModel = MinecraftClient.getInstance().getItemRenderer().getModels().getModel(output);
|
||||
renderInstead(renderer, stack, x, y, realModel);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -18,19 +18,19 @@
|
||||
|
||||
package appeng.hooks;
|
||||
|
||||
import appeng.util.FakePlayer;
|
||||
import net.minecraft.block.DispenserBlock;
|
||||
import net.minecraft.block.dispenser.ItemDispenserBehavior;
|
||||
import net.minecraft.util.math.BlockPointer;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.server.world.ServerWorld;
|
||||
import net.minecraft.util.math.BlockPointer;
|
||||
import net.minecraft.util.math.Direction;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.server.world.ServerWorld;
|
||||
|
||||
import appeng.api.util.AEPartLocation;
|
||||
import appeng.items.tools.powered.MatterCannonItem;
|
||||
import appeng.util.FakePlayer;
|
||||
import appeng.util.Platform;
|
||||
|
||||
public final class MatterCannonDispenseItemBehavior extends ItemDispenserBehavior {
|
||||
|
||||
@@ -6,11 +6,12 @@ import net.minecraft.util.registry.RegistryTracker;
|
||||
|
||||
public interface RegisterDimensionTypeCallback {
|
||||
|
||||
Event<RegisterDimensionTypeCallback> EVENT = EventFactory.createArrayBacked(RegisterDimensionTypeCallback.class, (listeners) -> (registryTracker) -> {
|
||||
for (RegisterDimensionTypeCallback listener : listeners) {
|
||||
listener.addDimensionTypes(registryTracker);
|
||||
}
|
||||
});
|
||||
Event<RegisterDimensionTypeCallback> EVENT = EventFactory.createArrayBacked(RegisterDimensionTypeCallback.class,
|
||||
(listeners) -> (registryTracker) -> {
|
||||
for (RegisterDimensionTypeCallback listener : listeners) {
|
||||
listener.addDimensionTypes(registryTracker);
|
||||
}
|
||||
});
|
||||
|
||||
void addDimensionTypes(RegistryTracker.Modifiable registryTracker);
|
||||
|
||||
|
||||
@@ -18,26 +18,6 @@
|
||||
|
||||
package appeng.hooks;
|
||||
|
||||
import appeng.api.networking.IGridNode;
|
||||
import appeng.api.util.AEColor;
|
||||
import appeng.core.AEConfig;
|
||||
import appeng.core.AELog;
|
||||
import appeng.core.sync.packets.PaintedEntityPacket;
|
||||
import appeng.crafting.CraftingJob;
|
||||
import appeng.me.Grid;
|
||||
import appeng.tile.AEBaseBlockEntity;
|
||||
import appeng.util.IWorldCallable;
|
||||
import appeng.util.Platform;
|
||||
import com.google.common.base.Stopwatch;
|
||||
import com.google.common.collect.LinkedListMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
|
||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.world.ServerWorld;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldAccess;
|
||||
|
||||
import java.util.ArrayDeque;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
@@ -51,6 +31,28 @@ import java.util.Set;
|
||||
import java.util.WeakHashMap;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import com.google.common.base.Stopwatch;
|
||||
import com.google.common.collect.LinkedListMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
|
||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.world.ServerWorld;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldAccess;
|
||||
|
||||
import appeng.api.networking.IGridNode;
|
||||
import appeng.api.util.AEColor;
|
||||
import appeng.core.AEConfig;
|
||||
import appeng.core.AELog;
|
||||
import appeng.core.sync.packets.PaintedEntityPacket;
|
||||
import appeng.crafting.CraftingJob;
|
||||
import appeng.me.Grid;
|
||||
import appeng.tile.AEBaseBlockEntity;
|
||||
import appeng.util.IWorldCallable;
|
||||
import appeng.util.Platform;
|
||||
|
||||
public class TickHandler {
|
||||
|
||||
private static TickHandler INSTANCE;
|
||||
@@ -155,8 +157,8 @@ public class TickHandler {
|
||||
// FIXME FABRIC }
|
||||
|
||||
/**
|
||||
* This is primarily useful for an integrated server being stopped, and can be fully replaced by the event
|
||||
* above once world unload events hit.
|
||||
* This is primarily useful for an integrated server being stopped, and can be
|
||||
* fully replaced by the event above once world unload events hit.
|
||||
*/
|
||||
private void onServerStopping(MinecraftServer server) {
|
||||
final List<IGridNode> toDestroy = new ArrayList<>();
|
||||
@@ -187,7 +189,7 @@ public class TickHandler {
|
||||
final int jobSize = jobSet.size();
|
||||
final int microSecondsPerTick = AEConfig.instance().getCraftingCalculationTimePerTick() * 1000;
|
||||
final int simTime = Math.max(1, microSecondsPerTick / jobSize);
|
||||
final Iterator<CraftingJob> i = jobSet.iterator();
|
||||
final Iterator<CraftingJob> i = jobSet.iterator();
|
||||
while (i.hasNext()) {
|
||||
final CraftingJob cj = i.next();
|
||||
if (!cj.simulateFor(simTime)) {
|
||||
|
||||
@@ -20,8 +20,8 @@ package appeng.hooks;
|
||||
|
||||
import net.minecraft.block.DispenserBlock;
|
||||
import net.minecraft.block.dispenser.ItemDispenserBehavior;
|
||||
import net.minecraft.util.math.BlockPointer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPointer;
|
||||
import net.minecraft.util.math.Direction;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
|
||||
@@ -11,8 +11,8 @@ import net.minecraft.util.hit.BlockHitResult;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
/**
|
||||
* This hooks allows item-specific behavior to be triggered when an item is used on a block,
|
||||
* without shift being held or the block being called first.
|
||||
* This hooks allows item-specific behavior to be triggered when an item is used
|
||||
* on a block, without shift being held or the block being called first.
|
||||
*/
|
||||
public class ToolItemHook {
|
||||
|
||||
@@ -20,7 +20,8 @@ public class ToolItemHook {
|
||||
UseBlockCallback.EVENT.register(ToolItemHook::handleItemUse);
|
||||
}
|
||||
|
||||
private static ActionResult handleItemUse(PlayerEntity playerEntity, World world, Hand hand, BlockHitResult blockHitResult) {
|
||||
private static ActionResult handleItemUse(PlayerEntity playerEntity, World world, Hand hand,
|
||||
BlockHitResult blockHitResult) {
|
||||
|
||||
if (playerEntity.isSpectator()) {
|
||||
return ActionResult.PASS;
|
||||
|
||||
Reference in New Issue
Block a user