Skip to content

Commit

Permalink
Fix weird rebase conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
thecatcore committed Dec 22, 2024
1 parent 68cd062 commit d66cda2
Showing 4 changed files with 2 additions and 73 deletions.
Original file line number Diff line number Diff line change
@@ -15,21 +15,13 @@
* limitations under the License.
*/

<<<<<<<< HEAD:legacy-fabric-item-groups-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinScreen.java
package net.legacyfabric.fabric.mixin.item.group.client;

========
package net.legacyfabric.fabric.mixin.block.versioned;

import java.util.Map;

>>>>>>>> e3850eb4 (New Block module):legacy-fabric-block-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/block/versioned/ItemAccessor.java
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.Shadow;

import net.minecraft.client.gui.screen.Screen;

<<<<<<<< HEAD:legacy-fabric-item-groups-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinScreen.java
import net.legacyfabric.fabric.impl.item.group.ScreenAccessor;

@Mixin(Screen.class)
@@ -40,12 +32,5 @@ public abstract class MixinScreen implements ScreenAccessor {
@Override
public void callRenderTooltip(String text, int x, int y) {
this.renderTooltip(text, x, y);
========
@Mixin(Item.class)
public interface ItemAccessor {
@Accessor
static Map<Block, Item> getBLOCK_ITEMS() {
return null;
>>>>>>>> e3850eb4 (New Block module):legacy-fabric-block-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/block/versioned/ItemAccessor.java
}
}
Original file line number Diff line number Diff line change
@@ -15,16 +15,11 @@
* limitations under the License.
*/

<<<<<<<< HEAD:legacy-fabric-item-groups-v1/1.6.4/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/HandledScreenMixin.java
package net.legacyfabric.fabric.mixin.item.group.client;
========
package net.legacyfabric.fabric.mixin.block.versioned;
>>>>>>>> e3850eb4 (New Block module):legacy-fabric-block-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/block/versioned/BlockAccessor.java

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.Shadow;

<<<<<<<< HEAD:legacy-fabric-item-groups-v1/1.6.4/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/HandledScreenMixin.java
import net.minecraft.client.gui.screen.ingame.HandledScreen;

import net.legacyfabric.fabric.impl.item.group.ScreenAccessor;
@@ -37,16 +32,5 @@ public abstract class HandledScreenMixin implements ScreenAccessor {
@Override
public void callRenderTooltip(String text, int x, int y) {
this.method_1128(text, x, y);
========
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.util.collection.IdList;

@Mixin(Block.class)
public interface BlockAccessor {
@Accessor
static void setBLOCK_STATES(IdList<BlockState> blockStates) {

>>>>>>>> e3850eb4 (New Block module):legacy-fabric-block-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/block/versioned/BlockAccessor.java
}
}
Original file line number Diff line number Diff line change
@@ -15,20 +15,13 @@
* limitations under the License.
*/

<<<<<<<< HEAD:legacy-fabric-lifecycle-events-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/event/lifecycle/client/versioned/MinecraftClientMixin.java
package net.legacyfabric.fabric.mixin.event.lifecycle.client.versioned;
========
package net.legacyfabric.fabric.mixin.block.versioned;
>>>>>>>> e3850eb4 (New Block module):legacy-fabric-block-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/block/versioned/BlockMixin.java

import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

<<<<<<<< HEAD:legacy-fabric-lifecycle-events-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/event/lifecycle/client/versioned/MinecraftClientMixin.java
import net.minecraft.client.MinecraftClient;

import net.fabricmc.api.EnvType;
@@ -42,23 +35,5 @@ public class MinecraftClientMixin {
@Inject(at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;info(Ljava/lang/String;)V", shift = At.Shift.AFTER, remap = false), method = "stop")
private void api$onStopping(CallbackInfo ci) {
ClientLifecycleEvents.CLIENT_STOPPING.invoker().onClientStopping((MinecraftClient) (Object) this);
========
import net.minecraft.block.Block;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.BiDefaultedRegistry;

import net.legacyfabric.fabric.api.registry.v2.RegistryHelper;
import net.legacyfabric.fabric.api.registry.v2.RegistryIds;

@Mixin(Block.class)
public class BlockMixin {
@Shadow
@Final
public static BiDefaultedRegistry<Identifier, Block> REGISTRY;

@Inject(method = "setup", at = @At("RETURN"))
private static void registerRegistry(CallbackInfo ci) {
RegistryHelper.addRegistry(RegistryIds.BLOCKS, REGISTRY);
>>>>>>>> e3850eb4 (New Block module):legacy-fabric-block-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/block/versioned/BlockMixin.java
}
}
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@
* limitations under the License.
*/

<<<<<<<< HEAD:legacy-fabric-permissions-api-v1/1.6.4/src/main/java/net/legacyfabric/fabric/mixin/permission/CommandBlockExecutorMixin.java
package net.legacyfabric.fabric.mixin.permission;

import org.spongepowered.asm.mixin.Mixin;
@@ -30,18 +29,4 @@ public abstract class CommandBlockExecutorMixin implements PermissibleCommandSou
public boolean hasPermission(String perm) {
return true;
}
========
package net.legacyfabric.fabric.mixin.block.versioned;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;

import net.minecraft.block.Block;
import net.minecraft.item.BlockItem;

@Mixin(BlockItem.class)
public interface BlockItemAccessor {
@Accessor
Block getBlock();
>>>>>>>> e3850eb4 (New Block module):legacy-fabric-block-api-v1/1.7.10/src/main/java/net/legacyfabric/fabric/mixin/block/versioned/BlockItemAccessor.java
}

0 comments on commit d66cda2

Please sign in to comment.