diff --git a/README.md b/README.md index b71947e..94f34c9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# BCx-modern +# CE-modern -Minecraft 1.2.5 時代の BuildCraft × Equivalent Exchange アドオン「BCx」を、Minecraft 1.7.10 (Forge 10.13.4.1614) 向けに移植したものです。 +mod「CE」を Minecraft 1.7.10 (Forge 10.13.4.1614) 向けに移植したものです。 ## 追加要素 diff --git a/gradle.properties b/gradle.properties index a3da546..0d596ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,15 +3,15 @@ gtnh.settings.blowdryerTag = 0.2.2 # Human-readable mod name, available for mcmod.info population. -modName = BCx-modern +modName = CE-modern # Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation. # Conventionally lowercase. -modId = bcxmodern +modId = cemodern # Root package of the mod, used to find various classes in other properties, # mcmod.info substitution, enabling assertions in run tasks, etc. -modGroup = net.kanawo.bcxmodern +modGroup = net.kanawo.cemodern # Whether to use modGroup as the maven publishing group. # When false, com.github.GTNewHorizons is used. @@ -74,7 +74,7 @@ enableGenericInjection = true # Generate a class with a String field for the mod version named as defined below. # If generateGradleTokenClass is empty or not missing, no such class will be generated. # If gradleTokenVersion is empty or missing, the field will not be present in the class. -generateGradleTokenClass = net.kanawo.bcxmodern.Tags +generateGradleTokenClass = net.kanawo.cemodern.Tags # Name of the token containing the project's current version to generate/replace. gradleTokenVersion = VERSION diff --git a/src/main/java/net/kanawo/bcxmodern/BCxModern.java b/src/main/java/net/kanawo/cemodern/CEModern.java similarity index 71% rename from src/main/java/net/kanawo/bcxmodern/BCxModern.java rename to src/main/java/net/kanawo/cemodern/CEModern.java index 57206bc..c1a09c3 100644 --- a/src/main/java/net/kanawo/bcxmodern/BCxModern.java +++ b/src/main/java/net/kanawo/cemodern/CEModern.java @@ -1,4 +1,4 @@ -package net.kanawo.bcxmodern; +package net.kanawo.cemodern; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -9,20 +9,20 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @Mod( - modid = BCxModern.MODID, + modid = CEModern.MODID, version = Tags.VERSION, - name = "BCx-modern", + name = "CE-modern", acceptedMinecraftVersions = "[1.7.10]", dependencies = "required-after:BuildCraft|Builders;required-after:ProjectE") -public class BCxModern { +public class CEModern { - public static final String MODID = "bcxmodern"; + public static final String MODID = "cemodern"; public static final Logger LOG = LogManager.getLogger(MODID); @Mod.Instance(MODID) - public static BCxModern instance; + public static CEModern instance; - @SidedProxy(clientSide = "net.kanawo.bcxmodern.ClientProxy", serverSide = "net.kanawo.bcxmodern.CommonProxy") + @SidedProxy(clientSide = "net.kanawo.cemodern.ClientProxy", serverSide = "net.kanawo.cemodern.CommonProxy") public static CommonProxy proxy; @Mod.EventHandler diff --git a/src/main/java/net/kanawo/bcxmodern/ClientProxy.java b/src/main/java/net/kanawo/cemodern/ClientProxy.java similarity index 88% rename from src/main/java/net/kanawo/bcxmodern/ClientProxy.java rename to src/main/java/net/kanawo/cemodern/ClientProxy.java index d8bb16a..a5de47d 100644 --- a/src/main/java/net/kanawo/bcxmodern/ClientProxy.java +++ b/src/main/java/net/kanawo/cemodern/ClientProxy.java @@ -1,6 +1,6 @@ -package net.kanawo.bcxmodern; +package net.kanawo.cemodern; -import net.kanawo.bcxmodern.tile.TileEMCBuilder; +import net.kanawo.cemodern.tile.TileEMCBuilder; import buildcraft.core.render.RenderBuilder; import cpw.mods.fml.client.registry.ClientRegistry; diff --git a/src/main/java/net/kanawo/bcxmodern/CommonProxy.java b/src/main/java/net/kanawo/cemodern/CommonProxy.java similarity index 70% rename from src/main/java/net/kanawo/bcxmodern/CommonProxy.java rename to src/main/java/net/kanawo/cemodern/CommonProxy.java index 3888a05..ad97bc0 100644 --- a/src/main/java/net/kanawo/bcxmodern/CommonProxy.java +++ b/src/main/java/net/kanawo/cemodern/CommonProxy.java @@ -1,9 +1,9 @@ -package net.kanawo.bcxmodern; +package net.kanawo.cemodern; -import net.kanawo.bcxmodern.block.BlockEMCBuilder; -import net.kanawo.bcxmodern.block.SchematicEMCBuilder; -import net.kanawo.bcxmodern.gui.GuiHandler; -import net.kanawo.bcxmodern.tile.TileEMCBuilder; +import net.kanawo.cemodern.block.BlockEMCBuilder; +import net.kanawo.cemodern.block.SchematicEMCBuilder; +import net.kanawo.cemodern.gui.GuiHandler; +import net.kanawo.cemodern.tile.TileEMCBuilder; import net.minecraft.item.ItemStack; import buildcraft.BuildCraftBuilders; @@ -21,11 +21,11 @@ public class CommonProxy { public void preInit(FMLPreInitializationEvent event) { emcBuilderBlock = new BlockEMCBuilder(); GameRegistry.registerBlock(emcBuilderBlock, "emcBuilder"); - GameRegistry.registerTileEntity(TileEMCBuilder.class, BCxModern.MODID + ":EMCBuilder"); + GameRegistry.registerTileEntity(TileEMCBuilder.class, CEModern.MODID + ":EMCBuilder"); } public void init(FMLInitializationEvent event) { - NetworkRegistry.INSTANCE.registerGuiHandler(BCxModern.instance, new GuiHandler()); + NetworkRegistry.INSTANCE.registerGuiHandler(CEModern.instance, new GuiHandler()); BuilderAPI.schematicRegistry.registerSchematicBlock(emcBuilderBlock, SchematicEMCBuilder.class); diff --git a/src/main/java/net/kanawo/bcxmodern/block/BlockEMCBuilder.java b/src/main/java/net/kanawo/cemodern/block/BlockEMCBuilder.java similarity index 90% rename from src/main/java/net/kanawo/bcxmodern/block/BlockEMCBuilder.java rename to src/main/java/net/kanawo/cemodern/block/BlockEMCBuilder.java index a113e44..84d6e50 100644 --- a/src/main/java/net/kanawo/bcxmodern/block/BlockEMCBuilder.java +++ b/src/main/java/net/kanawo/cemodern/block/BlockEMCBuilder.java @@ -1,8 +1,8 @@ -package net.kanawo.bcxmodern.block; +package net.kanawo.cemodern.block; -import net.kanawo.bcxmodern.BCxModern; -import net.kanawo.bcxmodern.gui.GuiHandler; -import net.kanawo.bcxmodern.tile.TileEMCBuilder; +import net.kanawo.cemodern.CEModern; +import net.kanawo.cemodern.gui.GuiHandler; +import net.kanawo.cemodern.tile.TileEMCBuilder; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -21,7 +21,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockEMCBuilder extends BlockBuilder { - private static final String TEXTURE_PREFIX = BCxModern.MODID + ":emcbuilderBlock"; + private static final String TEXTURE_PREFIX = CEModern.MODID + ":emcbuilderBlock"; public BlockEMCBuilder() { super(); @@ -68,7 +68,7 @@ public class BlockEMCBuilder extends BlockBuilder { boolean filledTank = builder != null && TankUtils.handleRightClick(builder, ForgeDirection.UNKNOWN, player, true, false); if (!filledTank && !world.isRemote) { - player.openGui(BCxModern.instance, GuiHandler.EMC_BUILDER, world, x, y, z); + player.openGui(CEModern.instance, GuiHandler.EMC_BUILDER, world, x, y, z); } return true; diff --git a/src/main/java/net/kanawo/bcxmodern/block/SchematicEMCBuilder.java b/src/main/java/net/kanawo/cemodern/block/SchematicEMCBuilder.java similarity index 86% rename from src/main/java/net/kanawo/bcxmodern/block/SchematicEMCBuilder.java rename to src/main/java/net/kanawo/cemodern/block/SchematicEMCBuilder.java index cdb9eb6..7460e76 100644 --- a/src/main/java/net/kanawo/bcxmodern/block/SchematicEMCBuilder.java +++ b/src/main/java/net/kanawo/cemodern/block/SchematicEMCBuilder.java @@ -1,6 +1,6 @@ -package net.kanawo.bcxmodern.block; +package net.kanawo.cemodern.block; -import net.kanawo.bcxmodern.tile.TileEMCBuilder; +import net.kanawo.cemodern.tile.TileEMCBuilder; import buildcraft.builders.schematics.SchematicBuilderLike; diff --git a/src/main/java/net/kanawo/bcxmodern/gui/ContainerEMCBuilder.java b/src/main/java/net/kanawo/cemodern/gui/ContainerEMCBuilder.java similarity index 97% rename from src/main/java/net/kanawo/bcxmodern/gui/ContainerEMCBuilder.java rename to src/main/java/net/kanawo/cemodern/gui/ContainerEMCBuilder.java index c1ce828..31a97f7 100644 --- a/src/main/java/net/kanawo/bcxmodern/gui/ContainerEMCBuilder.java +++ b/src/main/java/net/kanawo/cemodern/gui/ContainerEMCBuilder.java @@ -1,6 +1,6 @@ -package net.kanawo.bcxmodern.gui; +package net.kanawo.cemodern.gui; -import net.kanawo.bcxmodern.tile.TileEMCBuilder; +import net.kanawo.cemodern.tile.TileEMCBuilder; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/net/kanawo/bcxmodern/gui/GuiEMCBuilder.java b/src/main/java/net/kanawo/cemodern/gui/GuiEMCBuilder.java similarity index 98% rename from src/main/java/net/kanawo/bcxmodern/gui/GuiEMCBuilder.java rename to src/main/java/net/kanawo/cemodern/gui/GuiEMCBuilder.java index 139a63b..da9183b 100644 --- a/src/main/java/net/kanawo/bcxmodern/gui/GuiEMCBuilder.java +++ b/src/main/java/net/kanawo/cemodern/gui/GuiEMCBuilder.java @@ -1,10 +1,10 @@ -package net.kanawo.bcxmodern.gui; +package net.kanawo.cemodern.gui; import java.util.ArrayList; import java.util.List; -import net.kanawo.bcxmodern.BCxModern; -import net.kanawo.bcxmodern.tile.TileEMCBuilder; +import net.kanawo.cemodern.CEModern; +import net.kanawo.cemodern.tile.TileEMCBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.inventory.IInventory; @@ -34,7 +34,7 @@ public class GuiEMCBuilder extends GuiAdvancedInterface { /** BuildCraft's builder.png with the EMC consume slot added. */ private static final ResourceLocation REGULAR_TEXTURE = new ResourceLocation( - BCxModern.MODID, + CEModern.MODID, "textures/gui/emcbuilder.png"); private static final ResourceLocation BLUEPRINT_TEXTURE = new ResourceLocation( "buildcraftbuilders:textures/gui/builder_blueprint.png"); @@ -69,7 +69,7 @@ public class GuiEMCBuilder extends GuiAdvancedInterface { drawCenteredString( StatCollector.translateToLocalFormatted( - "gui.bcxmodern.stored", + "gui.cemodern.stored", Constants.EMC_FORMATTER.format(builder.getStoredEmc())), 178 / 2, 51, diff --git a/src/main/java/net/kanawo/bcxmodern/gui/GuiHandler.java b/src/main/java/net/kanawo/cemodern/gui/GuiHandler.java similarity index 93% rename from src/main/java/net/kanawo/bcxmodern/gui/GuiHandler.java rename to src/main/java/net/kanawo/cemodern/gui/GuiHandler.java index 5bf2b82..3b45eba 100644 --- a/src/main/java/net/kanawo/bcxmodern/gui/GuiHandler.java +++ b/src/main/java/net/kanawo/cemodern/gui/GuiHandler.java @@ -1,6 +1,6 @@ -package net.kanawo.bcxmodern.gui; +package net.kanawo.cemodern.gui; -import net.kanawo.bcxmodern.tile.TileEMCBuilder; +import net.kanawo.cemodern.tile.TileEMCBuilder; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/net/kanawo/bcxmodern/gui/SlotEMCConsume.java b/src/main/java/net/kanawo/cemodern/gui/SlotEMCConsume.java similarity index 92% rename from src/main/java/net/kanawo/bcxmodern/gui/SlotEMCConsume.java rename to src/main/java/net/kanawo/cemodern/gui/SlotEMCConsume.java index 451bd60..12323ec 100644 --- a/src/main/java/net/kanawo/bcxmodern/gui/SlotEMCConsume.java +++ b/src/main/java/net/kanawo/cemodern/gui/SlotEMCConsume.java @@ -1,6 +1,6 @@ -package net.kanawo.bcxmodern.gui; +package net.kanawo.cemodern.gui; -import net.kanawo.bcxmodern.tile.TileEMCBuilder; +import net.kanawo.cemodern.tile.TileEMCBuilder; import net.minecraft.inventory.InventoryBasic; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/net/kanawo/bcxmodern/tile/EmcPool.java b/src/main/java/net/kanawo/cemodern/tile/EmcPool.java similarity index 95% rename from src/main/java/net/kanawo/bcxmodern/tile/EmcPool.java rename to src/main/java/net/kanawo/cemodern/tile/EmcPool.java index 323bd16..7035592 100644 --- a/src/main/java/net/kanawo/bcxmodern/tile/EmcPool.java +++ b/src/main/java/net/kanawo/cemodern/tile/EmcPool.java @@ -1,4 +1,4 @@ -package net.kanawo.bcxmodern.tile; +package net.kanawo.cemodern.tile; import java.util.HashMap; import java.util.Map; @@ -12,13 +12,13 @@ import net.minecraft.world.storage.MapStorage; import net.minecraftforge.common.util.Constants; /** - * EMC stored for EMC Builders, one balance per player, saved with the world (data/bcxmodern_emc.dat). All + * EMC stored for EMC Builders, one balance per player, saved with the world (data/cemodern_emc.dat). All * dimensions of a world share the same storage, so every EMC Builder a player owns in the world draws from the same * balance. Server side only. */ public class EmcPool extends WorldSavedData { - private static final String NAME = "bcxmodern_emc"; + private static final String NAME = "cemodern_emc"; private static final double MAX_EMC = moze_intel.projecte.utils.Constants.TILE_MAX_EMC; private final Map balances = new HashMap<>(); diff --git a/src/main/java/net/kanawo/bcxmodern/tile/TileEMCBuilder.java b/src/main/java/net/kanawo/cemodern/tile/TileEMCBuilder.java similarity index 99% rename from src/main/java/net/kanawo/bcxmodern/tile/TileEMCBuilder.java rename to src/main/java/net/kanawo/cemodern/tile/TileEMCBuilder.java index c57b95f..f3c4cbe 100644 --- a/src/main/java/net/kanawo/bcxmodern/tile/TileEMCBuilder.java +++ b/src/main/java/net/kanawo/cemodern/tile/TileEMCBuilder.java @@ -1,4 +1,4 @@ -package net.kanawo.bcxmodern.tile; +package net.kanawo.cemodern.tile; import java.util.ArrayList; import java.util.List; diff --git a/src/main/resources/assets/bcxmodern/lang/en_US.lang b/src/main/resources/assets/cemodern/lang/en_US.lang similarity index 53% rename from src/main/resources/assets/bcxmodern/lang/en_US.lang rename to src/main/resources/assets/cemodern/lang/en_US.lang index 9ab8f7f..f9dc91e 100644 --- a/src/main/resources/assets/bcxmodern/lang/en_US.lang +++ b/src/main/resources/assets/cemodern/lang/en_US.lang @@ -1,2 +1,2 @@ tile.emcBuilder.name=EMC Builder -gui.bcxmodern.stored=EMC: %s +gui.cemodern.stored=EMC: %s diff --git a/src/main/resources/assets/bcxmodern/lang/ja_JP.lang b/src/main/resources/assets/cemodern/lang/ja_JP.lang similarity index 56% rename from src/main/resources/assets/bcxmodern/lang/ja_JP.lang rename to src/main/resources/assets/cemodern/lang/ja_JP.lang index 0d50dc2..39f19ce 100644 --- a/src/main/resources/assets/bcxmodern/lang/ja_JP.lang +++ b/src/main/resources/assets/cemodern/lang/ja_JP.lang @@ -1,2 +1,2 @@ tile.emcBuilder.name=EMCビルダー -gui.bcxmodern.stored=EMC: %s +gui.cemodern.stored=EMC: %s diff --git a/src/main/resources/assets/bcxmodern/textures/blocks/emcbuilderBlock/front.png b/src/main/resources/assets/cemodern/textures/blocks/emcbuilderBlock/front.png similarity index 100% rename from src/main/resources/assets/bcxmodern/textures/blocks/emcbuilderBlock/front.png rename to src/main/resources/assets/cemodern/textures/blocks/emcbuilderBlock/front.png diff --git a/src/main/resources/assets/bcxmodern/textures/blocks/emcbuilderBlock/side.png b/src/main/resources/assets/cemodern/textures/blocks/emcbuilderBlock/side.png similarity index 100% rename from src/main/resources/assets/bcxmodern/textures/blocks/emcbuilderBlock/side.png rename to src/main/resources/assets/cemodern/textures/blocks/emcbuilderBlock/side.png diff --git a/src/main/resources/assets/bcxmodern/textures/blocks/emcbuilderBlock/top.png b/src/main/resources/assets/cemodern/textures/blocks/emcbuilderBlock/top.png similarity index 100% rename from src/main/resources/assets/bcxmodern/textures/blocks/emcbuilderBlock/top.png rename to src/main/resources/assets/cemodern/textures/blocks/emcbuilderBlock/top.png diff --git a/src/main/resources/assets/bcxmodern/textures/gui/emcbuilder.png b/src/main/resources/assets/cemodern/textures/gui/emcbuilder.png similarity index 100% rename from src/main/resources/assets/bcxmodern/textures/gui/emcbuilder.png rename to src/main/resources/assets/cemodern/textures/gui/emcbuilder.png diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index e3386ae..eeca212 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,13 +3,13 @@ "modList": [{ "modid": "${modId}", "name": "${modName}", - "description": "A Minecraft 1.7.10 port of BCx, a BuildCraft x Equivalent Exchange addon from the 1.2.5 era. Adds the EMC Builder, a BuildCraft Builder that pays for its materials with EMC.", + "description": "A Minecraft 1.7.10 port of CE. Adds the EMC Builder, a BuildCraft Builder that pays for its materials with EMC.", "version": "${modVersion}", "mcversion": "${minecraftVersion}", "url": "", "updateUrl": "", "authorList": ["agomizi1cm"], - "credits": "Original BCx for Minecraft 1.2.5. Built on BuildCraft and ProjectE.", + "credits": "Original CE. Built on BuildCraft and ProjectE.", "logoFile": "", "screenshots": [], "parent": "",