From 5f813ed4c261d6437484853d0182dc62decbd226 Mon Sep 17 00:00:00 2001 From: Chen Wu <201436728@qq.com> Date: Fri, 1 Jul 2016 22:47:23 +0800 Subject: [PATCH] Rename to Dawn Craft Mod.And update to B0.10 Rename to Dawn Craft Mod.And update to B0.10. Then I fixed some bugs. --- .gitattributes | 17 - .gitignore | 78 +-- LICENSE-fml.txt | 491 ++++++++++++++++++ LICENSE-forge.txt | 70 +++ README.md | 15 +- README.txt | 59 +++ build.gradle | 10 +- gradle.properties | 9 + .../science/client/ItemRenderLoader.java | 13 - .../achievement/AchievementLoader.java | 9 +- .../dawncraft}/block/BlockComputer.java | 15 +- .../block/BlockElectricityFurnace.java | 5 +- .../dawncraft}/block/BlockFluidPetroleum.java | 6 +- .../dawncraft}/block/BlockLoader.java | 10 +- .../dawncraft}/block/BlockMachineFurnace.java | 5 +- .../dawncraft}/block/BlockMagnetBlock.java | 4 +- .../dawncraft}/block/BlockMagnetOre.java | 10 +- .../dawncraft}/block/BlockWchest.java | 8 +- .../dawncraft}/client/ClientProxy.java | 8 +- .../dawncraft}/client/FluidRenderLoader.java | 4 +- .../dawncraft/client/ItemRenderLoader.java | 13 + .../dawncraft}/common/CommonProxy.java | 20 +- .../dawncraft}/common/ConfigLoader.java | 2 +- .../dawncraft}/common/EventLoader.java | 19 +- .../dawncraft}/crafting/CraftingLoader.java | 7 +- .../creativetab/CreativeTabsLoader.java | 9 +- .../github/wdawning/dawncraft/dawncraft.java} | 21 +- .../dawncraft}/entity/EntityFlanBomb.java | 16 +- .../dawncraft}/entity/EntityGerKing.java | 5 +- .../dawncraft}/entity/EntityLoader.java | 10 +- .../dawncraft}/entity/EntityMagnetBall.java | 2 +- .../dawncraft}/entity/EntityMouse.java | 4 +- .../dawncraft}/entity/EntityRenderLoader.java | 4 +- .../dawncraft}/entity/EntitySavage.java | 10 +- .../dawncraft}/entity/FakePlayerLoader.java | 4 +- .../dawncraft}/entity/ModelMouse.java | 2 +- .../dawncraft}/entity/RenderGerKing.java | 6 +- .../dawncraft}/entity/RenderMouse.java | 7 +- .../dawncraft}/entity/RenderSavage.java | 7 +- .../dawncraft}/fluid/FluidLoader.java | 8 +- .../dawncraft}/fluid/FluidPetroleum.java | 8 +- .../dawncraft}/item/ItemBrainDead.java | 6 +- .../dawncraft}/item/ItemBucketPetroleum.java | 8 +- .../wdawning/dawncraft}/item/ItemCakeEgg.java | 5 +- .../dawncraft}/item/ItemComputerCPU.java | 4 +- .../wdawning/dawncraft}/item/ItemFaeces.java | 4 +- .../wdawning/dawncraft}/item/ItemFlan.java | 5 +- .../wdawning/dawncraft}/item/ItemFlanRPG.java | 8 +- .../dawncraft}/item/ItemFlanRPGRocket.java | 5 +- .../dawncraft}/item/ItemGerHeart.java | 7 +- .../dawncraft}/item/ItemGoldiamondSword.java | 4 +- .../wdawning/dawncraft}/item/ItemLoader.java | 8 +- .../wdawning/dawncraft}/item/ItemMagnet.java | 5 +- .../dawncraft}/item/ItemMagnetArmor.java | 4 +- .../dawncraft}/item/ItemMagnetBall.java | 7 +- .../dawncraft}/item/ItemMagnetCard.java | 5 +- .../dawncraft}/item/ItemMagnetIngot.java | 4 +- .../dawncraft}/item/ItemMagnetStick.java | 5 +- .../dawncraft}/item/ItemMagnetSword.java | 4 +- .../dawncraft}/potion/PotionBadGer.java | 10 +- .../dawncraft}/potion/PotionBrainDead.java | 10 +- .../dawncraft}/potion/PotionGerPower.java | 10 +- .../dawncraft}/potion/PotionLoader.java | 4 +- .../worldgen/WorldGeneratorLoader.java | 4 +- .../dawncraft/blockstates/ele_furnace.json | 12 + .../blockstates/fluid_petroleum.json | 0 .../dawncraft/blockstates/high_computer.json | 5 + .../dawncraft/blockstates/iron_furnace.json | 12 + .../dawncraft/blockstates/magnet_block.json | 5 + .../dawncraft/blockstates/magnet_ore.json | 5 + .../dawncraft/blockstates/pro_computer.json | 5 + .../blockstates/simple_computer.json | 5 + .../dawncraft/blockstates/super_computer.json | 5 + .../{wcscience => dawncraft}/lang/en_US.lang | 0 .../{wcscience => dawncraft}/lang/zh_CN.lang | 0 .../models/block/case.json | 0 .../dawncraft/models/block/ele_furnace.json | 8 + .../models/block/ele_furnace_burning.json | 8 + .../dawncraft/models/block/high_computer.json | 12 + .../dawncraft/models/block/iron_furnace.json | 8 + .../models/block/iron_furnace_burning.json | 8 + .../models/block/magnet_block.json | 2 +- .../models/block/magnet_ore.json | 2 +- .../models/block/petroleum.json | 2 +- .../dawncraft/models/block/pro_computer.json | 12 + .../models/block/simple_computer.json | 12 + .../models/block/super_computer.json | 12 + .../models/item/brain_dead.json | 2 +- .../models/item/cake_egg.json | 2 +- .../models/item/ele_furnace.json | 2 +- .../models/item/faeces.json | 2 +- .../models/item/flan_RPG.json | 2 +- .../models/item/flan_RPG_rocket.json | 2 +- .../models/item/ger_heart.json | 2 +- .../models/item/goldiamond_sword.json | 2 +- .../models/item/high_CPU.json | 2 +- .../models/item/high_computer.json | 2 +- .../models/item/iron_furnace.json | 2 +- .../models/item/magnet.json | 2 +- .../models/item/magnet_ball.json | 2 +- .../models/item/magnet_block.json | 2 +- .../models/item/magnet_boots.json | 2 +- .../models/item/magnet_card.json | 2 +- .../models/item/magnet_chestplate.json | 2 +- .../models/item/magnet_helmet.json | 2 +- .../models/item/magnet_ingot.json | 2 +- .../models/item/magnet_leggings.json | 2 +- .../models/item/magnet_ore.json | 2 +- .../models/item/magnet_stick.json | 2 +- .../models/item/magnet_sword.json | 2 +- .../models/item/petroleum_bucket.json | 2 +- .../models/item/pro_CPU.json | 2 +- .../models/item/pro_computer.json | 2 +- .../models/item/simple_CPU.json | 2 +- .../models/item/simple_computer.json | 2 +- .../models/item/super_CPU.json | 2 +- .../dawncraft/models/item/super_chest.json | 3 + .../models/item/super_computer.json | 2 +- .../blocks/computer/high_computer_down.png | Bin .../blocks/computer/high_computer_north.png | Bin .../blocks/computer/high_computer_side.png | Bin .../blocks/computer/high_computer_south.png | Bin .../blocks/computer/high_computer_up.png | Bin .../blocks/computer/pro_computer_down.png | Bin .../blocks/computer/pro_computer_north.png | Bin .../blocks/computer/pro_computer_side.png | Bin .../blocks/computer/pro_computer_south.png | Bin .../blocks/computer/pro_computer_up.png | Bin .../blocks/computer/simple_computer_down.png | Bin .../blocks/computer/simple_computer_north.png | Bin .../blocks/computer/simple_computer_side.png | Bin .../blocks/computer/simple_computer_south.png | Bin .../blocks/computer/simple_computer_up.png | Bin .../blocks/computer/super_computer_down.png | Bin .../blocks/computer/super_computer_north.png | Bin .../blocks/computer/super_computer_side.png | Bin .../blocks/computer/super_computer_south.png | Bin .../blocks/computer/super_computer_up.png | Bin .../electricity/electricity_furnace_off.png | Bin .../electricity/electricity_furnace_on.png | Bin .../electricity/electricity_furnace_side.png | Bin .../blocks/machine/iron_furnace_off.png | Bin .../blocks/machine/iron_furnace_on.png | Bin .../blocks/machine/iron_furnace_top.png | Bin .../textures/blocks/magnet_block.png | Bin .../textures/blocks/magnet_ore.png | Bin .../textures/entity/ger_king.png | Bin .../textures/entity/mouse.png | Bin .../textures/entity/savage.png | Bin .../textures/entity/wchest/super_chest.png | Bin .../textures/entity/wchest/super_chest_on.png | Bin .../textures/fluid/petroleum_flow.png | Bin .../textures/fluid/petroleum_flow.png.mcmeta | 0 .../textures/fluid/petroleum_still.png | Bin .../textures/fluid/petroleum_still.png.mcmeta | 0 .../textures/gui/potion.png | Bin .../textures/items/brain_dead.png | Bin .../textures/items/cake_egg.png | Bin .../textures/items/computer/high_CPU.png | Bin .../textures/items/computer/pro_CPU.png | Bin .../textures/items/computer/simple_CPU.png | Bin .../textures/items/computer/super_CPU.png | Bin .../textures/items/faeces.png | Bin .../textures/items/flans/AK47.png | Bin .../textures/items/flans/C4.png | Bin .../textures/items/flans/M4A1.png | Bin .../textures/items/flans/MP5.png | Bin .../textures/items/flans/Minigun.png | Bin .../textures/items/flans/Railgun.png | Bin .../textures/items/flans/flan_RPG.png | Bin .../textures/items/flans/flan_RPG_rocket.png | Bin .../textures/items/ger_heart.png | Bin .../textures/items/goldiamond_sword.png | Bin .../textures/items/ice_sward.png | Bin .../textures/items/magnet.png | Bin .../textures/items/magnet_ball.png | Bin .../textures/items/magnet_boots.png | Bin .../textures/items/magnet_card.png | Bin .../textures/items/magnet_chestplate.png | Bin .../textures/items/magnet_helmet.png | Bin .../textures/items/magnet_ingot.png | Bin .../textures/items/magnet_leggings.png | Bin .../textures/items/magnet_stick.png | Bin .../textures/items/magnet_sword.png | Bin .../textures/items/petroleum_bucket.png | Bin .../textures/items/wrench.png | Bin .../textures/models/armor/magnet_layer_1.png | Bin .../textures/models/armor/magnet_layer_2.png | Bin .../textures/wdawning_logo.png | Bin .../wcscience/blockstates/ele_furnace.json | 12 - .../wcscience/blockstates/high_computer.json | 5 - .../wcscience/blockstates/iron_furnace.json | 12 - .../wcscience/blockstates/magnet_block.json | 5 - .../wcscience/blockstates/magnet_ore.json | 5 - .../wcscience/blockstates/pro_computer.json | 5 - .../blockstates/simple_computer.json | 5 - .../wcscience/blockstates/super_computer.json | 5 - .../wcscience/models/block/ele_furnace.json | 8 - .../models/block/ele_furnace_burning.json | 8 - .../wcscience/models/block/high_computer.json | 12 - .../wcscience/models/block/iron_furnace.json | 8 - .../models/block/iron_furnace_burning.json | 8 - .../wcscience/models/block/pro_computer.json | 12 - .../models/block/simple_computer.json | 12 - .../models/block/super_computer.json | 12 - .../models/item/flan_RPG_bomb_model.json | 18 - .../wcscience/models/item/super_chest.json | 3 - src/main/resources/mcmod.info | 16 +- 208 files changed, 1043 insertions(+), 497 deletions(-) delete mode 100644 .gitattributes create mode 100644 LICENSE-fml.txt create mode 100644 LICENSE-forge.txt create mode 100644 README.txt create mode 100644 gradle.properties delete mode 100644 src/main/java/WdawningStudio/DawnW/science/client/ItemRenderLoader.java rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/achievement/AchievementLoader.java (70%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/block/BlockComputer.java (88%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/block/BlockElectricityFurnace.java (95%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/block/BlockFluidPetroleum.java (61%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/block/BlockLoader.java (92%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/block/BlockMachineFurnace.java (95%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/block/BlockMagnetBlock.java (80%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/block/BlockMagnetOre.java (60%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/block/BlockWchest.java (71%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/client/ClientProxy.java (75%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/client/FluidRenderLoader.java (74%) create mode 100644 src/main/java/com/github/wdawning/dawncraft/client/ItemRenderLoader.java rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/common/CommonProxy.java (58%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/common/ConfigLoader.java (95%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/common/EventLoader.java (84%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/crafting/CraftingLoader.java (95%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/creativetab/CreativeTabsLoader.java (91%) rename src/main/java/{WdawningStudio/DawnW/science/science.java => com/github/wdawning/dawncraft/dawncraft.java} (58%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/entity/EntityFlanBomb.java (59%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/entity/EntityGerKing.java (78%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/entity/EntityLoader.java (92%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/entity/EntityMagnetBall.java (95%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/entity/EntityMouse.java (76%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/entity/EntityRenderLoader.java (54%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/entity/EntitySavage.java (83%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/entity/FakePlayerLoader.java (95%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/entity/ModelMouse.java (98%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/entity/RenderGerKing.java (89%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/entity/RenderMouse.java (88%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/entity/RenderSavage.java (85%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/fluid/FluidLoader.java (90%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/fluid/FluidPetroleum.java (78%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemBrainDead.java (82%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemBucketPetroleum.java (72%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemCakeEgg.java (71%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemComputerCPU.java (90%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemFaeces.java (90%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemFlan.java (84%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemFlanRPG.java (77%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemFlanRPGRocket.java (71%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemGerHeart.java (79%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemGoldiamondSword.java (72%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemLoader.java (94%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemMagnet.java (64%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemMagnetArmor.java (91%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemMagnetBall.java (84%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemMagnetCard.java (69%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemMagnetIngot.java (68%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemMagnetStick.java (68%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/item/ItemMagnetSword.java (70%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/potion/PotionBadGer.java (72%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/potion/PotionBrainDead.java (72%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/potion/PotionGerPower.java (72%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/potion/PotionLoader.java (95%) rename src/main/java/{WdawningStudio/DawnW/science => com/github/wdawning/dawncraft}/worldgen/WorldGeneratorLoader.java (94%) create mode 100644 src/main/resources/assets/dawncraft/blockstates/ele_furnace.json rename src/main/resources/assets/{wcscience => dawncraft}/blockstates/fluid_petroleum.json (100%) create mode 100644 src/main/resources/assets/dawncraft/blockstates/high_computer.json create mode 100644 src/main/resources/assets/dawncraft/blockstates/iron_furnace.json create mode 100644 src/main/resources/assets/dawncraft/blockstates/magnet_block.json create mode 100644 src/main/resources/assets/dawncraft/blockstates/magnet_ore.json create mode 100644 src/main/resources/assets/dawncraft/blockstates/pro_computer.json create mode 100644 src/main/resources/assets/dawncraft/blockstates/simple_computer.json create mode 100644 src/main/resources/assets/dawncraft/blockstates/super_computer.json rename src/main/resources/assets/{wcscience => dawncraft}/lang/en_US.lang (100%) rename src/main/resources/assets/{wcscience => dawncraft}/lang/zh_CN.lang (100%) rename src/main/resources/assets/{wcscience => dawncraft}/models/block/case.json (100%) create mode 100644 src/main/resources/assets/dawncraft/models/block/ele_furnace.json create mode 100644 src/main/resources/assets/dawncraft/models/block/ele_furnace_burning.json create mode 100644 src/main/resources/assets/dawncraft/models/block/high_computer.json create mode 100644 src/main/resources/assets/dawncraft/models/block/iron_furnace.json create mode 100644 src/main/resources/assets/dawncraft/models/block/iron_furnace_burning.json rename src/main/resources/assets/{wcscience => dawncraft}/models/block/magnet_block.json (55%) rename src/main/resources/assets/{wcscience => dawncraft}/models/block/magnet_ore.json (56%) rename src/main/resources/assets/{wcscience => dawncraft}/models/block/petroleum.json (57%) create mode 100644 src/main/resources/assets/dawncraft/models/block/pro_computer.json create mode 100644 src/main/resources/assets/dawncraft/models/block/simple_computer.json create mode 100644 src/main/resources/assets/dawncraft/models/block/super_computer.json rename src/main/resources/assets/{wcscience => dawncraft}/models/item/brain_dead.json (89%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/cake_egg.json (90%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/ele_furnace.json (81%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/faeces.json (90%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/flan_RPG.json (88%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/flan_RPG_rocket.json (87%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/ger_heart.json (89%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/goldiamond_sword.json (88%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/high_CPU.json (88%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/high_computer.json (80%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/iron_furnace.json (80%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/magnet.json (90%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/magnet_ball.json (89%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/magnet_block.json (80%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/magnet_boots.json (89%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/magnet_card.json (89%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/magnet_chestplate.json (88%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/magnet_helmet.json (89%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/magnet_ingot.json (89%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/magnet_leggings.json (88%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/magnet_ore.json (81%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/magnet_stick.json (89%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/magnet_sword.json (89%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/petroleum_bucket.json (88%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/pro_CPU.json (88%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/pro_computer.json (80%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/simple_CPU.json (87%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/simple_computer.json (79%) rename src/main/resources/assets/{wcscience => dawncraft}/models/item/super_CPU.json (88%) create mode 100644 src/main/resources/assets/dawncraft/models/item/super_chest.json rename src/main/resources/assets/{wcscience => dawncraft}/models/item/super_computer.json (80%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/high_computer_down.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/high_computer_north.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/high_computer_side.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/high_computer_south.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/high_computer_up.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/pro_computer_down.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/pro_computer_north.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/pro_computer_side.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/pro_computer_south.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/pro_computer_up.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/simple_computer_down.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/simple_computer_north.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/simple_computer_side.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/simple_computer_south.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/simple_computer_up.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/super_computer_down.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/super_computer_north.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/super_computer_side.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/super_computer_south.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/computer/super_computer_up.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/electricity/electricity_furnace_off.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/electricity/electricity_furnace_on.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/electricity/electricity_furnace_side.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/machine/iron_furnace_off.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/machine/iron_furnace_on.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/machine/iron_furnace_top.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/magnet_block.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/blocks/magnet_ore.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/entity/ger_king.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/entity/mouse.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/entity/savage.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/entity/wchest/super_chest.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/entity/wchest/super_chest_on.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/fluid/petroleum_flow.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/fluid/petroleum_flow.png.mcmeta (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/fluid/petroleum_still.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/fluid/petroleum_still.png.mcmeta (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/gui/potion.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/brain_dead.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/cake_egg.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/computer/high_CPU.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/computer/pro_CPU.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/computer/simple_CPU.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/computer/super_CPU.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/faeces.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/flans/AK47.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/flans/C4.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/flans/M4A1.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/flans/MP5.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/flans/Minigun.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/flans/Railgun.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/flans/flan_RPG.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/flans/flan_RPG_rocket.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/ger_heart.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/goldiamond_sword.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/ice_sward.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/magnet.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/magnet_ball.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/magnet_boots.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/magnet_card.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/magnet_chestplate.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/magnet_helmet.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/magnet_ingot.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/magnet_leggings.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/magnet_stick.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/magnet_sword.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/petroleum_bucket.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/items/wrench.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/models/armor/magnet_layer_1.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/models/armor/magnet_layer_2.png (100%) rename src/main/resources/assets/{wcscience => dawncraft}/textures/wdawning_logo.png (100%) delete mode 100644 src/main/resources/assets/wcscience/blockstates/ele_furnace.json delete mode 100644 src/main/resources/assets/wcscience/blockstates/high_computer.json delete mode 100644 src/main/resources/assets/wcscience/blockstates/iron_furnace.json delete mode 100644 src/main/resources/assets/wcscience/blockstates/magnet_block.json delete mode 100644 src/main/resources/assets/wcscience/blockstates/magnet_ore.json delete mode 100644 src/main/resources/assets/wcscience/blockstates/pro_computer.json delete mode 100644 src/main/resources/assets/wcscience/blockstates/simple_computer.json delete mode 100644 src/main/resources/assets/wcscience/blockstates/super_computer.json delete mode 100644 src/main/resources/assets/wcscience/models/block/ele_furnace.json delete mode 100644 src/main/resources/assets/wcscience/models/block/ele_furnace_burning.json delete mode 100644 src/main/resources/assets/wcscience/models/block/high_computer.json delete mode 100644 src/main/resources/assets/wcscience/models/block/iron_furnace.json delete mode 100644 src/main/resources/assets/wcscience/models/block/iron_furnace_burning.json delete mode 100644 src/main/resources/assets/wcscience/models/block/pro_computer.json delete mode 100644 src/main/resources/assets/wcscience/models/block/simple_computer.json delete mode 100644 src/main/resources/assets/wcscience/models/block/super_computer.json delete mode 100644 src/main/resources/assets/wcscience/models/item/flan_RPG_bomb_model.json delete mode 100644 src/main/resources/assets/wcscience/models/item/super_chest.json diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index bdb0cab..0000000 --- a/.gitattributes +++ /dev/null @@ -1,17 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index 3b73988..c53ee16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,55 +1,23 @@ -# TXT -*.txt - -# others -*.setting -*.classpath -*.project - -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# ========================= -# Operating System Files -# ========================= - -# OSX -# ========================= - -.DS_Store -.AppleDouble -.LSOverride - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk +# exclude all +/* + +# include sourcecode +!src/ + +# need gradle +!gradle/ +!gradlew +!gradlew.bat +!build.gradle +!gradle.properties + +# include markdowns +!LICENSE +!LICENSE-fml.txt +!LICENSE-forge.txt +!README.txt +!README.md + +# include git important files +!.gitmodules +!.gitignore \ No newline at end of file diff --git a/LICENSE-fml.txt b/LICENSE-fml.txt new file mode 100644 index 0000000..26cca07 --- /dev/null +++ b/LICENSE-fml.txt @@ -0,0 +1,491 @@ +This minecraft mod, Forge Mod Loader, including all parts herein except as noted below, +is licensed under the GNU LGPL v2.1 or later. + +Homepage: https://github.com/MinecraftForge/FML + +This software includes portions from the Apache Maven project at +http://maven.apache.org/ specifically the ComparableVersion.java code. It is +included based on guidelines at +http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html +with notices intact. The only change is a non-functional change of package name. + +This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating +binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ +authored by genman, heikok, pivot. +The only changes are to replace some Trove collection types with standard Java collections, and repackaged. + + +=== MCP Data === +This software includes data from the Minecraft Coder Pack (MCP), with kind permission +from them. The license to MCP data is not transitive - distribution of this data by +third parties requires independent licensing from the MCP team. This data is not +redistributable without permission from the MCP team. + +=== Sharing === +I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of +the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. + +-- Runtime patcher -- +License is granted to redistribute the runtime patcher code (common/cpw/mods/fml/patcher and subdirectories) under +any alternative open source license as classified by the OSI (http://opensource.org/licenses) + +-- ASM transformers -- +License is granted to redistribute the ASM transformer code (common/cpw/mods/fml/common/asm/ and subdirectories) +under any alternative open source license as classified by the OSI (http://opensource.org/licenses) + +======== + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/LICENSE-forge.txt b/LICENSE-forge.txt new file mode 100644 index 0000000..1cc2a3e --- /dev/null +++ b/LICENSE-forge.txt @@ -0,0 +1,70 @@ +Minecraft Forge Public Licence +============================== + +Version 1.0 + +0. Definitions +-------------- + +Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB + +User: Anybody that interract with the software in one of the following ways: + - play + - decompile + - recompile or compile + - modify + +Minecraft Forge: The Minecraft Forge code, in source form, class file form, as +obtained in a standalone fashion or as part of a wider distribution. + +Dependency: Code required to have Minecraft Forge working properly. That can +include dependencies required to compile the code as well as modifications in +the Minecraft sources that are required to have Minecraft Forge working. + +1. Scope +-------- + +The present license is granted to any user of Minecraft Forge, for all files included +unless stated otherwise in the file itself. As a prerequisite, a user of Minecraft +Forge must own a legally aquired copy of Minecraft. + +2. Play rights +-------------- + +The user of Minecraft Forge is allowed to install the software on a client or +a server and to play it without restriction. + +3. Modification rights +---------------------- + +The user has the right to decompile the source code, look at either the +decompiled version or the original source code, and to modify it. + +4. Derivation rights +-------------------- + +The user has the rights to derive code from Minecraft Forge, that is to say to +write code that either extends Minecraft Forge class and interfaces, +instantiate the objects declared or calls the functions. This code is known as +"derived" code, and can be licensed with conditions different from Minecraft +Forge. + + +5. Distribution rights +---------------------- + +The user of Minecraft Forge is allowed to redistribute Minecraft Forge in +partially, in totallity, or included in a distribution. When distributing +binaries or class files, the user must provide means to obtain the sources of +the distributed version of Minecraft Forge at no costs. This includes the +files as well as any dependency that the code may rely on, including patches to +minecraft original sources. + +Modification of Minecraft Forge as well as dependencies, including patches to +minecraft original sources, has to remain under the terms of the present +license. + +The right to distribute Minecraft Forge does not extend to the right to distribute +MCP data files included within Minecraft Forge. These are the property of the MCP +project and should be removed from any customized distribution of Minecraft Forge +or permission sought separately from the MCP team. diff --git a/README.md b/README.md index 78e0a02..3b90869 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,14 @@ -# Wc的科技Mod For Minecraft 1.8 +# 曙光工艺Mod For Minecraft 1.8 +本Mod遵守MIT协议开源 欢迎各路大神加入我们 -QQ群:284807326 +QQ群:287307326 + +======= 分 割 线 ======= +如果你想为我们的项目贡献代码 +那么请遵守规范: +1.缩进请使用四个空格或一个制表符 +2.写代码请注意规范,例如: + 在com.github.wdawning.dawncraft.item.ItemLoader中注册物品,而不是在com.github.wdawning.dawncraft.common.CommonProxy的preInit阶段中注册 + PS:关于这点,你可以参考一下ustc-zzzz大大的教程,我就是从他的教程开始学做Mod的>_< +3.请在gradle.properties中更改Mod信息 +4.还有其他的就不一一列举了 \ No newline at end of file diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..b45931f --- /dev/null +++ b/README.txt @@ -0,0 +1,59 @@ +------------------------------------------- +Source installation information for modders +------------------------------------------- +This code follows the Minecraft Forge installation methodology. It will apply +some small patches to the vanilla MCP source code, giving you and it access +to some of the data and functions you need to build a successful mod. + +Note also that the patches are built against "unrenamed" MCP source code (aka +srgnames) - this means that you will not be able to read them directly against +normal code. + +Source pack installation information: + +Standalone source installation +============================== + +Step 1: Open your command-line and browse to the folder where you extracted the zip file. + +Step 2: Once you have a command window up in the folder that the downloaded material was placed, type: + +Windows: "gradlew setupDecompWorkspace" +Linux/Mac OS: "./gradlew setupDecompWorkspace" + +Step 3: After all that finished, you're left with a choice. +For eclipse, run "gradlew eclipse" (./gradlew eclipse if you are on Mac/Linux) + +If you preffer to use IntelliJ, steps are a little different. +1. Open IDEA, and import project. +2. Select your build.gradle file and have it import. +3. Once it's finished you must close IntelliJ and run the following command: + +"gradlew genIntellijRuns" (./gradlew genIntellijRuns if you are on Mac/Linux) + +Step 4: The final step is to open Eclipse and switch your workspace to /eclipse/ (if you use IDEA, it should automatically start on your project) + +If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not effect your code} and then start the processs again. + +Should it still not work, +Refer to #ForgeGradle on EsperNet for more information about the gradle environment. + +Tip: +If you do not care about seeing Minecraft's source code you can replace "setupDecompWorkspace" with one of the following: +"setupDevWorkspace": Will patch, deobfusicated, and gather required assets to run minecraft, but will not generated human readable source code. +"setupCIWorkspace": Same as Dev but will not download any assets. This is useful in build servers as it is the fastest because it does the least work. + +Tip: +When using Decomp workspace, the Minecraft source code is NOT added to your workspace in a editable way. Minecraft is treated like a normal Library. Sources are there for documentation and research purposes and usually can be accessed under the 'referenced libraries' section of your IDE. + +Forge source installation +========================= +MinecraftForge ships with this code and installs it as part of the forge +installation process, no further action is required on your part. + +LexManos' Install Video +======================= +https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be + +For more details update more often refer to the Forge Forums: +http://www.minecraftforge.net/forum/index.php/topic,14048.0.html diff --git a/build.gradle b/build.gradle index d673838..7099bdf 100644 --- a/build.gradle +++ b/build.gradle @@ -17,14 +17,14 @@ buildscript { apply plugin: 'forge' -version = "B0.9" -group= "WdawningStudio" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "wcscience" +version = mod_version +group= mod_group // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = mod_id [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' minecraft { - version = "1.8-11.14.3.1500" + version = minecraft_version + "-" + forge_version runDir = "eclipse" // the mappings can be changed at any time, and must be in the following format. @@ -32,7 +32,7 @@ minecraft { // stable_# stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not allways work. // simply re-run your setup task after changing the mappings to update your workspace. - mappings = 'stable_18' + mappings = mcp_mapping } dependencies { diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..bd9feef --- /dev/null +++ b/gradle.properties @@ -0,0 +1,9 @@ +# Mod Information +mod_id = dawncraft +mod_version = B0.10 +mod_group = wdawning + +# Minecraft & Forge +minecraft_version = 1.8 +forge_version = 11.14.3.1500 +mcp_mapping = stable_18 \ No newline at end of file diff --git a/src/main/java/WdawningStudio/DawnW/science/client/ItemRenderLoader.java b/src/main/java/WdawningStudio/DawnW/science/client/ItemRenderLoader.java deleted file mode 100644 index bc20943..0000000 --- a/src/main/java/WdawningStudio/DawnW/science/client/ItemRenderLoader.java +++ /dev/null @@ -1,13 +0,0 @@ -package WdawningStudio.DawnW.science.client; - -import WdawningStudio.DawnW.science.block.BlockLoader; -import WdawningStudio.DawnW.science.item.ItemLoader; - -public class ItemRenderLoader -{ - public ItemRenderLoader() - { - ItemLoader.registerRenders(); - BlockLoader.registerRenders(); - } -} \ No newline at end of file diff --git a/src/main/java/WdawningStudio/DawnW/science/achievement/AchievementLoader.java b/src/main/java/com/github/wdawning/dawncraft/achievement/AchievementLoader.java similarity index 70% rename from src/main/java/WdawningStudio/DawnW/science/achievement/AchievementLoader.java rename to src/main/java/com/github/wdawning/dawncraft/achievement/AchievementLoader.java index c75a652..5ee6967 100644 --- a/src/main/java/WdawningStudio/DawnW/science/achievement/AchievementLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/achievement/AchievementLoader.java @@ -1,10 +1,9 @@ -package WdawningStudio.DawnW.science.achievement; +package com.github.wdawning.dawncraft.achievement; -import WdawningStudio.DawnW.science.science; -import WdawningStudio.DawnW.science.item.ItemLoader; +import com.github.wdawning.dawncraft.dawncraft; +import com.github.wdawning.dawncraft.item.ItemLoader; import net.minecraft.stats.Achievement; -import net.minecraft.stats.AchievementList; import net.minecraftforge.common.AchievementPage; public class AchievementLoader @@ -19,5 +18,5 @@ public AchievementLoader() } //register new Achievement page - public static AchievementPage pageScience = new AchievementPage(science.NAME, Ger); + public static AchievementPage pageScience = new AchievementPage(dawncraft.NAME, Ger); } \ No newline at end of file diff --git a/src/main/java/WdawningStudio/DawnW/science/block/BlockComputer.java b/src/main/java/com/github/wdawning/dawncraft/block/BlockComputer.java similarity index 88% rename from src/main/java/WdawningStudio/DawnW/science/block/BlockComputer.java rename to src/main/java/com/github/wdawning/dawncraft/block/BlockComputer.java index f452999..bc0f7e5 100644 --- a/src/main/java/WdawningStudio/DawnW/science/block/BlockComputer.java +++ b/src/main/java/com/github/wdawning/dawncraft/block/BlockComputer.java @@ -1,21 +1,11 @@ -package WdawningStudio.DawnW.science.block; +package com.github.wdawning.dawncraft.block; -import java.util.Random; - -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyDirection; -import net.minecraft.block.state.BlockState; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; public class BlockComputer extends Block { @@ -104,6 +94,7 @@ public boolean isFullCube() //方块状态太难弄了,我不玩♂你♀行了吧......... //其实是从家具mod里抄的,太无耻!!!!!!!! + //好吧，其实我会了hi哈哈哈 /* @Override public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) diff --git a/src/main/java/WdawningStudio/DawnW/science/block/BlockElectricityFurnace.java b/src/main/java/com/github/wdawning/dawncraft/block/BlockElectricityFurnace.java similarity index 95% rename from src/main/java/WdawningStudio/DawnW/science/block/BlockElectricityFurnace.java rename to src/main/java/com/github/wdawning/dawncraft/block/BlockElectricityFurnace.java index fa72a57..75fc0cb 100644 --- a/src/main/java/WdawningStudio/DawnW/science/block/BlockElectricityFurnace.java +++ b/src/main/java/com/github/wdawning/dawncraft/block/BlockElectricityFurnace.java @@ -1,6 +1,7 @@ -package WdawningStudio.DawnW.science.block; +package com.github.wdawning.dawncraft.block; + +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; diff --git a/src/main/java/WdawningStudio/DawnW/science/block/BlockFluidPetroleum.java b/src/main/java/com/github/wdawning/dawncraft/block/BlockFluidPetroleum.java similarity index 61% rename from src/main/java/WdawningStudio/DawnW/science/block/BlockFluidPetroleum.java rename to src/main/java/com/github/wdawning/dawncraft/block/BlockFluidPetroleum.java index 7943e12..9d56e05 100644 --- a/src/main/java/WdawningStudio/DawnW/science/block/BlockFluidPetroleum.java +++ b/src/main/java/com/github/wdawning/dawncraft/block/BlockFluidPetroleum.java @@ -1,11 +1,9 @@ -package WdawningStudio.DawnW.science.block; +package com.github.wdawning.dawncraft.block; -import WdawningStudio.DawnW.science.fluid.FluidLoader; -import WdawningStudio.DawnW.science.fluid.FluidPetroleum; +import com.github.wdawning.dawncraft.fluid.FluidLoader; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.BlockFluidClassic; -import net.minecraftforge.fluids.Fluid; public class BlockFluidPetroleum extends BlockFluidClassic { diff --git a/src/main/java/WdawningStudio/DawnW/science/block/BlockLoader.java b/src/main/java/com/github/wdawning/dawncraft/block/BlockLoader.java similarity index 92% rename from src/main/java/WdawningStudio/DawnW/science/block/BlockLoader.java rename to src/main/java/com/github/wdawning/dawncraft/block/BlockLoader.java index e2a7f1b..f8b1c8b 100644 --- a/src/main/java/WdawningStudio/DawnW/science/block/BlockLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/block/BlockLoader.java @@ -1,6 +1,6 @@ -package WdawningStudio.DawnW.science.block; +package com.github.wdawning.dawncraft.block; -import WdawningStudio.DawnW.science.science; +import com.github.wdawning.dawncraft.dawncraft; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -39,7 +39,7 @@ public class BlockLoader public BlockLoader(FMLPreInitializationEvent event) { //Furniture - register(wchest, "super_chest"); + register(wchest, "super_chest"); //magnet register(magnetOre, "magnet_ore"); register(magnetBlock, "magnet_block"); @@ -98,13 +98,13 @@ private static void register(Block block, ItemBlock itemBlock, String name) private static void registerRender(Block block, String name) { Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(Item.getItemFromBlock(block), 0, - new ModelResourceLocation(science.MODID + ":" + name, "inventory")); + new ModelResourceLocation(dawncraft.MODID + ":" + name, "inventory")); } @SideOnly(Side.CLIENT) private static void registerRender(Block block, int meta, String name) { Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(Item.getItemFromBlock(block), meta, - new ModelResourceLocation(science.MODID + ":" + name, "inventory")); + new ModelResourceLocation(dawncraft.MODID + ":" + name, "inventory")); } } \ No newline at end of file diff --git a/src/main/java/WdawningStudio/DawnW/science/block/BlockMachineFurnace.java b/src/main/java/com/github/wdawning/dawncraft/block/BlockMachineFurnace.java similarity index 95% rename from src/main/java/WdawningStudio/DawnW/science/block/BlockMachineFurnace.java rename to src/main/java/com/github/wdawning/dawncraft/block/BlockMachineFurnace.java index a99b245..9d8ba78 100644 --- a/src/main/java/WdawningStudio/DawnW/science/block/BlockMachineFurnace.java +++ b/src/main/java/com/github/wdawning/dawncraft/block/BlockMachineFurnace.java @@ -1,6 +1,7 @@ -package WdawningStudio.DawnW.science.block; +package com.github.wdawning.dawncraft.block; + +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; diff --git a/src/main/java/WdawningStudio/DawnW/science/block/BlockMagnetBlock.java b/src/main/java/com/github/wdawning/dawncraft/block/BlockMagnetBlock.java similarity index 80% rename from src/main/java/WdawningStudio/DawnW/science/block/BlockMagnetBlock.java rename to src/main/java/com/github/wdawning/dawncraft/block/BlockMagnetBlock.java index 041b1b3..5307b7e 100644 --- a/src/main/java/WdawningStudio/DawnW/science/block/BlockMagnetBlock.java +++ b/src/main/java/com/github/wdawning/dawncraft/block/BlockMagnetBlock.java @@ -1,6 +1,6 @@ -package WdawningStudio.DawnW.science.block; +package com.github.wdawning.dawncraft.block; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/WdawningStudio/DawnW/science/block/BlockMagnetOre.java b/src/main/java/com/github/wdawning/dawncraft/block/BlockMagnetOre.java similarity index 60% rename from src/main/java/WdawningStudio/DawnW/science/block/BlockMagnetOre.java rename to src/main/java/com/github/wdawning/dawncraft/block/BlockMagnetOre.java index 53a5ee7..9257dfc 100644 --- a/src/main/java/WdawningStudio/DawnW/science/block/BlockMagnetOre.java +++ b/src/main/java/com/github/wdawning/dawncraft/block/BlockMagnetOre.java @@ -1,15 +1,9 @@ -package WdawningStudio.DawnW.science.block; +package com.github.wdawning.dawncraft.block; -import java.util.Random; - -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.item.ItemLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; public class BlockMagnetOre extends Block { diff --git a/src/main/java/WdawningStudio/DawnW/science/block/BlockWchest.java b/src/main/java/com/github/wdawning/dawncraft/block/BlockWchest.java similarity index 71% rename from src/main/java/WdawningStudio/DawnW/science/block/BlockWchest.java rename to src/main/java/com/github/wdawning/dawncraft/block/BlockWchest.java index 260e47f..f8021d5 100644 --- a/src/main/java/WdawningStudio/DawnW/science/block/BlockWchest.java +++ b/src/main/java/com/github/wdawning/dawncraft/block/BlockWchest.java @@ -1,12 +1,8 @@ -package WdawningStudio.DawnW.science.block; +package com.github.wdawning.dawncraft.block; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.item.ItemLoader; - -import java.util.Random; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; import net.minecraft.block.BlockChest; -import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.world.World; diff --git a/src/main/java/WdawningStudio/DawnW/science/client/ClientProxy.java b/src/main/java/com/github/wdawning/dawncraft/client/ClientProxy.java similarity index 75% rename from src/main/java/WdawningStudio/DawnW/science/client/ClientProxy.java rename to src/main/java/com/github/wdawning/dawncraft/client/ClientProxy.java index bfa56e3..d5fdb5d 100644 --- a/src/main/java/WdawningStudio/DawnW/science/client/ClientProxy.java +++ b/src/main/java/com/github/wdawning/dawncraft/client/ClientProxy.java @@ -1,8 +1,8 @@ -package WdawningStudio.DawnW.science.client; +package com.github.wdawning.dawncraft.client; + +import com.github.wdawning.dawncraft.common.CommonProxy; +import com.github.wdawning.dawncraft.entity.EntityRenderLoader; -import WdawningStudio.DawnW.science.client.FluidRenderLoader; -import WdawningStudio.DawnW.science.common.CommonProxy; -import WdawningStudio.DawnW.science.entity.EntityRenderLoader; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; diff --git a/src/main/java/WdawningStudio/DawnW/science/client/FluidRenderLoader.java b/src/main/java/com/github/wdawning/dawncraft/client/FluidRenderLoader.java similarity index 74% rename from src/main/java/WdawningStudio/DawnW/science/client/FluidRenderLoader.java rename to src/main/java/com/github/wdawning/dawncraft/client/FluidRenderLoader.java index 657254a..a887944 100644 --- a/src/main/java/WdawningStudio/DawnW/science/client/FluidRenderLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/client/FluidRenderLoader.java @@ -1,6 +1,6 @@ -package WdawningStudio.DawnW.science.client; +package com.github.wdawning.dawncraft.client; -import WdawningStudio.DawnW.science.fluid.FluidLoader; +import com.github.wdawning.dawncraft.fluid.FluidLoader; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; diff --git a/src/main/java/com/github/wdawning/dawncraft/client/ItemRenderLoader.java b/src/main/java/com/github/wdawning/dawncraft/client/ItemRenderLoader.java new file mode 100644 index 0000000..90524ab --- /dev/null +++ b/src/main/java/com/github/wdawning/dawncraft/client/ItemRenderLoader.java @@ -0,0 +1,13 @@ +package com.github.wdawning.dawncraft.client; + +import com.github.wdawning.dawncraft.block.BlockLoader; +import com.github.wdawning.dawncraft.item.ItemLoader; + +public class ItemRenderLoader +{ + public ItemRenderLoader() + { + ItemLoader.registerRenders(); + BlockLoader.registerRenders(); + } +} \ No newline at end of file diff --git a/src/main/java/WdawningStudio/DawnW/science/common/CommonProxy.java b/src/main/java/com/github/wdawning/dawncraft/common/CommonProxy.java similarity index 58% rename from src/main/java/WdawningStudio/DawnW/science/common/CommonProxy.java rename to src/main/java/com/github/wdawning/dawncraft/common/CommonProxy.java index 3faf16d..5e7b4ba 100644 --- a/src/main/java/WdawningStudio/DawnW/science/common/CommonProxy.java +++ b/src/main/java/com/github/wdawning/dawncraft/common/CommonProxy.java @@ -1,14 +1,14 @@ -package WdawningStudio.DawnW.science.common; +package com.github.wdawning.dawncraft.common; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.entity.EntityLoader; -import WdawningStudio.DawnW.science.fluid.FluidLoader; -import WdawningStudio.DawnW.science.item.ItemLoader; -import WdawningStudio.DawnW.science.potion.PotionLoader; -import WdawningStudio.DawnW.science.worldgen.WorldGeneratorLoader; -import WdawningStudio.DawnW.science.achievement.AchievementLoader; -import WdawningStudio.DawnW.science.block.BlockLoader; -import WdawningStudio.DawnW.science.crafting.CraftingLoader; +import com.github.wdawning.dawncraft.achievement.AchievementLoader; +import com.github.wdawning.dawncraft.block.BlockLoader; +import com.github.wdawning.dawncraft.crafting.CraftingLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.entity.EntityLoader; +import com.github.wdawning.dawncraft.fluid.FluidLoader; +import com.github.wdawning.dawncraft.item.ItemLoader; +import com.github.wdawning.dawncraft.potion.PotionLoader; +import com.github.wdawning.dawncraft.worldgen.WorldGeneratorLoader; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; diff --git a/src/main/java/WdawningStudio/DawnW/science/common/ConfigLoader.java b/src/main/java/com/github/wdawning/dawncraft/common/ConfigLoader.java similarity index 95% rename from src/main/java/WdawningStudio/DawnW/science/common/ConfigLoader.java rename to src/main/java/com/github/wdawning/dawncraft/common/ConfigLoader.java index b3a3578..92caf38 100644 --- a/src/main/java/WdawningStudio/DawnW/science/common/ConfigLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/common/ConfigLoader.java @@ -1,4 +1,4 @@ -package WdawningStudio.DawnW.science.common; +package com.github.wdawning.dawncraft.common; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; diff --git a/src/main/java/WdawningStudio/DawnW/science/common/EventLoader.java b/src/main/java/com/github/wdawning/dawncraft/common/EventLoader.java similarity index 84% rename from src/main/java/WdawningStudio/DawnW/science/common/EventLoader.java rename to src/main/java/com/github/wdawning/dawncraft/common/EventLoader.java index bae96aa..f6ab02c 100644 --- a/src/main/java/WdawningStudio/DawnW/science/common/EventLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/common/EventLoader.java @@ -1,25 +1,21 @@ -package WdawningStudio.DawnW.science.common; +package com.github.wdawning.dawncraft.common; -import WdawningStudio.DawnW.science.achievement.AchievementLoader; -import WdawningStudio.DawnW.science.entity.EntitySavage; -import WdawningStudio.DawnW.science.item.ItemLoader; -import WdawningStudio.DawnW.science.potion.PotionLoader; +import com.github.wdawning.dawncraft.achievement.AchievementLoader; +import com.github.wdawning.dawncraft.entity.EntitySavage; +import com.github.wdawning.dawncraft.item.ItemLoader; +import com.github.wdawning.dawncraft.potion.PotionLoader; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.passive.EntityPig; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.player.EntityInteractEvent; import net.minecraftforge.event.entity.player.FillBucketEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -28,7 +24,6 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; public class EventLoader { @@ -58,7 +53,7 @@ public void onFillBucket(FillBucketEvent event) @SubscribeEvent public void onLivingHurt(LivingHurtEvent event) { - if (event.source.getDamageType().equals("fall")) + if (event.source.getDamageType().equals("mob")) { PotionEffect effect = event.entityLiving.getActivePotionEffect(PotionLoader.potionGerPower); if (effect != null) @@ -85,7 +80,7 @@ public void onEntityInteract(EntityInteractEvent event) ItemStack stack = player.getCurrentEquippedItem(); if (stack != null && (stack.getItem() == ItemLoader.faeces)) { - player.attackEntityFrom((new DamageSource("byGer")).setDifficultyScaled().setExplosion(), 12.0F); + player.attackEntityFrom((new DamageSource("byGer")).setDifficultyScaled().setExplosion(), 20.0F); player.worldObj.createExplosion(savage, savage.posX, savage.posY, savage.posZ, 4.0F, false); savage.setDead(); } diff --git a/src/main/java/WdawningStudio/DawnW/science/crafting/CraftingLoader.java b/src/main/java/com/github/wdawning/dawncraft/crafting/CraftingLoader.java similarity index 95% rename from src/main/java/WdawningStudio/DawnW/science/crafting/CraftingLoader.java rename to src/main/java/com/github/wdawning/dawncraft/crafting/CraftingLoader.java index 7192faa..2068516 100644 --- a/src/main/java/WdawningStudio/DawnW/science/crafting/CraftingLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/crafting/CraftingLoader.java @@ -1,9 +1,8 @@ -package WdawningStudio.DawnW.science.crafting; +package com.github.wdawning.dawncraft.crafting; -import WdawningStudio.DawnW.science.block.BlockLoader; -import WdawningStudio.DawnW.science.item.ItemLoader; +import com.github.wdawning.dawncraft.block.BlockLoader; +import com.github.wdawning.dawncraft.item.ItemLoader; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WdawningStudio/DawnW/science/creativetab/CreativeTabsLoader.java b/src/main/java/com/github/wdawning/dawncraft/creativetab/CreativeTabsLoader.java similarity index 91% rename from src/main/java/WdawningStudio/DawnW/science/creativetab/CreativeTabsLoader.java rename to src/main/java/com/github/wdawning/dawncraft/creativetab/CreativeTabsLoader.java index 9af11c3..9634e1f 100644 --- a/src/main/java/WdawningStudio/DawnW/science/creativetab/CreativeTabsLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/creativetab/CreativeTabsLoader.java @@ -1,10 +1,9 @@ -package WdawningStudio.DawnW.science.creativetab; +package com.github.wdawning.dawncraft.creativetab; + +import com.github.wdawning.dawncraft.block.BlockLoader; +import com.github.wdawning.dawncraft.item.ItemLoader; -import WdawningStudio.DawnW.science.block.BlockLoader; -import WdawningStudio.DawnW.science.item.ItemLoader; -import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; diff --git a/src/main/java/WdawningStudio/DawnW/science/science.java b/src/main/java/com/github/wdawning/dawncraft/dawncraft.java similarity index 58% rename from src/main/java/WdawningStudio/DawnW/science/science.java rename to src/main/java/com/github/wdawning/dawncraft/dawncraft.java index 3cf30bc..63639c4 100644 --- a/src/main/java/WdawningStudio/DawnW/science/science.java +++ b/src/main/java/com/github/wdawning/dawncraft/dawncraft.java @@ -1,6 +1,6 @@ -package WdawningStudio.DawnW.science; +package com.github.wdawning.dawncraft; -import WdawningStudio.DawnW.science.common.CommonProxy; +import com.github.wdawning.dawncraft.common.CommonProxy; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -9,25 +9,24 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; /** @author QingChenW - @version is mcmod.version + @version mcmod.version **/ -@Mod(modid = science.MODID, name = science.NAME, version = science.VERSION, acceptedMinecraftVersions = "[1.8,)") +@Mod(modid = dawncraft.MODID, name = dawncraft.NAME, version = dawncraft.VERSION, acceptedMinecraftVersions = "[1.8,)") -public class science +public class dawncraft { - public static final String MODID = "wcscience"; - public static final String NAME = "Wc's Sience Mod"; + public static final String MODID = "dawncraft"; + public static final String NAME = "Dawn Craft Mod"; public static final String VERSION = "For mc1.8"; - @Instance(science.MODID) - public static science instance; + @Instance(dawncraft.MODID) + public static dawncraft instance; - @SidedProxy(clientSide = "WdawningStudio.DawnW.science.client.ClientProxy", serverSide = "WdawningStudio.DawnW.science.common.CommonProxy") + @SidedProxy(clientSide = "com.github.wdawning.dawncraft.client.ClientProxy", serverSide = "com.github.wdawning.dawncraft.common.CommonProxy") public static CommonProxy proxy; @EventHandler diff --git a/src/main/java/WdawningStudio/DawnW/science/entity/EntityFlanBomb.java b/src/main/java/com/github/wdawning/dawncraft/entity/EntityFlanBomb.java similarity index 59% rename from src/main/java/WdawningStudio/DawnW/science/entity/EntityFlanBomb.java rename to src/main/java/com/github/wdawning/dawncraft/entity/EntityFlanBomb.java index 50b7a7c..084b9df 100644 --- a/src/main/java/WdawningStudio/DawnW/science/entity/EntityFlanBomb.java +++ b/src/main/java/com/github/wdawning/dawncraft/entity/EntityFlanBomb.java @@ -1,8 +1,9 @@ -package WdawningStudio.DawnW.science.entity; +package com.github.wdawning.dawncraft.entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -25,11 +26,18 @@ public EntityFlanBomb(World worldIn, double x, double y, double z) @Override protected void onImpact(MovingObjectPosition movingObjectPosition) - { + { + if (movingObjectPosition.entityHit != null) + { + movingObjectPosition.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()).setDifficultyScaled().setExplosion(), 8.0F); + this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 4.0F, true); + } + + this.worldObj.createExplosion(this, this.posX, this.posY + (double)(this.height / 2.0F), this.posZ, 4.0F, true); + if (!this.worldObj.isRemote) { this.setDead(); - this.worldObj.createExplosion(this, this.posX, this.posY + (double)(this.height / 2.0F), this.posZ, 4.0F, true); } } } \ No newline at end of file diff --git a/src/main/java/WdawningStudio/DawnW/science/entity/EntityGerKing.java b/src/main/java/com/github/wdawning/dawncraft/entity/EntityGerKing.java similarity index 78% rename from src/main/java/WdawningStudio/DawnW/science/entity/EntityGerKing.java rename to src/main/java/com/github/wdawning/dawncraft/entity/EntityGerKing.java index 200ed33..df06a26 100644 --- a/src/main/java/WdawningStudio/DawnW/science/entity/EntityGerKing.java +++ b/src/main/java/com/github/wdawning/dawncraft/entity/EntityGerKing.java @@ -1,8 +1,7 @@ -package WdawningStudio.DawnW.science.entity; +package com.github.wdawning.dawncraft.entity; -import WdawningStudio.DawnW.science.item.ItemLoader; +import com.github.wdawning.dawncraft.item.ItemLoader; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.monster.EntityMob; import net.minecraft.world.World; diff --git a/src/main/java/WdawningStudio/DawnW/science/entity/EntityLoader.java b/src/main/java/com/github/wdawning/dawncraft/entity/EntityLoader.java similarity index 92% rename from src/main/java/WdawningStudio/DawnW/science/entity/EntityLoader.java rename to src/main/java/com/github/wdawning/dawncraft/entity/EntityLoader.java index 358d723..4f5cee1 100644 --- a/src/main/java/WdawningStudio/DawnW/science/entity/EntityLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/entity/EntityLoader.java @@ -1,11 +1,11 @@ -package WdawningStudio.DawnW.science.entity; +package com.github.wdawning.dawncraft.entity; + +import com.github.wdawning.dawncraft.dawncraft; +import com.github.wdawning.dawncraft.item.ItemLoader; -import WdawningStudio.DawnW.science.science; -import WdawningStudio.DawnW.science.item.ItemLoader; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderSnowball; -import net.minecraft.client.renderer.entity.RenderTNTPrimed; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EnumCreatureType; @@ -22,7 +22,7 @@ public static void registerEntity(Class entityClass, String na int entityID = EntityRegistry.findGlobalUniqueEntityId(); EntityRegistry.registerGlobalEntityID(entityClass, name, entityID); - EntityRegistry.registerModEntity(entityClass, name, entityID, science.instance, trackingRange, updateFrequency, sendsVelocityUpdates); + EntityRegistry.registerModEntity(entityClass, name, entityID, dawncraft.instance, trackingRange, updateFrequency, sendsVelocityUpdates); } public static void registerEntityEgg(Class entityClass, int eggPrimary, int eggSecondary) diff --git a/src/main/java/WdawningStudio/DawnW/science/entity/EntityMagnetBall.java b/src/main/java/com/github/wdawning/dawncraft/entity/EntityMagnetBall.java similarity index 95% rename from src/main/java/WdawningStudio/DawnW/science/entity/EntityMagnetBall.java rename to src/main/java/com/github/wdawning/dawncraft/entity/EntityMagnetBall.java index 4b492a4..e4a2bbe 100644 --- a/src/main/java/WdawningStudio/DawnW/science/entity/EntityMagnetBall.java +++ b/src/main/java/com/github/wdawning/dawncraft/entity/EntityMagnetBall.java @@ -1,4 +1,4 @@ -package WdawningStudio.DawnW.science.entity; +package com.github.wdawning.dawncraft.entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; diff --git a/src/main/java/WdawningStudio/DawnW/science/entity/EntityMouse.java b/src/main/java/com/github/wdawning/dawncraft/entity/EntityMouse.java similarity index 76% rename from src/main/java/WdawningStudio/DawnW/science/entity/EntityMouse.java rename to src/main/java/com/github/wdawning/dawncraft/entity/EntityMouse.java index b84c557..cfa0555 100644 --- a/src/main/java/WdawningStudio/DawnW/science/entity/EntityMouse.java +++ b/src/main/java/com/github/wdawning/dawncraft/entity/EntityMouse.java @@ -1,6 +1,5 @@ -package WdawningStudio.DawnW.science.entity; +package com.github.wdawning.dawncraft.entity; -import WdawningStudio.DawnW.science.item.ItemLoader; import net.minecraft.entity.passive.EntityAmbientCreature; import net.minecraft.world.World; @@ -9,6 +8,7 @@ public class EntityMouse extends EntityAmbientCreature public EntityMouse(World worldIn) { super(worldIn); + this.setSize(0.8F, 0.6F); } @Override diff --git a/src/main/java/WdawningStudio/DawnW/science/entity/EntityRenderLoader.java b/src/main/java/com/github/wdawning/dawncraft/entity/EntityRenderLoader.java similarity index 54% rename from src/main/java/WdawningStudio/DawnW/science/entity/EntityRenderLoader.java rename to src/main/java/com/github/wdawning/dawncraft/entity/EntityRenderLoader.java index fe18a6a..3b3c459 100644 --- a/src/main/java/WdawningStudio/DawnW/science/entity/EntityRenderLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/entity/EntityRenderLoader.java @@ -1,6 +1,4 @@ -package WdawningStudio.DawnW.science.entity; - -import WdawningStudio.DawnW.science.entity.EntityLoader; +package com.github.wdawning.dawncraft.entity; public class EntityRenderLoader { diff --git a/src/main/java/WdawningStudio/DawnW/science/entity/EntitySavage.java b/src/main/java/com/github/wdawning/dawncraft/entity/EntitySavage.java similarity index 83% rename from src/main/java/WdawningStudio/DawnW/science/entity/EntitySavage.java rename to src/main/java/com/github/wdawning/dawncraft/entity/EntitySavage.java index b837d99..81fd41f 100644 --- a/src/main/java/WdawningStudio/DawnW/science/entity/EntitySavage.java +++ b/src/main/java/com/github/wdawning/dawncraft/entity/EntitySavage.java @@ -1,12 +1,9 @@ -package WdawningStudio.DawnW.science.entity; +package com.github.wdawning.dawncraft.entity; -import WdawningStudio.DawnW.science.item.ItemLoader; +import com.github.wdawning.dawncraft.item.ItemLoader; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityAgeable; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.EntityAIAttackOnCollide; import net.minecraft.entity.ai.EntityAIMoveIndoors; import net.minecraft.entity.ai.EntityAIMoveTowardsRestriction; import net.minecraft.entity.ai.EntityAIOpenDoor; @@ -14,9 +11,6 @@ import net.minecraft.entity.ai.EntityAISwimming; import net.minecraft.entity.ai.EntityAIWander; import net.minecraft.entity.ai.EntityAIWatchClosest; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.IAttributeInstance; -import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/WdawningStudio/DawnW/science/entity/FakePlayerLoader.java b/src/main/java/com/github/wdawning/dawncraft/entity/FakePlayerLoader.java similarity index 95% rename from src/main/java/WdawningStudio/DawnW/science/entity/FakePlayerLoader.java rename to src/main/java/com/github/wdawning/dawncraft/entity/FakePlayerLoader.java index cccb0dd..7a8bf04 100644 --- a/src/main/java/WdawningStudio/DawnW/science/entity/FakePlayerLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/entity/FakePlayerLoader.java @@ -1,8 +1,10 @@ -package WdawningStudio.DawnW.science.entity; +package com.github.wdawning.dawncraft.entity; import java.lang.ref.WeakReference; import java.util.UUID; + import com.mojang.authlib.GameProfile; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayerFactory; diff --git a/src/main/java/WdawningStudio/DawnW/science/entity/ModelMouse.java b/src/main/java/com/github/wdawning/dawncraft/entity/ModelMouse.java similarity index 98% rename from src/main/java/WdawningStudio/DawnW/science/entity/ModelMouse.java rename to src/main/java/com/github/wdawning/dawncraft/entity/ModelMouse.java index fd54cdc..3ace7fd 100644 --- a/src/main/java/WdawningStudio/DawnW/science/entity/ModelMouse.java +++ b/src/main/java/com/github/wdawning/dawncraft/entity/ModelMouse.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package WdawningStudio.DawnW.science.entity; +package com.github.wdawning.dawncraft.entity; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/WdawningStudio/DawnW/science/entity/RenderGerKing.java b/src/main/java/com/github/wdawning/dawncraft/entity/RenderGerKing.java similarity index 89% rename from src/main/java/WdawningStudio/DawnW/science/entity/RenderGerKing.java rename to src/main/java/com/github/wdawning/dawncraft/entity/RenderGerKing.java index 6cae70d..7a5e5d8 100644 --- a/src/main/java/WdawningStudio/DawnW/science/entity/RenderGerKing.java +++ b/src/main/java/com/github/wdawning/dawncraft/entity/RenderGerKing.java @@ -1,6 +1,6 @@ -package WdawningStudio.DawnW.science.entity; +package com.github.wdawning.dawncraft.entity; -import WdawningStudio.DawnW.science.science; +import com.github.wdawning.dawncraft.dawncraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.GlStateManager; @@ -16,7 +16,7 @@ @SideOnly(Side.CLIENT) public class RenderGerKing extends RenderBiped { - private static final ResourceLocation GERKING_TEXTURE = new ResourceLocation(science.MODID + ":" + "textures/entity/ger_king.png"); + private static final ResourceLocation GERKING_TEXTURE = new ResourceLocation(dawncraft.MODID + ":" + "textures/entity/ger_king.png"); public RenderGerKing(RenderManager renderManager) { diff --git a/src/main/java/WdawningStudio/DawnW/science/entity/RenderMouse.java b/src/main/java/com/github/wdawning/dawncraft/entity/RenderMouse.java similarity index 88% rename from src/main/java/WdawningStudio/DawnW/science/entity/RenderMouse.java rename to src/main/java/com/github/wdawning/dawncraft/entity/RenderMouse.java index b345b90..ae53566 100644 --- a/src/main/java/WdawningStudio/DawnW/science/entity/RenderMouse.java +++ b/src/main/java/com/github/wdawning/dawncraft/entity/RenderMouse.java @@ -1,6 +1,7 @@ -package WdawningStudio.DawnW.science.entity; +package com.github.wdawning.dawncraft.entity; + +import com.github.wdawning.dawncraft.dawncraft; -import WdawningStudio.DawnW.science.science; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; @@ -13,7 +14,7 @@ @SideOnly(Side.CLIENT) public class RenderMouse extends RenderLiving { - private static final ResourceLocation MOUSE_TEXTURE = new ResourceLocation(science.MODID + ":" + "textures/entity/mouse.png"); + private static final ResourceLocation MOUSE_TEXTURE = new ResourceLocation(dawncraft.MODID + ":" + "textures/entity/mouse.png"); public RenderMouse(RenderManager renderManager) { diff --git a/src/main/java/WdawningStudio/DawnW/science/entity/RenderSavage.java b/src/main/java/com/github/wdawning/dawncraft/entity/RenderSavage.java similarity index 85% rename from src/main/java/WdawningStudio/DawnW/science/entity/RenderSavage.java rename to src/main/java/com/github/wdawning/dawncraft/entity/RenderSavage.java index f6e8177..e329da0 100644 --- a/src/main/java/WdawningStudio/DawnW/science/entity/RenderSavage.java +++ b/src/main/java/com/github/wdawning/dawncraft/entity/RenderSavage.java @@ -1,9 +1,8 @@ -package WdawningStudio.DawnW.science.entity; +package com.github.wdawning.dawncraft.entity; -import WdawningStudio.DawnW.science.science; +import com.github.wdawning.dawncraft.dawncraft; import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; @@ -16,7 +15,7 @@ @SideOnly(Side.CLIENT) public class RenderSavage extends RenderBiped { - private static final ResourceLocation SAVAGE_TEXTURE = new ResourceLocation(science.MODID + ":" + "textures/entity/savage.png"); + private static final ResourceLocation SAVAGE_TEXTURE = new ResourceLocation(dawncraft.MODID + ":" + "textures/entity/savage.png"); public RenderSavage(RenderManager renderManager) { diff --git a/src/main/java/WdawningStudio/DawnW/science/fluid/FluidLoader.java b/src/main/java/com/github/wdawning/dawncraft/fluid/FluidLoader.java similarity index 90% rename from src/main/java/WdawningStudio/DawnW/science/fluid/FluidLoader.java rename to src/main/java/com/github/wdawning/dawncraft/fluid/FluidLoader.java index 75fd8d2..1595505 100644 --- a/src/main/java/WdawningStudio/DawnW/science/fluid/FluidLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/fluid/FluidLoader.java @@ -1,7 +1,7 @@ -package WdawningStudio.DawnW.science.fluid; +package com.github.wdawning.dawncraft.fluid; -import WdawningStudio.DawnW.science.science; -import WdawningStudio.DawnW.science.block.BlockLoader; +import com.github.wdawning.dawncraft.dawncraft; +import com.github.wdawning.dawncraft.block.BlockLoader; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; @@ -43,7 +43,7 @@ public static void registerRenders() @SideOnly(Side.CLIENT) public static void registerFluidRender(BlockFluidBase blockFluid, String blockStateName) { - final String location = science.MODID + ":" + blockStateName; + final String location = dawncraft.MODID + ":" + blockStateName; final Item itemFluid = Item.getItemFromBlock(blockFluid); ModelLoader.setCustomMeshDefinition(itemFluid, new ItemMeshDefinition() { diff --git a/src/main/java/WdawningStudio/DawnW/science/fluid/FluidPetroleum.java b/src/main/java/com/github/wdawning/dawncraft/fluid/FluidPetroleum.java similarity index 78% rename from src/main/java/WdawningStudio/DawnW/science/fluid/FluidPetroleum.java rename to src/main/java/com/github/wdawning/dawncraft/fluid/FluidPetroleum.java index 94e5956..d17ae7e 100644 --- a/src/main/java/WdawningStudio/DawnW/science/fluid/FluidPetroleum.java +++ b/src/main/java/com/github/wdawning/dawncraft/fluid/FluidPetroleum.java @@ -1,6 +1,6 @@ -package WdawningStudio.DawnW.science.fluid; +package com.github.wdawning.dawncraft.fluid; -import WdawningStudio.DawnW.science.science; +import com.github.wdawning.dawncraft.dawncraft; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; @@ -9,8 +9,8 @@ public class FluidPetroleum extends Fluid { - public static final ResourceLocation still = new ResourceLocation(science.MODID + ":" + "fluid/petroleum_still"); - public static final ResourceLocation flowing = new ResourceLocation(science.MODID + ":" + "fluid/petroleum_flow"); + public static final ResourceLocation still = new ResourceLocation(dawncraft.MODID + ":" + "fluid/petroleum_still"); + public static final ResourceLocation flowing = new ResourceLocation(dawncraft.MODID + ":" + "fluid/petroleum_flow"); protected static final TextureMap texturemap = Minecraft.getMinecraft().getTextureMapBlocks(); public FluidPetroleum() diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemBrainDead.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemBrainDead.java similarity index 82% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemBrainDead.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemBrainDead.java index 7375150..d1dd6bb 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemBrainDead.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemBrainDead.java @@ -1,7 +1,7 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.potion.PotionLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.potion.PotionLoader; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemBucketPetroleum.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemBucketPetroleum.java similarity index 72% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemBucketPetroleum.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemBucketPetroleum.java index a2f6729..537150f 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemBucketPetroleum.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemBucketPetroleum.java @@ -1,8 +1,8 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; -import WdawningStudio.DawnW.science.block.BlockLoader; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.fluid.FluidLoader; +import com.github.wdawning.dawncraft.block.BlockLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.fluid.FluidLoader; import net.minecraft.init.Items; import net.minecraft.item.ItemBucket; diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemCakeEgg.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemCakeEgg.java similarity index 71% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemCakeEgg.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemCakeEgg.java index ed5b6d2..8d1893d 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemCakeEgg.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemCakeEgg.java @@ -1,6 +1,7 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; + +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; import net.minecraft.item.ItemFood; public class ItemCakeEgg extends ItemFood diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemComputerCPU.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemComputerCPU.java similarity index 90% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemComputerCPU.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemComputerCPU.java index 0d07e01..a6e76b9 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemComputerCPU.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemComputerCPU.java @@ -1,6 +1,6 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; import net.minecraft.item.Item; diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemFaeces.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemFaeces.java similarity index 90% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemFaeces.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemFaeces.java index be30928..90029f9 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemFaeces.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemFaeces.java @@ -1,6 +1,6 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemFlan.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemFlan.java similarity index 84% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemFlan.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemFlan.java index 546b1f3..29013bc 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemFlan.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemFlan.java @@ -1,9 +1,8 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemFlanRPG.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemFlanRPG.java similarity index 77% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemFlanRPG.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemFlanRPG.java index 2834886..4c48f7e 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemFlanRPG.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemFlanRPG.java @@ -1,12 +1,8 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.entity.EntityFlanBomb; -import WdawningStudio.DawnW.science.entity.EntityMagnetBall; +import com.github.wdawning.dawncraft.entity.EntityFlanBomb; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemFlanRPGRocket.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemFlanRPGRocket.java similarity index 71% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemFlanRPGRocket.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemFlanRPGRocket.java index f176089..b41a8f5 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemFlanRPGRocket.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemFlanRPGRocket.java @@ -1,6 +1,7 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; + +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; import net.minecraft.item.Item; public class ItemFlanRPGRocket extends Item diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemGerHeart.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemGerHeart.java similarity index 79% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemGerHeart.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemGerHeart.java index 2e47395..1be2573 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemGerHeart.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemGerHeart.java @@ -1,12 +1,11 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.potion.PotionLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.potion.PotionLoader; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemGoldiamondSword.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemGoldiamondSword.java similarity index 72% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemGoldiamondSword.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemGoldiamondSword.java index e80650e..18ae6b3 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemGoldiamondSword.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemGoldiamondSword.java @@ -1,6 +1,6 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; import net.minecraft.item.ItemSword; diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemLoader.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemLoader.java similarity index 94% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemLoader.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemLoader.java index fac29e8..01b6641 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemLoader.java @@ -1,6 +1,6 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; -import WdawningStudio.DawnW.science.science; +import com.github.wdawning.dawncraft.dawncraft; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.model.ModelResourceLocation; @@ -43,7 +43,7 @@ public class ItemLoader public static Item flanRPG = new ItemFlanRPG(); public static Item flanRPGRocket = new ItemFlanRPGRocket(); - public static final ItemArmor.ArmorMaterial MAGNET_ARMOR = EnumHelper.addArmorMaterial("MAGNET", science.MODID + ":" + "magnet", 11, new int[]{ 1, 5, 4, 2}, 10); + public static final ItemArmor.ArmorMaterial MAGNET_ARMOR = EnumHelper.addArmorMaterial("MAGNET", dawncraft.MODID + ":" + "magnet", 11, new int[]{ 1, 5, 4, 2}, 10); public static ItemArmor magnetHelmet = new ItemMagnetArmor.Helmet(); public static ItemArmor magnetChestplate = new ItemMagnetArmor.Chestplate(); public static ItemArmor magnetLeggings = new ItemMagnetArmor.Leggings(); @@ -124,6 +124,6 @@ private static void register(Item item, String name) @SideOnly(Side.CLIENT) private static void registerRender(Item item, String name) { - Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(science.MODID + ":" + name, "inventory")); + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(dawncraft.MODID + ":" + name, "inventory")); } } \ No newline at end of file diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnet.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnet.java similarity index 64% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemMagnet.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemMagnet.java index 7fdaef5..1dd250f 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnet.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnet.java @@ -1,6 +1,7 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; + +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; import net.minecraft.item.Item; public class ItemMagnet extends Item diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetArmor.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetArmor.java similarity index 91% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetArmor.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetArmor.java index 8f3a676..da787e1 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetArmor.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetArmor.java @@ -1,6 +1,6 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; import net.minecraft.item.ItemArmor; diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetBall.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetBall.java similarity index 84% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetBall.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetBall.java index b7ebfb9..35620f2 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetBall.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetBall.java @@ -1,7 +1,8 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; + +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.entity.EntityMagnetBall; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.entity.EntityMagnetBall; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetCard.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetCard.java similarity index 69% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetCard.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetCard.java index 5134b91..6bdc6d2 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetCard.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetCard.java @@ -1,6 +1,7 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; + +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; import net.minecraft.item.Item; public class ItemMagnetCard extends Item diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetIngot.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetIngot.java similarity index 68% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetIngot.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetIngot.java index d56cb5e..9da5b43 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetIngot.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetIngot.java @@ -1,6 +1,6 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; import net.minecraft.item.Item; diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetStick.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetStick.java similarity index 68% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetStick.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetStick.java index d453d54..62e2052 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetStick.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetStick.java @@ -1,6 +1,7 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; + +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; import net.minecraft.item.Item; public class ItemMagnetStick extends Item diff --git a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetSword.java b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetSword.java similarity index 70% rename from src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetSword.java rename to src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetSword.java index eddafa1..322f725 100644 --- a/src/main/java/WdawningStudio/DawnW/science/item/ItemMagnetSword.java +++ b/src/main/java/com/github/wdawning/dawncraft/item/ItemMagnetSword.java @@ -1,6 +1,6 @@ -package WdawningStudio.DawnW.science.item; +package com.github.wdawning.dawncraft.item; -import WdawningStudio.DawnW.science.creativetab.CreativeTabsLoader; +import com.github.wdawning.dawncraft.creativetab.CreativeTabsLoader; import net.minecraft.item.ItemSword; diff --git a/src/main/java/WdawningStudio/DawnW/science/potion/PotionBadGer.java b/src/main/java/com/github/wdawning/dawncraft/potion/PotionBadGer.java similarity index 72% rename from src/main/java/WdawningStudio/DawnW/science/potion/PotionBadGer.java rename to src/main/java/com/github/wdawning/dawncraft/potion/PotionBadGer.java index e33f5dd..d1a19ab 100644 --- a/src/main/java/WdawningStudio/DawnW/science/potion/PotionBadGer.java +++ b/src/main/java/com/github/wdawning/dawncraft/potion/PotionBadGer.java @@ -1,7 +1,7 @@ -package WdawningStudio.DawnW.science.potion; +package com.github.wdawning.dawncraft.potion; -import WdawningStudio.DawnW.science.science; -import WdawningStudio.DawnW.science.common.ConfigLoader; +import com.github.wdawning.dawncraft.dawncraft; +import com.github.wdawning.dawncraft.common.ConfigLoader; import net.minecraft.client.Minecraft; import net.minecraft.potion.Potion; @@ -10,11 +10,11 @@ public class PotionBadGer extends Potion { - private static final ResourceLocation res = new ResourceLocation(science.MODID + ":" + "textures/gui/potion.png"); + private static final ResourceLocation res = new ResourceLocation(dawncraft.MODID + ":" + "textures/gui/potion.png"); public PotionBadGer() { - super(ConfigLoader.potionBadGerID, new ResourceLocation(science.MODID + ":" + "bad_ger"), true, 0x7F0000); + super(ConfigLoader.potionBadGerID, new ResourceLocation(dawncraft.MODID + ":" + "bad_ger"), true, 0x7F0000); this.setPotionName("potion.badGer"); //this.setIconIndex(0, 0); } diff --git a/src/main/java/WdawningStudio/DawnW/science/potion/PotionBrainDead.java b/src/main/java/com/github/wdawning/dawncraft/potion/PotionBrainDead.java similarity index 72% rename from src/main/java/WdawningStudio/DawnW/science/potion/PotionBrainDead.java rename to src/main/java/com/github/wdawning/dawncraft/potion/PotionBrainDead.java index da5e6b5..2eb91c6 100644 --- a/src/main/java/WdawningStudio/DawnW/science/potion/PotionBrainDead.java +++ b/src/main/java/com/github/wdawning/dawncraft/potion/PotionBrainDead.java @@ -1,7 +1,7 @@ -package WdawningStudio.DawnW.science.potion; +package com.github.wdawning.dawncraft.potion; -import WdawningStudio.DawnW.science.science; -import WdawningStudio.DawnW.science.common.ConfigLoader; +import com.github.wdawning.dawncraft.dawncraft; +import com.github.wdawning.dawncraft.common.ConfigLoader; import net.minecraft.client.Minecraft; import net.minecraft.potion.Potion; @@ -10,11 +10,11 @@ public class PotionBrainDead extends Potion { - private static final ResourceLocation res = new ResourceLocation(science.MODID + ":" + "textures/gui/potion.png"); + private static final ResourceLocation res = new ResourceLocation(dawncraft.MODID + ":" + "textures/gui/potion.png"); public PotionBrainDead() { - super(ConfigLoader.potionBrainDeadID, new ResourceLocation(science.MODID + ":" + "brain_dead"), true, 0x7F0000); + super(ConfigLoader.potionBrainDeadID, new ResourceLocation(dawncraft.MODID + ":" + "brain_dead"), true, 0x7F0000); this.setPotionName("potion.brainDead"); //this.setIconIndex(0, 0); } diff --git a/src/main/java/WdawningStudio/DawnW/science/potion/PotionGerPower.java b/src/main/java/com/github/wdawning/dawncraft/potion/PotionGerPower.java similarity index 72% rename from src/main/java/WdawningStudio/DawnW/science/potion/PotionGerPower.java rename to src/main/java/com/github/wdawning/dawncraft/potion/PotionGerPower.java index 0aab0b6..9fd5555 100644 --- a/src/main/java/WdawningStudio/DawnW/science/potion/PotionGerPower.java +++ b/src/main/java/com/github/wdawning/dawncraft/potion/PotionGerPower.java @@ -1,7 +1,7 @@ -package WdawningStudio.DawnW.science.potion; +package com.github.wdawning.dawncraft.potion; -import WdawningStudio.DawnW.science.science; -import WdawningStudio.DawnW.science.common.ConfigLoader; +import com.github.wdawning.dawncraft.dawncraft; +import com.github.wdawning.dawncraft.common.ConfigLoader; import net.minecraft.client.Minecraft; import net.minecraft.potion.Potion; @@ -10,11 +10,11 @@ public class PotionGerPower extends Potion { - private static final ResourceLocation res = new ResourceLocation(science.MODID + ":" + "textures/gui/potion.png"); + private static final ResourceLocation res = new ResourceLocation(dawncraft.MODID + ":" + "textures/gui/potion.png"); public PotionGerPower() { - super(ConfigLoader.potionGerPowerID, new ResourceLocation(science.MODID + ":" + "ger_power"), true, 0x7F0000); + super(ConfigLoader.potionGerPowerID, new ResourceLocation(dawncraft.MODID + ":" + "ger_power"), true, 0x7F0000); this.setPotionName("potion.gerPower"); //this.setIconIndex(0, 0); } diff --git a/src/main/java/WdawningStudio/DawnW/science/potion/PotionLoader.java b/src/main/java/com/github/wdawning/dawncraft/potion/PotionLoader.java similarity index 95% rename from src/main/java/WdawningStudio/DawnW/science/potion/PotionLoader.java rename to src/main/java/com/github/wdawning/dawncraft/potion/PotionLoader.java index b2ceac8..7cb90e3 100644 --- a/src/main/java/WdawningStudio/DawnW/science/potion/PotionLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/potion/PotionLoader.java @@ -1,10 +1,10 @@ -package WdawningStudio.DawnW.science.potion; +package com.github.wdawning.dawncraft.potion; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Arrays; -import WdawningStudio.DawnW.science.common.ConfigLoader; +import com.github.wdawning.dawncraft.common.ConfigLoader; import net.minecraft.potion.Potion; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; diff --git a/src/main/java/WdawningStudio/DawnW/science/worldgen/WorldGeneratorLoader.java b/src/main/java/com/github/wdawning/dawncraft/worldgen/WorldGeneratorLoader.java similarity index 94% rename from src/main/java/WdawningStudio/DawnW/science/worldgen/WorldGeneratorLoader.java rename to src/main/java/com/github/wdawning/dawncraft/worldgen/WorldGeneratorLoader.java index b1547c9..b1e0a53 100644 --- a/src/main/java/WdawningStudio/DawnW/science/worldgen/WorldGeneratorLoader.java +++ b/src/main/java/com/github/wdawning/dawncraft/worldgen/WorldGeneratorLoader.java @@ -1,8 +1,8 @@ -package WdawningStudio.DawnW.science.worldgen; +package com.github.wdawning.dawncraft.worldgen; import java.util.Random; -import WdawningStudio.DawnW.science.block.BlockLoader; +import com.github.wdawning.dawncraft.block.BlockLoader; import net.minecraft.util.BlockPos; import net.minecraft.world.World; diff --git a/src/main/resources/assets/dawncraft/blockstates/ele_furnace.json b/src/main/resources/assets/dawncraft/blockstates/ele_furnace.json new file mode 100644 index 0000000..78da2b4 --- /dev/null +++ b/src/main/resources/assets/dawncraft/blockstates/ele_furnace.json @@ -0,0 +1,12 @@ +{ + "variants": { + "burning=false,facing=east": { "model": "dawncraft:ele_furnace", "y": 90, "uvlock": true }, + "burning=true,facing=east": { "model": "dawncraft:ele_furnace_burning", "y": 90, "uvlock": true }, + "burning=false,facing=north": { "model": "dawncraft:ele_furnace" }, + "burning=true,facing=north": { "model": "dawncraft:ele_furnace_burning" }, + "burning=false,facing=south": { "model": "dawncraft:ele_furnace", "y": 180, "uvlock": true }, + "burning=true,facing=south": { "model": "dawncraft:ele_furnace_burning", "y": 180, "uvlock": true }, + "burning=false,facing=west": { "model": "dawncraft:ele_furnace", "y": 270, "uvlock": true }, + "burning=true,facing=west": { "model": "dawncraft:ele_furnace_burning", "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/blockstates/fluid_petroleum.json b/src/main/resources/assets/dawncraft/blockstates/fluid_petroleum.json similarity index 100% rename from src/main/resources/assets/wcscience/blockstates/fluid_petroleum.json rename to src/main/resources/assets/dawncraft/blockstates/fluid_petroleum.json diff --git a/src/main/resources/assets/dawncraft/blockstates/high_computer.json b/src/main/resources/assets/dawncraft/blockstates/high_computer.json new file mode 100644 index 0000000..4b2d2bf --- /dev/null +++ b/src/main/resources/assets/dawncraft/blockstates/high_computer.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "dawncraft:high_computer" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dawncraft/blockstates/iron_furnace.json b/src/main/resources/assets/dawncraft/blockstates/iron_furnace.json new file mode 100644 index 0000000..e804b6b --- /dev/null +++ b/src/main/resources/assets/dawncraft/blockstates/iron_furnace.json @@ -0,0 +1,12 @@ +{ + "variants": { + "burning=false,facing=east": { "model": "dawncraft:iron_furnace", "y": 90, "uvlock": true }, + "burning=true,facing=east": { "model": "dawncraft:iron_furnace_burning", "y": 90, "uvlock": true }, + "burning=false,facing=north": { "model": "dawncraft:iron_furnace" }, + "burning=true,facing=north": { "model": "dawncraft:iron_furnace_burning" }, + "burning=false,facing=south": { "model": "dawncraft:iron_furnace", "y": 180, "uvlock": true }, + "burning=true,facing=south": { "model": "dawncraft:iron_furnace_burning", "y": 180, "uvlock": true }, + "burning=false,facing=west": { "model": "dawncraft:iron_furnace", "y": 270, "uvlock": true }, + "burning=true,facing=west": { "model": "dawncraft:iron_furnace_burning", "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dawncraft/blockstates/magnet_block.json b/src/main/resources/assets/dawncraft/blockstates/magnet_block.json new file mode 100644 index 0000000..b297b9c --- /dev/null +++ b/src/main/resources/assets/dawncraft/blockstates/magnet_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "dawncraft:magnet_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dawncraft/blockstates/magnet_ore.json b/src/main/resources/assets/dawncraft/blockstates/magnet_ore.json new file mode 100644 index 0000000..a7182b1 --- /dev/null +++ b/src/main/resources/assets/dawncraft/blockstates/magnet_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "dawncraft:magnet_ore" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dawncraft/blockstates/pro_computer.json b/src/main/resources/assets/dawncraft/blockstates/pro_computer.json new file mode 100644 index 0000000..03b640c --- /dev/null +++ b/src/main/resources/assets/dawncraft/blockstates/pro_computer.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "dawncraft:pro_computer" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dawncraft/blockstates/simple_computer.json b/src/main/resources/assets/dawncraft/blockstates/simple_computer.json new file mode 100644 index 0000000..1798c29 --- /dev/null +++ b/src/main/resources/assets/dawncraft/blockstates/simple_computer.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "dawncraft:simple_computer" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dawncraft/blockstates/super_computer.json b/src/main/resources/assets/dawncraft/blockstates/super_computer.json new file mode 100644 index 0000000..9493bd2 --- /dev/null +++ b/src/main/resources/assets/dawncraft/blockstates/super_computer.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "dawncraft:super_computer" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/lang/en_US.lang b/src/main/resources/assets/dawncraft/lang/en_US.lang similarity index 100% rename from src/main/resources/assets/wcscience/lang/en_US.lang rename to src/main/resources/assets/dawncraft/lang/en_US.lang diff --git a/src/main/resources/assets/wcscience/lang/zh_CN.lang b/src/main/resources/assets/dawncraft/lang/zh_CN.lang similarity index 100% rename from src/main/resources/assets/wcscience/lang/zh_CN.lang rename to src/main/resources/assets/dawncraft/lang/zh_CN.lang diff --git a/src/main/resources/assets/wcscience/models/block/case.json b/src/main/resources/assets/dawncraft/models/block/case.json similarity index 100% rename from src/main/resources/assets/wcscience/models/block/case.json rename to src/main/resources/assets/dawncraft/models/block/case.json diff --git a/src/main/resources/assets/dawncraft/models/block/ele_furnace.json b/src/main/resources/assets/dawncraft/models/block/ele_furnace.json new file mode 100644 index 0000000..b8bbc46 --- /dev/null +++ b/src/main/resources/assets/dawncraft/models/block/ele_furnace.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "dawncraft:blocks/electricity/electricity_furnace_side", + "front": "dawncraft:blocks/electricity/electricity_furnace_off", + "side": "dawncraft:blocks/electricity/electricity_furnace_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dawncraft/models/block/ele_furnace_burning.json b/src/main/resources/assets/dawncraft/models/block/ele_furnace_burning.json new file mode 100644 index 0000000..85657c4 --- /dev/null +++ b/src/main/resources/assets/dawncraft/models/block/ele_furnace_burning.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "dawncraft:blocks/electricity/electricity_furnace_side", + "front": "dawncraft:blocks/electricity/electricity_furnace_on", + "side": "dawncraft:blocks/electricity/electricity_furnace_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dawncraft/models/block/high_computer.json b/src/main/resources/assets/dawncraft/models/block/high_computer.json new file mode 100644 index 0000000..8f011bb --- /dev/null +++ b/src/main/resources/assets/dawncraft/models/block/high_computer.json @@ -0,0 +1,12 @@ +{ + "parent": "dawncraft:block/case", + "textures": { + "particle": "dawncraft:blocks/computer/high_computer_up", + "down": "dawncraft:blocks/computer/high_computer_down", + "up": "dawncraft:blocks/computer/high_computer_up", + "north": "dawncraft:blocks/computer/high_computer_north", + "east": "dawncraft:blocks/computer/high_computer_side", + "south": "dawncraft:blocks/computer/high_computer_south", + "west": "dawncraft:blocks/computer/high_computer_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dawncraft/models/block/iron_furnace.json b/src/main/resources/assets/dawncraft/models/block/iron_furnace.json new file mode 100644 index 0000000..6ef06c3 --- /dev/null +++ b/src/main/resources/assets/dawncraft/models/block/iron_furnace.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "dawncraft:blocks/machine/iron_furnace_top", + "front": "dawncraft:blocks/machine/iron_furnace_off", + "side": "blocks/iron_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dawncraft/models/block/iron_furnace_burning.json b/src/main/resources/assets/dawncraft/models/block/iron_furnace_burning.json new file mode 100644 index 0000000..96e2979 --- /dev/null +++ b/src/main/resources/assets/dawncraft/models/block/iron_furnace_burning.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "dawncraft:blocks/machine/iron_furnace_top", + "front": "dawncraft:blocks/machine/iron_furnace_on", + "side": "blocks/iron_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/block/magnet_block.json b/src/main/resources/assets/dawncraft/models/block/magnet_block.json similarity index 55% rename from src/main/resources/assets/wcscience/models/block/magnet_block.json rename to src/main/resources/assets/dawncraft/models/block/magnet_block.json index f681618..f98f56d 100644 --- a/src/main/resources/assets/wcscience/models/block/magnet_block.json +++ b/src/main/resources/assets/dawncraft/models/block/magnet_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "wcscience:blocks/magnet_block" + "all": "dawncraft:blocks/magnet_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/block/magnet_ore.json b/src/main/resources/assets/dawncraft/models/block/magnet_ore.json similarity index 56% rename from src/main/resources/assets/wcscience/models/block/magnet_ore.json rename to src/main/resources/assets/dawncraft/models/block/magnet_ore.json index 5650a80..732cdd0 100644 --- a/src/main/resources/assets/wcscience/models/block/magnet_ore.json +++ b/src/main/resources/assets/dawncraft/models/block/magnet_ore.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "wcscience:blocks/magnet_ore" + "all": "dawncraft:blocks/magnet_ore" } } \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/block/petroleum.json b/src/main/resources/assets/dawncraft/models/block/petroleum.json similarity index 57% rename from src/main/resources/assets/wcscience/models/block/petroleum.json rename to src/main/resources/assets/dawncraft/models/block/petroleum.json index 72a3528..8658aff 100644 --- a/src/main/resources/assets/wcscience/models/block/petroleum.json +++ b/src/main/resources/assets/dawncraft/models/block/petroleum.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "wcscience:blocks/petroleum" + "all": "dawncraft:blocks/petroleum" } } \ No newline at end of file diff --git a/src/main/resources/assets/dawncraft/models/block/pro_computer.json b/src/main/resources/assets/dawncraft/models/block/pro_computer.json new file mode 100644 index 0000000..71672bc --- /dev/null +++ b/src/main/resources/assets/dawncraft/models/block/pro_computer.json @@ -0,0 +1,12 @@ +{ + "parent": "dawncraft:block/case", + "textures": { + "particle": "dawncraft:blocks/computer/pro_computer_up", + "down": "dawncraft:blocks/computer/pro_computer_down", + "up": "dawncraft:blocks/computer/pro_computer_up", + "north": "dawncraft:blocks/computer/pro_computer_north", + "east": "dawncraft:blocks/computer/pro_computer_side", + "south": "dawncraft:blocks/computer/pro_computer_south", + "west": "dawncraft:blocks/computer/pro_computer_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dawncraft/models/block/simple_computer.json b/src/main/resources/assets/dawncraft/models/block/simple_computer.json new file mode 100644 index 0000000..9c552c4 --- /dev/null +++ b/src/main/resources/assets/dawncraft/models/block/simple_computer.json @@ -0,0 +1,12 @@ +{ + "parent": "dawncraft:block/case", + "textures": { + "particle": "dawncraft:blocks/computer/simple_computer_up", + "down": "dawncraft:blocks/computer/simple_computer_down", + "up": "dawncraft:blocks/computer/simple_computer_up", + "north": "dawncraft:blocks/computer/simple_computer_north", + "east": "dawncraft:blocks/computer/simple_computer_side", + "south": "dawncraft:blocks/computer/simple_computer_south", + "west": "dawncraft:blocks/computer/simple_computer_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dawncraft/models/block/super_computer.json b/src/main/resources/assets/dawncraft/models/block/super_computer.json new file mode 100644 index 0000000..b12b680 --- /dev/null +++ b/src/main/resources/assets/dawncraft/models/block/super_computer.json @@ -0,0 +1,12 @@ +{ + "parent": "dawncraft:block/case", + "textures": { + "particle": "dawncraft:blocks/computer/super_computer_up", + "down": "dawncraft:blocks/computer/super_computer_down", + "up": "dawncraft:blocks/computer/super_computer_up", + "north": "dawncraft:blocks/computer/super_computer_north", + "east": "dawncraft:blocks/computer/super_computer_side", + "south": "dawncraft:blocks/computer/super_computer_south", + "west": "dawncraft:blocks/computer/super_computer_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/item/brain_dead.json b/src/main/resources/assets/dawncraft/models/item/brain_dead.json similarity index 89% rename from src/main/resources/assets/wcscience/models/item/brain_dead.json rename to src/main/resources/assets/dawncraft/models/item/brain_dead.json index 25a29c6..45ca026 100644 --- a/src/main/resources/assets/wcscience/models/item/brain_dead.json +++ b/src/main/resources/assets/dawncraft/models/item/brain_dead.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/brain_dead" + "layer0": "dawncraft:items/brain_dead" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/cake_egg.json b/src/main/resources/assets/dawncraft/models/item/cake_egg.json similarity index 90% rename from src/main/resources/assets/wcscience/models/item/cake_egg.json rename to src/main/resources/assets/dawncraft/models/item/cake_egg.json index 9dedeb1..d49a963 100644 --- a/src/main/resources/assets/wcscience/models/item/cake_egg.json +++ b/src/main/resources/assets/dawncraft/models/item/cake_egg.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/cake_egg" + "layer0": "dawncraft:items/cake_egg" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/ele_furnace.json b/src/main/resources/assets/dawncraft/models/item/ele_furnace.json similarity index 81% rename from src/main/resources/assets/wcscience/models/item/ele_furnace.json rename to src/main/resources/assets/dawncraft/models/item/ele_furnace.json index a0f461b..7108b74 100644 --- a/src/main/resources/assets/wcscience/models/item/ele_furnace.json +++ b/src/main/resources/assets/dawncraft/models/item/ele_furnace.json @@ -1,5 +1,5 @@ { - "parent": "wcscience:block/ele_furnace", + "parent": "dawncraft:block/ele_furnace", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/wcscience/models/item/faeces.json b/src/main/resources/assets/dawncraft/models/item/faeces.json similarity index 90% rename from src/main/resources/assets/wcscience/models/item/faeces.json rename to src/main/resources/assets/dawncraft/models/item/faeces.json index b877b71..fa17dca 100644 --- a/src/main/resources/assets/wcscience/models/item/faeces.json +++ b/src/main/resources/assets/dawncraft/models/item/faeces.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/faeces" + "layer0": "dawncraft:items/faeces" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/flan_RPG.json b/src/main/resources/assets/dawncraft/models/item/flan_RPG.json similarity index 88% rename from src/main/resources/assets/wcscience/models/item/flan_RPG.json rename to src/main/resources/assets/dawncraft/models/item/flan_RPG.json index 5a0a626..5204962 100644 --- a/src/main/resources/assets/wcscience/models/item/flan_RPG.json +++ b/src/main/resources/assets/dawncraft/models/item/flan_RPG.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/flans/flan_RPG" + "layer0": "dawncraft:items/flans/flan_RPG" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/flan_RPG_rocket.json b/src/main/resources/assets/dawncraft/models/item/flan_RPG_rocket.json similarity index 87% rename from src/main/resources/assets/wcscience/models/item/flan_RPG_rocket.json rename to src/main/resources/assets/dawncraft/models/item/flan_RPG_rocket.json index 2b8e177..49276b9 100644 --- a/src/main/resources/assets/wcscience/models/item/flan_RPG_rocket.json +++ b/src/main/resources/assets/dawncraft/models/item/flan_RPG_rocket.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/flans/flan_RPG_rocket" + "layer0": "dawncraft:items/flans/flan_RPG_rocket" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/ger_heart.json b/src/main/resources/assets/dawncraft/models/item/ger_heart.json similarity index 89% rename from src/main/resources/assets/wcscience/models/item/ger_heart.json rename to src/main/resources/assets/dawncraft/models/item/ger_heart.json index 5612a25..5e808ae 100644 --- a/src/main/resources/assets/wcscience/models/item/ger_heart.json +++ b/src/main/resources/assets/dawncraft/models/item/ger_heart.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/ger_heart" + "layer0": "dawncraft:items/ger_heart" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/goldiamond_sword.json b/src/main/resources/assets/dawncraft/models/item/goldiamond_sword.json similarity index 88% rename from src/main/resources/assets/wcscience/models/item/goldiamond_sword.json rename to src/main/resources/assets/dawncraft/models/item/goldiamond_sword.json index a32ed1a..4ad29f1 100644 --- a/src/main/resources/assets/wcscience/models/item/goldiamond_sword.json +++ b/src/main/resources/assets/dawncraft/models/item/goldiamond_sword.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/goldiamond_sword" + "layer0": "dawncraft:items/goldiamond_sword" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/high_CPU.json b/src/main/resources/assets/dawncraft/models/item/high_CPU.json similarity index 88% rename from src/main/resources/assets/wcscience/models/item/high_CPU.json rename to src/main/resources/assets/dawncraft/models/item/high_CPU.json index 20f1f26..5b404f4 100644 --- a/src/main/resources/assets/wcscience/models/item/high_CPU.json +++ b/src/main/resources/assets/dawncraft/models/item/high_CPU.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/computer/high_CPU" + "layer0": "dawncraft:items/computer/high_CPU" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/high_computer.json b/src/main/resources/assets/dawncraft/models/item/high_computer.json similarity index 80% rename from src/main/resources/assets/wcscience/models/item/high_computer.json rename to src/main/resources/assets/dawncraft/models/item/high_computer.json index edd958a..db91814 100644 --- a/src/main/resources/assets/wcscience/models/item/high_computer.json +++ b/src/main/resources/assets/dawncraft/models/item/high_computer.json @@ -1,5 +1,5 @@ { - "parent": "wcscience:block/high_computer", + "parent": "dawncraft:block/high_computer", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/wcscience/models/item/iron_furnace.json b/src/main/resources/assets/dawncraft/models/item/iron_furnace.json similarity index 80% rename from src/main/resources/assets/wcscience/models/item/iron_furnace.json rename to src/main/resources/assets/dawncraft/models/item/iron_furnace.json index 38381a5..0a94378 100644 --- a/src/main/resources/assets/wcscience/models/item/iron_furnace.json +++ b/src/main/resources/assets/dawncraft/models/item/iron_furnace.json @@ -1,5 +1,5 @@ { - "parent": "wcscience:block/iron_furnace", + "parent": "dawncraft:block/iron_furnace", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/wcscience/models/item/magnet.json b/src/main/resources/assets/dawncraft/models/item/magnet.json similarity index 90% rename from src/main/resources/assets/wcscience/models/item/magnet.json rename to src/main/resources/assets/dawncraft/models/item/magnet.json index 0b678c7..fe0de2e 100644 --- a/src/main/resources/assets/wcscience/models/item/magnet.json +++ b/src/main/resources/assets/dawncraft/models/item/magnet.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/magnet" + "layer0": "dawncraft:items/magnet" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/magnet_ball.json b/src/main/resources/assets/dawncraft/models/item/magnet_ball.json similarity index 89% rename from src/main/resources/assets/wcscience/models/item/magnet_ball.json rename to src/main/resources/assets/dawncraft/models/item/magnet_ball.json index b865487..202e623 100644 --- a/src/main/resources/assets/wcscience/models/item/magnet_ball.json +++ b/src/main/resources/assets/dawncraft/models/item/magnet_ball.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/magnet_ball" + "layer0": "dawncraft:items/magnet_ball" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/magnet_block.json b/src/main/resources/assets/dawncraft/models/item/magnet_block.json similarity index 80% rename from src/main/resources/assets/wcscience/models/item/magnet_block.json rename to src/main/resources/assets/dawncraft/models/item/magnet_block.json index 60a1837..4625155 100644 --- a/src/main/resources/assets/wcscience/models/item/magnet_block.json +++ b/src/main/resources/assets/dawncraft/models/item/magnet_block.json @@ -1,5 +1,5 @@ { - "parent": "wcscience:block/magnet_block", + "parent": "dawncraft:block/magnet_block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/wcscience/models/item/magnet_boots.json b/src/main/resources/assets/dawncraft/models/item/magnet_boots.json similarity index 89% rename from src/main/resources/assets/wcscience/models/item/magnet_boots.json rename to src/main/resources/assets/dawncraft/models/item/magnet_boots.json index 10696de..ce6548b 100644 --- a/src/main/resources/assets/wcscience/models/item/magnet_boots.json +++ b/src/main/resources/assets/dawncraft/models/item/magnet_boots.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/magnet_boots" + "layer0": "dawncraft:items/magnet_boots" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/magnet_card.json b/src/main/resources/assets/dawncraft/models/item/magnet_card.json similarity index 89% rename from src/main/resources/assets/wcscience/models/item/magnet_card.json rename to src/main/resources/assets/dawncraft/models/item/magnet_card.json index 6ed00fd..9f20c44 100644 --- a/src/main/resources/assets/wcscience/models/item/magnet_card.json +++ b/src/main/resources/assets/dawncraft/models/item/magnet_card.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/magnet_card" + "layer0": "dawncraft:items/magnet_card" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/magnet_chestplate.json b/src/main/resources/assets/dawncraft/models/item/magnet_chestplate.json similarity index 88% rename from src/main/resources/assets/wcscience/models/item/magnet_chestplate.json rename to src/main/resources/assets/dawncraft/models/item/magnet_chestplate.json index a73d035..1c66990 100644 --- a/src/main/resources/assets/wcscience/models/item/magnet_chestplate.json +++ b/src/main/resources/assets/dawncraft/models/item/magnet_chestplate.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/magnet_chestplate" + "layer0": "dawncraft:items/magnet_chestplate" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/magnet_helmet.json b/src/main/resources/assets/dawncraft/models/item/magnet_helmet.json similarity index 89% rename from src/main/resources/assets/wcscience/models/item/magnet_helmet.json rename to src/main/resources/assets/dawncraft/models/item/magnet_helmet.json index 5fc04ca..cebada0 100644 --- a/src/main/resources/assets/wcscience/models/item/magnet_helmet.json +++ b/src/main/resources/assets/dawncraft/models/item/magnet_helmet.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/magnet_helmet" + "layer0": "dawncraft:items/magnet_helmet" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/magnet_ingot.json b/src/main/resources/assets/dawncraft/models/item/magnet_ingot.json similarity index 89% rename from src/main/resources/assets/wcscience/models/item/magnet_ingot.json rename to src/main/resources/assets/dawncraft/models/item/magnet_ingot.json index 1af4214..9b6b1cd 100644 --- a/src/main/resources/assets/wcscience/models/item/magnet_ingot.json +++ b/src/main/resources/assets/dawncraft/models/item/magnet_ingot.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/magnet_ingot" + "layer0": "dawncraft:items/magnet_ingot" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/magnet_leggings.json b/src/main/resources/assets/dawncraft/models/item/magnet_leggings.json similarity index 88% rename from src/main/resources/assets/wcscience/models/item/magnet_leggings.json rename to src/main/resources/assets/dawncraft/models/item/magnet_leggings.json index 07bea63..63301d7 100644 --- a/src/main/resources/assets/wcscience/models/item/magnet_leggings.json +++ b/src/main/resources/assets/dawncraft/models/item/magnet_leggings.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/magnet_leggings" + "layer0": "dawncraft:items/magnet_leggings" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/magnet_ore.json b/src/main/resources/assets/dawncraft/models/item/magnet_ore.json similarity index 81% rename from src/main/resources/assets/wcscience/models/item/magnet_ore.json rename to src/main/resources/assets/dawncraft/models/item/magnet_ore.json index 45e9048..790de16 100644 --- a/src/main/resources/assets/wcscience/models/item/magnet_ore.json +++ b/src/main/resources/assets/dawncraft/models/item/magnet_ore.json @@ -1,5 +1,5 @@ { - "parent": "wcscience:block/magnet_ore", + "parent": "dawncraft:block/magnet_ore", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/wcscience/models/item/magnet_stick.json b/src/main/resources/assets/dawncraft/models/item/magnet_stick.json similarity index 89% rename from src/main/resources/assets/wcscience/models/item/magnet_stick.json rename to src/main/resources/assets/dawncraft/models/item/magnet_stick.json index d16623d..a35dae2 100644 --- a/src/main/resources/assets/wcscience/models/item/magnet_stick.json +++ b/src/main/resources/assets/dawncraft/models/item/magnet_stick.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/magnet_stick" + "layer0": "dawncraft:items/magnet_stick" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/magnet_sword.json b/src/main/resources/assets/dawncraft/models/item/magnet_sword.json similarity index 89% rename from src/main/resources/assets/wcscience/models/item/magnet_sword.json rename to src/main/resources/assets/dawncraft/models/item/magnet_sword.json index 7564c08..1c61b35 100644 --- a/src/main/resources/assets/wcscience/models/item/magnet_sword.json +++ b/src/main/resources/assets/dawncraft/models/item/magnet_sword.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/magnet_sword" + "layer0": "dawncraft:items/magnet_sword" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/petroleum_bucket.json b/src/main/resources/assets/dawncraft/models/item/petroleum_bucket.json similarity index 88% rename from src/main/resources/assets/wcscience/models/item/petroleum_bucket.json rename to src/main/resources/assets/dawncraft/models/item/petroleum_bucket.json index 9a925c2..0e1f7e5 100644 --- a/src/main/resources/assets/wcscience/models/item/petroleum_bucket.json +++ b/src/main/resources/assets/dawncraft/models/item/petroleum_bucket.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/petroleum_bucket" + "layer0": "dawncraft:items/petroleum_bucket" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/pro_CPU.json b/src/main/resources/assets/dawncraft/models/item/pro_CPU.json similarity index 88% rename from src/main/resources/assets/wcscience/models/item/pro_CPU.json rename to src/main/resources/assets/dawncraft/models/item/pro_CPU.json index 5d20017..79d7358 100644 --- a/src/main/resources/assets/wcscience/models/item/pro_CPU.json +++ b/src/main/resources/assets/dawncraft/models/item/pro_CPU.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/computer/pro_CPU" + "layer0": "dawncraft:items/computer/pro_CPU" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/pro_computer.json b/src/main/resources/assets/dawncraft/models/item/pro_computer.json similarity index 80% rename from src/main/resources/assets/wcscience/models/item/pro_computer.json rename to src/main/resources/assets/dawncraft/models/item/pro_computer.json index bb48ead..4e18cde 100644 --- a/src/main/resources/assets/wcscience/models/item/pro_computer.json +++ b/src/main/resources/assets/dawncraft/models/item/pro_computer.json @@ -1,5 +1,5 @@ { - "parent": "wcscience:block/pro_computer", + "parent": "dawncraft:block/pro_computer", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/wcscience/models/item/simple_CPU.json b/src/main/resources/assets/dawncraft/models/item/simple_CPU.json similarity index 87% rename from src/main/resources/assets/wcscience/models/item/simple_CPU.json rename to src/main/resources/assets/dawncraft/models/item/simple_CPU.json index 8896de1..7e86d0f 100644 --- a/src/main/resources/assets/wcscience/models/item/simple_CPU.json +++ b/src/main/resources/assets/dawncraft/models/item/simple_CPU.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/computer/simple_CPU" + "layer0": "dawncraft:items/computer/simple_CPU" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/wcscience/models/item/simple_computer.json b/src/main/resources/assets/dawncraft/models/item/simple_computer.json similarity index 79% rename from src/main/resources/assets/wcscience/models/item/simple_computer.json rename to src/main/resources/assets/dawncraft/models/item/simple_computer.json index 93ecbee..472d444 100644 --- a/src/main/resources/assets/wcscience/models/item/simple_computer.json +++ b/src/main/resources/assets/dawncraft/models/item/simple_computer.json @@ -1,5 +1,5 @@ { - "parent": "wcscience:block/simple_computer", + "parent": "dawncraft:block/simple_computer", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/wcscience/models/item/super_CPU.json b/src/main/resources/assets/dawncraft/models/item/super_CPU.json similarity index 88% rename from src/main/resources/assets/wcscience/models/item/super_CPU.json rename to src/main/resources/assets/dawncraft/models/item/super_CPU.json index 477a0bb..e885da9 100644 --- a/src/main/resources/assets/wcscience/models/item/super_CPU.json +++ b/src/main/resources/assets/dawncraft/models/item/super_CPU.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "wcscience:items/computer/super_CPU" + "layer0": "dawncraft:items/computer/super_CPU" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/dawncraft/models/item/super_chest.json b/src/main/resources/assets/dawncraft/models/item/super_chest.json new file mode 100644 index 0000000..6f21f67 --- /dev/null +++ b/src/main/resources/assets/dawncraft/models/item/super_chest.json @@ -0,0 +1,3 @@ +{ + "parent": "dawncraft:entity/wchest/super_chest" +} diff --git a/src/main/resources/assets/wcscience/models/item/super_computer.json b/src/main/resources/assets/dawncraft/models/item/super_computer.json similarity index 80% rename from src/main/resources/assets/wcscience/models/item/super_computer.json rename to src/main/resources/assets/dawncraft/models/item/super_computer.json index 7375878..bc45a92 100644 --- a/src/main/resources/assets/wcscience/models/item/super_computer.json +++ b/src/main/resources/assets/dawncraft/models/item/super_computer.json @@ -1,5 +1,5 @@ { - "parent": "wcscience:block/super_computer", + "parent": "dawncraft:block/super_computer", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/high_computer_down.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/high_computer_down.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/high_computer_down.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/high_computer_down.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/high_computer_north.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/high_computer_north.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/high_computer_north.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/high_computer_north.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/high_computer_side.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/high_computer_side.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/high_computer_side.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/high_computer_side.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/high_computer_south.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/high_computer_south.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/high_computer_south.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/high_computer_south.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/high_computer_up.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/high_computer_up.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/high_computer_up.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/high_computer_up.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/pro_computer_down.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/pro_computer_down.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/pro_computer_down.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/pro_computer_down.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/pro_computer_north.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/pro_computer_north.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/pro_computer_north.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/pro_computer_north.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/pro_computer_side.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/pro_computer_side.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/pro_computer_side.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/pro_computer_side.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/pro_computer_south.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/pro_computer_south.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/pro_computer_south.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/pro_computer_south.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/pro_computer_up.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/pro_computer_up.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/pro_computer_up.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/pro_computer_up.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/simple_computer_down.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/simple_computer_down.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/simple_computer_down.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/simple_computer_down.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/simple_computer_north.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/simple_computer_north.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/simple_computer_north.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/simple_computer_north.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/simple_computer_side.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/simple_computer_side.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/simple_computer_side.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/simple_computer_side.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/simple_computer_south.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/simple_computer_south.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/simple_computer_south.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/simple_computer_south.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/simple_computer_up.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/simple_computer_up.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/simple_computer_up.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/simple_computer_up.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/super_computer_down.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/super_computer_down.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/super_computer_down.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/super_computer_down.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/super_computer_north.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/super_computer_north.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/super_computer_north.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/super_computer_north.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/super_computer_side.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/super_computer_side.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/super_computer_side.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/super_computer_side.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/super_computer_south.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/super_computer_south.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/super_computer_south.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/super_computer_south.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/computer/super_computer_up.png b/src/main/resources/assets/dawncraft/textures/blocks/computer/super_computer_up.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/computer/super_computer_up.png rename to src/main/resources/assets/dawncraft/textures/blocks/computer/super_computer_up.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/electricity/electricity_furnace_off.png b/src/main/resources/assets/dawncraft/textures/blocks/electricity/electricity_furnace_off.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/electricity/electricity_furnace_off.png rename to src/main/resources/assets/dawncraft/textures/blocks/electricity/electricity_furnace_off.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/electricity/electricity_furnace_on.png b/src/main/resources/assets/dawncraft/textures/blocks/electricity/electricity_furnace_on.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/electricity/electricity_furnace_on.png rename to src/main/resources/assets/dawncraft/textures/blocks/electricity/electricity_furnace_on.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/electricity/electricity_furnace_side.png b/src/main/resources/assets/dawncraft/textures/blocks/electricity/electricity_furnace_side.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/electricity/electricity_furnace_side.png rename to src/main/resources/assets/dawncraft/textures/blocks/electricity/electricity_furnace_side.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/machine/iron_furnace_off.png b/src/main/resources/assets/dawncraft/textures/blocks/machine/iron_furnace_off.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/machine/iron_furnace_off.png rename to src/main/resources/assets/dawncraft/textures/blocks/machine/iron_furnace_off.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/machine/iron_furnace_on.png b/src/main/resources/assets/dawncraft/textures/blocks/machine/iron_furnace_on.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/machine/iron_furnace_on.png rename to src/main/resources/assets/dawncraft/textures/blocks/machine/iron_furnace_on.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/machine/iron_furnace_top.png b/src/main/resources/assets/dawncraft/textures/blocks/machine/iron_furnace_top.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/machine/iron_furnace_top.png rename to src/main/resources/assets/dawncraft/textures/blocks/machine/iron_furnace_top.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/magnet_block.png b/src/main/resources/assets/dawncraft/textures/blocks/magnet_block.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/magnet_block.png rename to src/main/resources/assets/dawncraft/textures/blocks/magnet_block.png diff --git a/src/main/resources/assets/wcscience/textures/blocks/magnet_ore.png b/src/main/resources/assets/dawncraft/textures/blocks/magnet_ore.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/blocks/magnet_ore.png rename to src/main/resources/assets/dawncraft/textures/blocks/magnet_ore.png diff --git a/src/main/resources/assets/wcscience/textures/entity/ger_king.png b/src/main/resources/assets/dawncraft/textures/entity/ger_king.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/entity/ger_king.png rename to src/main/resources/assets/dawncraft/textures/entity/ger_king.png diff --git a/src/main/resources/assets/wcscience/textures/entity/mouse.png b/src/main/resources/assets/dawncraft/textures/entity/mouse.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/entity/mouse.png rename to src/main/resources/assets/dawncraft/textures/entity/mouse.png diff --git a/src/main/resources/assets/wcscience/textures/entity/savage.png b/src/main/resources/assets/dawncraft/textures/entity/savage.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/entity/savage.png rename to src/main/resources/assets/dawncraft/textures/entity/savage.png diff --git a/src/main/resources/assets/wcscience/textures/entity/wchest/super_chest.png b/src/main/resources/assets/dawncraft/textures/entity/wchest/super_chest.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/entity/wchest/super_chest.png rename to src/main/resources/assets/dawncraft/textures/entity/wchest/super_chest.png diff --git a/src/main/resources/assets/wcscience/textures/entity/wchest/super_chest_on.png b/src/main/resources/assets/dawncraft/textures/entity/wchest/super_chest_on.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/entity/wchest/super_chest_on.png rename to src/main/resources/assets/dawncraft/textures/entity/wchest/super_chest_on.png diff --git a/src/main/resources/assets/wcscience/textures/fluid/petroleum_flow.png b/src/main/resources/assets/dawncraft/textures/fluid/petroleum_flow.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/fluid/petroleum_flow.png rename to src/main/resources/assets/dawncraft/textures/fluid/petroleum_flow.png diff --git a/src/main/resources/assets/wcscience/textures/fluid/petroleum_flow.png.mcmeta b/src/main/resources/assets/dawncraft/textures/fluid/petroleum_flow.png.mcmeta similarity index 100% rename from src/main/resources/assets/wcscience/textures/fluid/petroleum_flow.png.mcmeta rename to src/main/resources/assets/dawncraft/textures/fluid/petroleum_flow.png.mcmeta diff --git a/src/main/resources/assets/wcscience/textures/fluid/petroleum_still.png b/src/main/resources/assets/dawncraft/textures/fluid/petroleum_still.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/fluid/petroleum_still.png rename to src/main/resources/assets/dawncraft/textures/fluid/petroleum_still.png diff --git a/src/main/resources/assets/wcscience/textures/fluid/petroleum_still.png.mcmeta b/src/main/resources/assets/dawncraft/textures/fluid/petroleum_still.png.mcmeta similarity index 100% rename from src/main/resources/assets/wcscience/textures/fluid/petroleum_still.png.mcmeta rename to src/main/resources/assets/dawncraft/textures/fluid/petroleum_still.png.mcmeta diff --git a/src/main/resources/assets/wcscience/textures/gui/potion.png b/src/main/resources/assets/dawncraft/textures/gui/potion.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/gui/potion.png rename to src/main/resources/assets/dawncraft/textures/gui/potion.png diff --git a/src/main/resources/assets/wcscience/textures/items/brain_dead.png b/src/main/resources/assets/dawncraft/textures/items/brain_dead.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/brain_dead.png rename to src/main/resources/assets/dawncraft/textures/items/brain_dead.png diff --git a/src/main/resources/assets/wcscience/textures/items/cake_egg.png b/src/main/resources/assets/dawncraft/textures/items/cake_egg.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/cake_egg.png rename to src/main/resources/assets/dawncraft/textures/items/cake_egg.png diff --git a/src/main/resources/assets/wcscience/textures/items/computer/high_CPU.png b/src/main/resources/assets/dawncraft/textures/items/computer/high_CPU.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/computer/high_CPU.png rename to src/main/resources/assets/dawncraft/textures/items/computer/high_CPU.png diff --git a/src/main/resources/assets/wcscience/textures/items/computer/pro_CPU.png b/src/main/resources/assets/dawncraft/textures/items/computer/pro_CPU.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/computer/pro_CPU.png rename to src/main/resources/assets/dawncraft/textures/items/computer/pro_CPU.png diff --git a/src/main/resources/assets/wcscience/textures/items/computer/simple_CPU.png b/src/main/resources/assets/dawncraft/textures/items/computer/simple_CPU.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/computer/simple_CPU.png rename to src/main/resources/assets/dawncraft/textures/items/computer/simple_CPU.png diff --git a/src/main/resources/assets/wcscience/textures/items/computer/super_CPU.png b/src/main/resources/assets/dawncraft/textures/items/computer/super_CPU.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/computer/super_CPU.png rename to src/main/resources/assets/dawncraft/textures/items/computer/super_CPU.png diff --git a/src/main/resources/assets/wcscience/textures/items/faeces.png b/src/main/resources/assets/dawncraft/textures/items/faeces.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/faeces.png rename to src/main/resources/assets/dawncraft/textures/items/faeces.png diff --git a/src/main/resources/assets/wcscience/textures/items/flans/AK47.png b/src/main/resources/assets/dawncraft/textures/items/flans/AK47.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/flans/AK47.png rename to src/main/resources/assets/dawncraft/textures/items/flans/AK47.png diff --git a/src/main/resources/assets/wcscience/textures/items/flans/C4.png b/src/main/resources/assets/dawncraft/textures/items/flans/C4.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/flans/C4.png rename to src/main/resources/assets/dawncraft/textures/items/flans/C4.png diff --git a/src/main/resources/assets/wcscience/textures/items/flans/M4A1.png b/src/main/resources/assets/dawncraft/textures/items/flans/M4A1.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/flans/M4A1.png rename to src/main/resources/assets/dawncraft/textures/items/flans/M4A1.png diff --git a/src/main/resources/assets/wcscience/textures/items/flans/MP5.png b/src/main/resources/assets/dawncraft/textures/items/flans/MP5.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/flans/MP5.png rename to src/main/resources/assets/dawncraft/textures/items/flans/MP5.png diff --git a/src/main/resources/assets/wcscience/textures/items/flans/Minigun.png b/src/main/resources/assets/dawncraft/textures/items/flans/Minigun.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/flans/Minigun.png rename to src/main/resources/assets/dawncraft/textures/items/flans/Minigun.png diff --git a/src/main/resources/assets/wcscience/textures/items/flans/Railgun.png b/src/main/resources/assets/dawncraft/textures/items/flans/Railgun.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/flans/Railgun.png rename to src/main/resources/assets/dawncraft/textures/items/flans/Railgun.png diff --git a/src/main/resources/assets/wcscience/textures/items/flans/flan_RPG.png b/src/main/resources/assets/dawncraft/textures/items/flans/flan_RPG.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/flans/flan_RPG.png rename to src/main/resources/assets/dawncraft/textures/items/flans/flan_RPG.png diff --git a/src/main/resources/assets/wcscience/textures/items/flans/flan_RPG_rocket.png b/src/main/resources/assets/dawncraft/textures/items/flans/flan_RPG_rocket.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/flans/flan_RPG_rocket.png rename to src/main/resources/assets/dawncraft/textures/items/flans/flan_RPG_rocket.png diff --git a/src/main/resources/assets/wcscience/textures/items/ger_heart.png b/src/main/resources/assets/dawncraft/textures/items/ger_heart.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/ger_heart.png rename to src/main/resources/assets/dawncraft/textures/items/ger_heart.png diff --git a/src/main/resources/assets/wcscience/textures/items/goldiamond_sword.png b/src/main/resources/assets/dawncraft/textures/items/goldiamond_sword.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/goldiamond_sword.png rename to src/main/resources/assets/dawncraft/textures/items/goldiamond_sword.png diff --git a/src/main/resources/assets/wcscience/textures/items/ice_sward.png b/src/main/resources/assets/dawncraft/textures/items/ice_sward.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/ice_sward.png rename to src/main/resources/assets/dawncraft/textures/items/ice_sward.png diff --git a/src/main/resources/assets/wcscience/textures/items/magnet.png b/src/main/resources/assets/dawncraft/textures/items/magnet.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/magnet.png rename to src/main/resources/assets/dawncraft/textures/items/magnet.png diff --git a/src/main/resources/assets/wcscience/textures/items/magnet_ball.png b/src/main/resources/assets/dawncraft/textures/items/magnet_ball.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/magnet_ball.png rename to src/main/resources/assets/dawncraft/textures/items/magnet_ball.png diff --git a/src/main/resources/assets/wcscience/textures/items/magnet_boots.png b/src/main/resources/assets/dawncraft/textures/items/magnet_boots.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/magnet_boots.png rename to src/main/resources/assets/dawncraft/textures/items/magnet_boots.png diff --git a/src/main/resources/assets/wcscience/textures/items/magnet_card.png b/src/main/resources/assets/dawncraft/textures/items/magnet_card.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/magnet_card.png rename to src/main/resources/assets/dawncraft/textures/items/magnet_card.png diff --git a/src/main/resources/assets/wcscience/textures/items/magnet_chestplate.png b/src/main/resources/assets/dawncraft/textures/items/magnet_chestplate.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/magnet_chestplate.png rename to src/main/resources/assets/dawncraft/textures/items/magnet_chestplate.png diff --git a/src/main/resources/assets/wcscience/textures/items/magnet_helmet.png b/src/main/resources/assets/dawncraft/textures/items/magnet_helmet.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/magnet_helmet.png rename to src/main/resources/assets/dawncraft/textures/items/magnet_helmet.png diff --git a/src/main/resources/assets/wcscience/textures/items/magnet_ingot.png b/src/main/resources/assets/dawncraft/textures/items/magnet_ingot.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/magnet_ingot.png rename to src/main/resources/assets/dawncraft/textures/items/magnet_ingot.png diff --git a/src/main/resources/assets/wcscience/textures/items/magnet_leggings.png b/src/main/resources/assets/dawncraft/textures/items/magnet_leggings.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/magnet_leggings.png rename to src/main/resources/assets/dawncraft/textures/items/magnet_leggings.png diff --git a/src/main/resources/assets/wcscience/textures/items/magnet_stick.png b/src/main/resources/assets/dawncraft/textures/items/magnet_stick.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/magnet_stick.png rename to src/main/resources/assets/dawncraft/textures/items/magnet_stick.png diff --git a/src/main/resources/assets/wcscience/textures/items/magnet_sword.png b/src/main/resources/assets/dawncraft/textures/items/magnet_sword.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/magnet_sword.png rename to src/main/resources/assets/dawncraft/textures/items/magnet_sword.png diff --git a/src/main/resources/assets/wcscience/textures/items/petroleum_bucket.png b/src/main/resources/assets/dawncraft/textures/items/petroleum_bucket.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/petroleum_bucket.png rename to src/main/resources/assets/dawncraft/textures/items/petroleum_bucket.png diff --git a/src/main/resources/assets/wcscience/textures/items/wrench.png b/src/main/resources/assets/dawncraft/textures/items/wrench.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/items/wrench.png rename to src/main/resources/assets/dawncraft/textures/items/wrench.png diff --git a/src/main/resources/assets/wcscience/textures/models/armor/magnet_layer_1.png b/src/main/resources/assets/dawncraft/textures/models/armor/magnet_layer_1.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/models/armor/magnet_layer_1.png rename to src/main/resources/assets/dawncraft/textures/models/armor/magnet_layer_1.png diff --git a/src/main/resources/assets/wcscience/textures/models/armor/magnet_layer_2.png b/src/main/resources/assets/dawncraft/textures/models/armor/magnet_layer_2.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/models/armor/magnet_layer_2.png rename to src/main/resources/assets/dawncraft/textures/models/armor/magnet_layer_2.png diff --git a/src/main/resources/assets/wcscience/textures/wdawning_logo.png b/src/main/resources/assets/dawncraft/textures/wdawning_logo.png similarity index 100% rename from src/main/resources/assets/wcscience/textures/wdawning_logo.png rename to src/main/resources/assets/dawncraft/textures/wdawning_logo.png diff --git a/src/main/resources/assets/wcscience/blockstates/ele_furnace.json b/src/main/resources/assets/wcscience/blockstates/ele_furnace.json deleted file mode 100644 index 688e6d5..0000000 --- a/src/main/resources/assets/wcscience/blockstates/ele_furnace.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "burning=false,facing=east": { "model": "wcscience:ele_furnace", "y": 90, "uvlock": true }, - "burning=true,facing=east": { "model": "wcscience:ele_furnace_burning", "y": 90, "uvlock": true }, - "burning=false,facing=north": { "model": "wcscience:ele_furnace" }, - "burning=true,facing=north": { "model": "wcscience:ele_furnace_burning" }, - "burning=false,facing=south": { "model": "wcscience:ele_furnace", "y": 180, "uvlock": true }, - "burning=true,facing=south": { "model": "wcscience:ele_furnace_burning", "y": 180, "uvlock": true }, - "burning=false,facing=west": { "model": "wcscience:ele_furnace", "y": 270, "uvlock": true }, - "burning=true,facing=west": { "model": "wcscience:ele_furnace_burning", "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/blockstates/high_computer.json b/src/main/resources/assets/wcscience/blockstates/high_computer.json deleted file mode 100644 index 5b8a8a4..0000000 --- a/src/main/resources/assets/wcscience/blockstates/high_computer.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "wcscience:high_computer" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/blockstates/iron_furnace.json b/src/main/resources/assets/wcscience/blockstates/iron_furnace.json deleted file mode 100644 index 28cf76e..0000000 --- a/src/main/resources/assets/wcscience/blockstates/iron_furnace.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "burning=false,facing=east": { "model": "wcscience:iron_furnace", "y": 90, "uvlock": true }, - "burning=true,facing=east": { "model": "wcscience:iron_furnace_burning", "y": 90, "uvlock": true }, - "burning=false,facing=north": { "model": "wcscience:iron_furnace" }, - "burning=true,facing=north": { "model": "wcscience:iron_furnace_burning" }, - "burning=false,facing=south": { "model": "wcscience:iron_furnace", "y": 180, "uvlock": true }, - "burning=true,facing=south": { "model": "wcscience:iron_furnace_burning", "y": 180, "uvlock": true }, - "burning=false,facing=west": { "model": "wcscience:iron_furnace", "y": 270, "uvlock": true }, - "burning=true,facing=west": { "model": "wcscience:iron_furnace_burning", "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/blockstates/magnet_block.json b/src/main/resources/assets/wcscience/blockstates/magnet_block.json deleted file mode 100644 index c14c71f..0000000 --- a/src/main/resources/assets/wcscience/blockstates/magnet_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "wcscience:magnet_block" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/blockstates/magnet_ore.json b/src/main/resources/assets/wcscience/blockstates/magnet_ore.json deleted file mode 100644 index 77f0a3b..0000000 --- a/src/main/resources/assets/wcscience/blockstates/magnet_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "wcscience:magnet_ore" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/blockstates/pro_computer.json b/src/main/resources/assets/wcscience/blockstates/pro_computer.json deleted file mode 100644 index 64ea742..0000000 --- a/src/main/resources/assets/wcscience/blockstates/pro_computer.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "wcscience:pro_computer" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/blockstates/simple_computer.json b/src/main/resources/assets/wcscience/blockstates/simple_computer.json deleted file mode 100644 index 2d36c50..0000000 --- a/src/main/resources/assets/wcscience/blockstates/simple_computer.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "wcscience:simple_computer" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/blockstates/super_computer.json b/src/main/resources/assets/wcscience/blockstates/super_computer.json deleted file mode 100644 index b6f100c..0000000 --- a/src/main/resources/assets/wcscience/blockstates/super_computer.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "wcscience:super_computer" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/block/ele_furnace.json b/src/main/resources/assets/wcscience/models/block/ele_furnace.json deleted file mode 100644 index 75ee320..0000000 --- a/src/main/resources/assets/wcscience/models/block/ele_furnace.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "top": "wcscience:blocks/electricity/electricity_furnace_side", - "front": "wcscience:blocks/electricity/electricity_furnace_off", - "side": "wcscience:blocks/electricity/electricity_furnace_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/block/ele_furnace_burning.json b/src/main/resources/assets/wcscience/models/block/ele_furnace_burning.json deleted file mode 100644 index c360fd9..0000000 --- a/src/main/resources/assets/wcscience/models/block/ele_furnace_burning.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "top": "wcscience:blocks/electricity/electricity_furnace_side", - "front": "wcscience:blocks/electricity/electricity_furnace_on", - "side": "wcscience:blocks/electricity/electricity_furnace_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/block/high_computer.json b/src/main/resources/assets/wcscience/models/block/high_computer.json deleted file mode 100644 index ad52e6f..0000000 --- a/src/main/resources/assets/wcscience/models/block/high_computer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "wcscience:block/case", - "textures": { - "particle": "wcscience:blocks/computer/high_computer_up", - "down": "wcscience:blocks/computer/high_computer_down", - "up": "wcscience:blocks/computer/high_computer_up", - "north": "wcscience:blocks/computer/high_computer_north", - "east": "wcscience:blocks/computer/high_computer_side", - "south": "wcscience:blocks/computer/high_computer_south", - "west": "wcscience:blocks/computer/high_computer_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/block/iron_furnace.json b/src/main/resources/assets/wcscience/models/block/iron_furnace.json deleted file mode 100644 index a720b1a..0000000 --- a/src/main/resources/assets/wcscience/models/block/iron_furnace.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "top": "wcscience:blocks/machine/iron_furnace_top", - "front": "wcscience:blocks/machine/iron_furnace_off", - "side": "blocks/iron_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/block/iron_furnace_burning.json b/src/main/resources/assets/wcscience/models/block/iron_furnace_burning.json deleted file mode 100644 index f53710b..0000000 --- a/src/main/resources/assets/wcscience/models/block/iron_furnace_burning.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "top": "wcscience:blocks/machine/iron_furnace_top", - "front": "wcscience:blocks/machine/iron_furnace_on", - "side": "blocks/iron_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/block/pro_computer.json b/src/main/resources/assets/wcscience/models/block/pro_computer.json deleted file mode 100644 index 6ea2d58..0000000 --- a/src/main/resources/assets/wcscience/models/block/pro_computer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "wcscience:block/case", - "textures": { - "particle": "wcscience:blocks/computer/pro_computer_up", - "down": "wcscience:blocks/computer/pro_computer_down", - "up": "wcscience:blocks/computer/pro_computer_up", - "north": "wcscience:blocks/computer/pro_computer_north", - "east": "wcscience:blocks/computer/pro_computer_side", - "south": "wcscience:blocks/computer/pro_computer_south", - "west": "wcscience:blocks/computer/pro_computer_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/block/simple_computer.json b/src/main/resources/assets/wcscience/models/block/simple_computer.json deleted file mode 100644 index 6599796..0000000 --- a/src/main/resources/assets/wcscience/models/block/simple_computer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "wcscience:block/case", - "textures": { - "particle": "wcscience:blocks/computer/simple_computer_up", - "down": "wcscience:blocks/computer/simple_computer_down", - "up": "wcscience:blocks/computer/simple_computer_up", - "north": "wcscience:blocks/computer/simple_computer_north", - "east": "wcscience:blocks/computer/simple_computer_side", - "south": "wcscience:blocks/computer/simple_computer_south", - "west": "wcscience:blocks/computer/simple_computer_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/block/super_computer.json b/src/main/resources/assets/wcscience/models/block/super_computer.json deleted file mode 100644 index c9fd6b5..0000000 --- a/src/main/resources/assets/wcscience/models/block/super_computer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "wcscience:block/case", - "textures": { - "particle": "wcscience:blocks/computer/super_computer_up", - "down": "wcscience:blocks/computer/super_computer_down", - "up": "wcscience:blocks/computer/super_computer_up", - "north": "wcscience:blocks/computer/super_computer_north", - "east": "wcscience:blocks/computer/super_computer_side", - "south": "wcscience:blocks/computer/super_computer_south", - "west": "wcscience:blocks/computer/super_computer_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/item/flan_RPG_bomb_model.json b/src/main/resources/assets/wcscience/models/item/flan_RPG_bomb_model.json deleted file mode 100644 index 2b8e177..0000000 --- a/src/main/resources/assets/wcscience/models/item/flan_RPG_bomb_model.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "wcscience:items/flans/flan_RPG_rocket" - }, - "display": { - "thirdperson": { - "rotation": [ 0, 90, -35 ], - "translation": [ 0, 1.25, -3.5 ], - "scale": [ 0.85, 0.85, 0.85 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/wcscience/models/item/super_chest.json b/src/main/resources/assets/wcscience/models/item/super_chest.json deleted file mode 100644 index 505bcbc..0000000 --- a/src/main/resources/assets/wcscience/models/item/super_chest.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "wcscience:entity/wchest/super_chest" -} diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index fc55949..1f978eb 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,15 +1,15 @@ [ { - "modid": "wcscience", - "name": "Wc's Sience Mod", - "description": "A Sience mod by Wc.", + "modid": "dawncraft", + "name": "Dawn Craft Mod", + "description": "A Minecraft mod by WDawning Studio.", "version": "${version}", "mcversion": "${mcversion}", - "url": "https://github.com/Wdawning/Wc-s-science-Mod", - "updateUrl": "https://github.com/Wdawning/Wc-s-science-Mod", - "authorList": ["DawningW&QingChenW(Wc)"], - "credits": "Made by WdawningStudio.", - "logoFile": "assets/wcscience/textures/wdawning_logo.png", + "url": "https://github.com/Wdawning/Dawn-Craft-Mod", + "updateUrl": "https://github.com/Wdawning/Dawn-Craft-Mod", + "authorList": ["DawningW","QingChenW(Wc)"], + "credits": "Made by Wdawning Studio.", + "logoFile": "assets/dawncraft/textures/wdawning_logo.png", "screenshots": [], "dependencies": [] }