Skip to content

Commit 22e9c3b

Browse files
committed
Add resgen, fix creative tab missing items, fix bad png files with weird transparency.
1 parent 1a3520e commit 22e9c3b

17 files changed

Lines changed: 13 additions & 95 deletions

File tree

project.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ext {
88
version = '0' // 0 for now, not stable enough imo.
99

1010
concreteVersion = '0.3.2-SNAPSHOT'
11-
concreteModules = [ 'common' ]
11+
concreteModules = [ 'all' ]
1212

1313
coremod = null
1414
miniVersion = null

src/main/java/com/elytradev/architecture/base/BaseRenderingManager.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package com.elytradev.architecture.base;
88

99
import com.elytradev.architecture.common.Trans3;
10+
import com.elytradev.concrete.resgen.ConcreteResourcePack;
1011
import com.google.common.collect.ImmutableList;
1112
import com.google.common.collect.Lists;
1213
import net.minecraft.block.Block;
@@ -20,7 +21,6 @@
2021
import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
2122
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
2223
import net.minecraft.client.renderer.texture.TextureMap;
23-
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
2424
import net.minecraft.entity.EntityLivingBase;
2525
import net.minecraft.item.Item;
2626
import net.minecraft.item.ItemBlock;
@@ -36,9 +36,7 @@
3636
import net.minecraftforge.client.event.ModelRegistryEvent;
3737
import net.minecraftforge.client.event.TextureStitchEvent;
3838
import net.minecraftforge.client.model.ModelLoader;
39-
import net.minecraftforge.client.model.ModelLoaderRegistry;
4039
import net.minecraftforge.common.MinecraftForge;
41-
import net.minecraftforge.common.model.TRSRTransformation;
4240
import net.minecraftforge.fml.common.FMLCommonHandler;
4341
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
4442

@@ -55,7 +53,7 @@ public class BaseRenderingManager<MOD extends BaseMod<? extends BaseModClient>>
5553
protected static Trans3 itemTrans = Trans3.blockCenterSideTurn(0, 2);
5654
protected static String[] texturePrefixes = {"blocks/", "textures/"};
5755
public boolean debugRenderingManager = false;
58-
public boolean debugModelRegistration = true;
56+
public boolean debugModelRegistration = false;
5957
protected BaseModClient<MOD> client;
6058
protected Map<Block, BaseModClient.ICustomRenderer> blockRenderers = new HashMap<Block, BaseModClient.ICustomRenderer>();
6159
protected Map<Item, BaseModClient.ICustomRenderer> itemRenderers = new HashMap<Item, BaseModClient.ICustomRenderer>();
@@ -108,6 +106,7 @@ public static boolean renderAlternateBlock(BaseModClient client,
108106
public void preInit() {
109107
if (debugRenderingManager)
110108
System.out.printf("BaseRenderingManager.preInit\n");
109+
ConcreteResourcePack concreteResourcePack = new ConcreteResourcePack(client.base.modID);
111110
// registerDummyStateMappers();
112111
}
113112

src/main/java/com/elytradev/architecture/common/ArchitectureCraft.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ protected void registerTileEntities() {
9393
}
9494

9595
protected void registerItems() {
96-
itemSawblade = newItem("sawblade");
97-
itemLargePulley = newItem("largePulley");
98-
itemChisel = newItem("chisel", ChiselItem.class);
99-
itemHammer = newItem("hammer", HammerItem.class);
96+
itemSawblade = newItem("sawblade").setFull3D();
97+
itemLargePulley = newItem("largePulley").setFull3D();
98+
itemChisel = newItem("chisel", ChiselItem.class).setFull3D();
99+
itemHammer = newItem("hammer", HammerItem.class).setFull3D();
100100
itemCladding = newItem("cladding", CladdingItem.class);
101101
}
102102

src/main/java/com/elytradev/architecture/common/ChiselItem.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.elytradev.architecture.base.BaseBlockUtils;
1010
import net.minecraft.block.Block;
1111
import net.minecraft.block.state.IBlockState;
12-
import net.minecraft.creativetab.CreativeTabs;
1312
import net.minecraft.entity.player.EntityPlayer;
1413
import net.minecraft.init.Blocks;
1514
import net.minecraft.item.Item;
@@ -27,11 +26,6 @@ public ChiselItem() {
2726
setMaxStackSize(1);
2827
}
2928

30-
@Override
31-
public CreativeTabs getCreativeTab() {
32-
return CreativeTabs.TOOLS;
33-
}
34-
3529
@Override
3630
public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
3731
TileEntity te = world.getTileEntity(pos);

src/main/java/com/elytradev/architecture/common/CladdingItem.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import net.minecraft.block.Block;
1212
import net.minecraft.block.state.IBlockState;
1313
import net.minecraft.client.util.ITooltipFlag;
14+
import net.minecraft.creativetab.CreativeTabs;
1415
import net.minecraft.item.ItemStack;
1516
import net.minecraft.nbt.NBTTagCompound;
1617
import net.minecraft.world.World;
@@ -44,7 +45,6 @@ public IBlockState blockStateFromStack(ItemStack stack) {
4445
return null;
4546
}
4647

47-
4848
@Override
4949
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> lines, ITooltipFlag flagIn) {
5050
NBTTagCompound tag = stack.getTagCompound();
@@ -56,6 +56,10 @@ public void addInformation(ItemStack stack, @Nullable World worldIn, List<String
5656
}
5757
}
5858

59+
@Override
60+
protected boolean isInCreativeTab(CreativeTabs targetTab) {
61+
return false;
62+
}
5963

6064
@Override
6165
public int getNumSubtypes() {

src/main/java/com/elytradev/architecture/common/HammerItem.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
package com.elytradev.architecture.common;
88

9-
import net.minecraft.creativetab.CreativeTabs;
109
import net.minecraft.entity.player.EntityPlayer;
1110
import net.minecraft.item.Item;
1211
import net.minecraft.util.EnumActionResult;
@@ -21,11 +20,6 @@ public HammerItem() {
2120
setMaxStackSize(1);
2221
}
2322

24-
@Override
25-
public CreativeTabs getCreativeTab() {
26-
return CreativeTabs.TOOLS;
27-
}
28-
2923
@Override
3024
public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
3125
System.out.printf("HammerItem.onItemUse\n");

src/main/java/com/elytradev/architecture/common/SawbenchTE.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ protected ItemStack makeResultStack() {
207207

208208
protected boolean isAcceptableMaterial(Block block) {
209209
String name = Block.REGISTRY.getNameForObject(block).toString();
210-
System.out.printf("SawbenchTE.isAcceptableMaterial: %s %s\n", name, block.getUnlocalizedName());
211210
if (block == Blocks.GLASS || block == Blocks.STAINED_GLASS || block instanceof BlockSlab ||
212211
name.startsWith("chisel:glass"))
213212
return true;

src/main/resources/assets/architecturecraft/models/item/chisel.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/main/resources/assets/architecturecraft/models/item/hammer.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/main/resources/assets/architecturecraft/models/item/largePulley.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)