Skip to content

Commit

Permalink
rename mod
Browse files Browse the repository at this point in the history
  • Loading branch information
brachy84 committed Jun 10, 2022
1 parent fd11ab9 commit aa1a8a7
Show file tree
Hide file tree
Showing 28 changed files with 75 additions and 70 deletions.
6 changes: 6 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
buildscript {
repositories {
maven {
name = "forge"
url = "https://maven.minecraftforge.net/"
}
maven {
url = 'https://maven.cleanroommc.com'
}
Expand Down Expand Up @@ -111,6 +115,8 @@ jar {
if (project.use_mixins.toBoolean()) {
attribute_map['TweakClass'] = 'org.spongepowered.asm.launch.MixinTweaker'
}
// false for dev and true for non dev
attribute_map['ForceLoadAsMod'] = false
attributes(attribute_map)
}
}
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
org.gradle.jvmargs = -Xmx3G

# Mod Information
mod_version = 1.0.1
maven_group = com.cleanroommc.invtweaks
archives_base_name = modid
mod_version = 1.0.0
maven_group = com.cleanroommc.bogosorter
archives_base_name = bogosorter

# If any properties changes below this line, run `gradlew setupDecompWorkspace` and refresh gradle again to ensure everything is working correctly.

Expand All @@ -16,4 +16,4 @@ use_assetmover = false

# Coremod Arguments
include_mod = true
coremod_plugin_class_name = com.cleanroommc.invtweaks.InventoryTweaksCore
coremod_plugin_class_name = com.cleanroommc.bogosorter.InventoryTweaksCore
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.cleanroommc.invtweaks;
package com.cleanroommc.bogosorter;

import com.cleanroommc.invtweaks.api.ISortableContainer;
import com.cleanroommc.invtweaks.api.InventoryTweaksAPI;
import com.cleanroommc.invtweaks.compat.DefaultCompat;
import com.cleanroommc.invtweaks.network.CSlotPosUpdate;
import com.cleanroommc.invtweaks.network.CSort;
import com.cleanroommc.invtweaks.network.NetworkHandler;
import com.cleanroommc.bogosorter.api.ISortableContainer;
import com.cleanroommc.bogosorter.api.InventoryTweaksAPI;
import com.cleanroommc.bogosorter.compat.DefaultCompat;
import com.cleanroommc.bogosorter.network.CSlotPosUpdate;
import com.cleanroommc.bogosorter.network.CSort;
import com.cleanroommc.bogosorter.network.NetworkHandler;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.inventory.Container;
Expand All @@ -19,12 +19,12 @@
import org.apache.logging.log4j.Logger;
import org.lwjgl.input.Mouse;

@Mod(modid = InventoryTweaks.ID, name = InventoryTweaks.NAME, version = InventoryTweaks.VERSION)
@Mod.EventBusSubscriber(modid = InventoryTweaks.ID)
public class InventoryTweaks {
@Mod(modid = BogoSorter.ID, name = BogoSorter.NAME, version = BogoSorter.VERSION)
@Mod.EventBusSubscriber(modid = BogoSorter.ID)
public class BogoSorter {

public static final String ID = "inventorytweaks";
public static final String NAME = "Brachy's Inventory Tweaks";
public static final String ID = "bogosorter";
public static final String NAME = "Inventory Bogo Sorter";
public static final String VERSION = "1.0.0";

public static final Logger LOGGER = LogManager.getLogger(ID);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cleanroommc.invtweaks;
package com.cleanroommc.bogosorter;

import net.minecraftforge.common.ForgeVersion;
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
Expand All @@ -9,9 +9,9 @@
import java.util.List;
import java.util.Map;

@IFMLLoadingPlugin.Name("InventoryTweaks-Core")
@IFMLLoadingPlugin.Name("BogoSorter-Core")
@IFMLLoadingPlugin.MCVersion(ForgeVersion.mcVersion)
public class InventoryTweaksCore implements IFMLLoadingPlugin, IEarlyMixinLoader {
public class BogoSorterCore implements IFMLLoadingPlugin, IEarlyMixinLoader {

@Override
public String[] getASMTransformerClass() {
Expand Down Expand Up @@ -40,7 +40,7 @@ public String getAccessTransformerClass() {

@Override
public List<String> getMixinConfigs() {
return Collections.singletonList("mixin.inventorytweaks.json");
return Collections.singletonList("mixin.bogosorter.json");
}

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cleanroommc.invtweaks;
package com.cleanroommc.bogosorter;

import com.google.common.collect.ImmutableList;
import net.minecraftforge.fml.common.Loader;
Expand All @@ -13,7 +13,7 @@ public class LateMixin implements ILateMixinLoader {

@Override
public List<String> getMixinConfigs() {
return modMixins.stream().map(mod -> "mixin.inventorytweaks." + mod + ".json").collect(Collectors.toList());
return modMixins.stream().map(mod -> "mixin.bogosorter." + mod + ".json").collect(Collectors.toList());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cleanroommc.invtweaks;
package com.cleanroommc.bogosorter;

import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
Expand All @@ -11,7 +11,7 @@

import java.util.*;

@Mod.EventBusSubscriber(modid = InventoryTweaks.ID)
@Mod.EventBusSubscriber(modid = BogoSorter.ID)
public class OreDictHelper {

private static final Hash.Strategy<ItemStack> ITEM_HASH_STRATEGY = new Hash.Strategy<ItemStack>() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cleanroommc.invtweaks.api;
package com.cleanroommc.bogosorter.api;

import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cleanroommc.invtweaks.api;
package com.cleanroommc.bogosorter.api;

import org.jetbrains.annotations.ApiStatus;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cleanroommc.invtweaks.api;
package com.cleanroommc.bogosorter.api;

import net.minecraft.inventory.Slot;
import org.jetbrains.annotations.ApiStatus;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cleanroommc.invtweaks.api;
package com.cleanroommc.bogosorter.api;

import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.cleanroommc.invtweaks.api;
package com.cleanroommc.bogosorter.api;

import com.cleanroommc.invtweaks.OreDictHelper;
import com.cleanroommc.invtweaks.sort.SortHandler;
import com.cleanroommc.bogosorter.OreDictHelper;
import com.cleanroommc.bogosorter.sort.SortHandler;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.*;
import net.minecraft.util.ResourceLocation;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cleanroommc.invtweaks.api;
package com.cleanroommc.bogosorter.api;

import net.minecraft.nbt.NBTBase;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cleanroommc.invtweaks.api;
package com.cleanroommc.bogosorter.api;

import java.util.Comparator;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cleanroommc.invtweaks.api;
package com.cleanroommc.bogosorter.api;

public enum SortType {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.cleanroommc.invtweaks.compat;
package com.cleanroommc.bogosorter.compat;

import com.cleanroommc.invtweaks.api.InventoryTweaksAPI;
import com.cleanroommc.bogosorter.api.InventoryTweaksAPI;
import net.minecraft.inventory.*;

public class DefaultCompat {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.cleanroommc.invtweaks.mixin;
package com.cleanroommc.bogosorter.mixin;

import com.cleanroommc.invtweaks.api.ISortableContainer;
import com.cleanroommc.invtweaks.api.ISortingContextBuilder;
import com.cleanroommc.bogosorter.api.ISortableContainer;
import com.cleanroommc.bogosorter.api.ISortingContextBuilder;
import net.minecraft.entity.passive.AbstractChestHorse;
import net.minecraft.entity.passive.AbstractHorse;
import net.minecraft.inventory.ContainerHorseInventory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.cleanroommc.invtweaks.mixin;
package com.cleanroommc.bogosorter.mixin;

import com.cleanroommc.invtweaks.api.ISortableContainer;
import com.cleanroommc.invtweaks.api.ISortingContextBuilder;
import com.cleanroommc.bogosorter.api.ISortableContainer;
import com.cleanroommc.bogosorter.api.ISortingContextBuilder;
import cpw.mods.ironchest.common.blocks.chest.IronChestType;
import cpw.mods.ironchest.common.gui.chest.ContainerIronChest;
import org.spongepowered.asm.mixin.Mixin;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.cleanroommc.invtweaks.mixin;
package com.cleanroommc.bogosorter.mixin;

import com.cleanroommc.invtweaks.api.ISortableContainer;
import com.cleanroommc.invtweaks.api.ISortingContextBuilder;
import com.cleanroommc.bogosorter.api.ISortableContainer;
import com.cleanroommc.bogosorter.api.ISortingContextBuilder;
import cpw.mods.ironchest.common.blocks.shulker.IronShulkerBoxType;
import cpw.mods.ironchest.common.gui.shulker.ContainerIronShulkerBox;
import org.spongepowered.asm.mixin.Mixin;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cleanroommc.invtweaks.network;
package com.cleanroommc.bogosorter.network;

import io.netty.buffer.Unpooled;
import net.minecraft.inventory.Container;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.cleanroommc.invtweaks.network;
package com.cleanroommc.bogosorter.network;

import com.cleanroommc.invtweaks.api.InventoryTweaksAPI;
import com.cleanroommc.invtweaks.sort.SortHandler;
import com.cleanroommc.bogosorter.api.InventoryTweaksAPI;
import com.cleanroommc.bogosorter.sort.SortHandler;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.network.NetHandlerPlayServer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cleanroommc.invtweaks.network;
package com.cleanroommc.bogosorter.network;

import io.netty.buffer.ByteBuf;
import net.minecraft.client.network.NetHandlerPlayClient;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.cleanroommc.invtweaks.network;
package com.cleanroommc.bogosorter.network;

import com.cleanroommc.invtweaks.InventoryTweaks;
import com.cleanroommc.bogosorter.BogoSorter;
import net.minecraft.client.network.NetHandlerPlayClient;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.NetHandlerPlayServer;
Expand All @@ -17,7 +17,7 @@
*/
public class NetworkHandler {

public static final SimpleNetworkWrapper network = NetworkRegistry.INSTANCE.newSimpleChannel(InventoryTweaks.ID);
public static final SimpleNetworkWrapper network = NetworkRegistry.INSTANCE.newSimpleChannel(BogoSorter.ID);
private static int packetId = 0;

public static void init() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.cleanroommc.invtweaks.network;
package com.cleanroommc.bogosorter.network;

import com.cleanroommc.invtweaks.InventoryTweaks;
import com.cleanroommc.bogosorter.BogoSorter;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import net.minecraft.client.entity.EntityPlayerSP;
Expand All @@ -15,7 +15,6 @@

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.function.Consumer;

public class NetworkUtils {
Expand Down Expand Up @@ -87,7 +86,7 @@ public static void writeStringSafe(PacketBuffer buffer, String string) {
if (bytesTest.length > 32767) {
bytes = new byte[32767];
System.arraycopy(bytesTest, 0, bytes, 0, 32767);
InventoryTweaks.LOGGER.warn("Warning! Synced string exceeds max length!");
BogoSorter.LOGGER.warn("Warning! Synced string exceeds max length!");
} else {
bytes = bytesTest;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.cleanroommc.invtweaks.sort;
package com.cleanroommc.bogosorter.sort;

import com.cleanroommc.invtweaks.api.ISortingContextBuilder;
import com.cleanroommc.bogosorter.api.ISortingContextBuilder;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import org.jetbrains.annotations.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.cleanroommc.invtweaks.sort;
package com.cleanroommc.bogosorter.sort;

import com.cleanroommc.invtweaks.api.*;
import com.cleanroommc.bogosorter.api.*;
import it.unimi.dsi.fastutil.Hash;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntOpenCustomHashMap;
Expand Down
10 changes: 5 additions & 5 deletions src/main/resources/mcmod.info
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[
{
"modid": "examplemod",
"name": "Example Mod",
"description": "Example placeholder mod.",
"modid": "bogosorter",
"name": "Inventory Bogo Sorter",
"description": "A highly configurable and advanced inventory sorter mod",
"version": "${version}",
"mcversion": "${mcversion}",
"url": "",
"updateUrl": "",
"authorList": ["CleanroomMC"],
"credits": "Authors of this project",
"authorList": ["brachy84"],
"credits": "Autor of InventoryTweaks",
"logoFile": "",
"screenshots": [],
"dependencies": []
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"package": "com.cleanroommc.invtweaks.mixin",
"refmap": "mixins.inventorytweaks.refmap.json",
"package": "com.cleanroommc.bogosorter.mixin",
"refmap": "mixins.bogosorter.refmap.json",
"target": "@env(DEFAULT)",
"minVersion": "0.8",
"compatibilityLevel": "JAVA_8",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"package": "com.cleanroommc.invtweaks.mixin",
"refmap": "mixins.inventorytweaks.refmap.json",
"package": "com.cleanroommc.bogosorter.mixin",
"refmap": "mixins.bogosorter.refmap.json",
"target": "@env(DEFAULT)",
"minVersion": "0.8",
"compatibilityLevel": "JAVA_8",
Expand Down

0 comments on commit aa1a8a7

Please sign in to comment.